[Goodies-commits] r6321 - in sion/trunk: . src

[Enrico Troeger]

Author: enrico
Date: 2008-12-14 20:07:34 +0000 (Sun, 14 Dec 2008)
New Revision: 6321

Modified:
   sion/trunk/ChangeLog
   sion/trunk/src/bookmarkdialog.c
Log:
Display share and domain fields in the bookmark dialog.

Modified: sion/trunk/ChangeLog
===================================================================
--- sion/trunk/ChangeLog	2008-12-14 19:55:02 UTC (rev 6320)
+++ sion/trunk/ChangeLog	2008-12-14 20:07:34 UTC (rev 6321)
@@ -1,4 +1,4 @@
-2008-12-14  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
+2008-12-14  Enrico Tröger  <enrico(at)xfce(dot)org>
 
  * src/window.c:
    Fix missing clicked callback for the Connect toolbar button.
@@ -11,6 +11,8 @@
    Use default username and domain name provided by GVFS in the password
    dialog.
    Add domain and share fields for bookmarks to improve Samba support.
+ * src/bookmarkeditdialog.c:
+   Display share and domain fields in the bookmark dialog.
 
 
 2008-12-13  Enrico Tröger  <enrico(at)xfce(dot)org>

Modified: sion/trunk/src/bookmarkdialog.c
===================================================================
--- sion/trunk/src/bookmarkdialog.c	2008-12-14 19:55:02 UTC (rev 6320)
+++ sion/trunk/src/bookmarkdialog.c	2008-12-14 20:07:34 UTC (rev 6321)
@@ -60,6 +60,7 @@
 	COL_HOST,
 	COL_PORT,
 	COL_USERNAME,
+	COL_OTHER,
 	COL_BMREF,
 	ACTION_ADD,
 	ACTION_EDIT,
@@ -108,21 +109,33 @@
 {
 	SionBookmarkDialogPrivate *priv = SION_BOOKMARK_DIALOG_GET_PRIVATE(dialog);
 	gchar port[6];
+	GString *other_text = g_string_new(NULL);
+	const gchar *tmp;
 
 	if (sion_bookmark_get_port(bm) > 0)
 		g_snprintf(port, sizeof(port), "%d", sion_bookmark_get_port(bm));
 	else
 		port[0] = '\0';
 
+	if (NZV(tmp = sion_bookmark_get_domain(bm)))
+		g_string_append_printf(other_text, _("Domain: %s"), tmp);
+	if (NZV(tmp = sion_bookmark_get_share(bm)))
+	{
+		if (other_text->len > 0)
+			g_string_append(other_text, ", ");
+		g_string_append_printf(other_text, _("Share: %s"), tmp);
+	}
+
 	gtk_list_store_set(priv->store, iter,
 			COL_NAME, sion_bookmark_get_name(bm),
 			COL_SCHEME, sion_bookmark_get_scheme(bm),
 			COL_HOST, sion_bookmark_get_host(bm),
 			COL_PORT, port,
 			COL_USERNAME, sion_bookmark_get_user(bm),
+			COL_OTHER, other_text->str,
 			COL_BMREF, bm,
 			-1);
-
+	g_string_free(other_text, TRUE);
 }
 
 
@@ -290,8 +303,9 @@
 	SionBookmarkDialogPrivate *priv = SION_BOOKMARK_DIALOG_GET_PRIVATE(dialog);
 
 	priv->tree = gtk_tree_view_new();
-	priv->store = gtk_list_store_new(6,
-		G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER);
+	priv->store = gtk_list_store_new(7,
+		G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
+		G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER);
 
 	renderer = gtk_cell_renderer_text_new();
 	column = gtk_tree_view_column_new_with_attributes(
@@ -333,6 +347,14 @@
 	gtk_tree_view_column_set_resizable(GTK_TREE_VIEW_COLUMN(column), TRUE);
 	gtk_tree_view_append_column(GTK_TREE_VIEW(priv->tree), column);
 
+	renderer = gtk_cell_renderer_text_new();
+	column = gtk_tree_view_column_new_with_attributes(
+		_("Other information"), renderer, "text", COL_OTHER, NULL);
+	gtk_tree_view_column_set_sort_indicator(column, TRUE);
+	gtk_tree_view_column_set_sort_column_id(column, COL_OTHER);
+	gtk_tree_view_column_set_resizable(GTK_TREE_VIEW_COLUMN(column), TRUE);
+	gtk_tree_view_append_column(GTK_TREE_VIEW(priv->tree), column);
+
 	gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(priv->tree), TRUE);
 	gtk_tree_view_set_headers_clickable(GTK_TREE_VIEW(priv->tree), TRUE);
 
@@ -392,7 +414,7 @@
 
 	gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_OK, GTK_RESPONSE_OK);
 
-	gtk_window_set_default_size(GTK_WINDOW(dialog), 450, 350);
+	gtk_window_set_default_size(GTK_WINDOW(dialog), 550, 350);
 	gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
 
 	button_add = gtk_button_new_from_stock("gtk-add");