[Goodies-commits] r6925 - in gigolo/trunk: . src

[Enrico Troeger]

Author: enrico
Date: 2009-03-16 21:26:20 +0000 (Mon, 16 Mar 2009)
New Revision: 6925

Modified:
   gigolo/trunk/ChangeLog
   gigolo/trunk/src/browsenetworkdialog.c
Log:
Disable the Connect and Create Bookmark actions in the 'Browse Network' dialog on parent items.

Modified: gigolo/trunk/ChangeLog
===================================================================
--- gigolo/trunk/ChangeLog	2009-03-16 21:25:59 UTC (rev 6924)
+++ gigolo/trunk/ChangeLog	2009-03-16 21:26:20 UTC (rev 6925)
@@ -6,6 +6,9 @@
    starting a new instance.
    Add command line option "--new-instance" ("-i") to restore the
    old behaviour.
+ * src/browsenetworkdialog.c:
+   Disable the Connect and Create Bookmark actions in the 'Browse
+   Network' dialog on parent items.
 
 
 2009-03-05  Enrico Tröger  <enrico(at)xfce(dot)org>

Modified: gigolo/trunk/src/browsenetworkdialog.c
===================================================================
--- gigolo/trunk/src/browsenetworkdialog.c	2009-03-16 21:25:59 UTC (rev 6924)
+++ gigolo/trunk/src/browsenetworkdialog.c	2009-03-16 21:26:20 UTC (rev 6925)
@@ -63,6 +63,7 @@
 	COLUMN_URI,
 	COLUMN_SHARE,
 	COLUMN_ICON,
+	COLUMN_CAN_MOUNT,
 	N_COLUMNS,
 	ACTION_BOOKMARK,
 	ACTION_CONNECT
@@ -197,6 +198,7 @@
 				COLUMN_URI, hosts[i]->uri,
 				COLUMN_NAME, hosts[i]->name,
 				COLUMN_ICON, hosts[i]->icon,
+				COLUMN_CAN_MOUNT, FALSE,
 				-1);
 
 			if (gigolo_str_equal(hosts[i]->uri, "smb:///"))
@@ -217,6 +219,7 @@
 							COLUMN_NAME, shares[j],
 							COLUMN_URI, hosts[i]->uri,
 							COLUMN_ICON, icon_share,
+							COLUMN_CAN_MOUNT, TRUE,
 							-1);
 					}
 					g_strfreev(shares);
@@ -348,10 +351,12 @@
 	GigoloBrowseNetworkDialogPrivate *priv = GIGOLO_BROWSE_NETWORK_DIALOG_GET_PRIVATE(dialog);
 	GtkTreeModel *model;
 	GtkTreeIter iter;
-	gboolean set;
+	gboolean set = FALSE;
 
-	set = (selection != NULL && gtk_tree_selection_get_selected(selection, &model, &iter) &&
-		   ! gtk_tree_model_iter_has_child(model, &iter));
+	if (selection != NULL && gtk_tree_selection_get_selected(selection, &model, &iter))
+	{
+		gtk_tree_model_get(model, &iter, COLUMN_CAN_MOUNT, &set, -1);
+	}
 
 	gtk_widget_set_sensitive(priv->button_connect, set);
 	gtk_widget_set_sensitive(priv->button_bookmark, set);
@@ -370,7 +375,8 @@
 	GigoloBrowseNetworkDialogPrivate *priv = GIGOLO_BROWSE_NETWORK_DIALOG_GET_PRIVATE(dialog);
 
 	tree = gtk_tree_view_new();
-	store = gtk_tree_store_new(N_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_ICON);
+	store = gtk_tree_store_new(N_COLUMNS,
+		G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_ICON, G_TYPE_BOOLEAN);
 
     column = gtk_tree_view_column_new();