Updating branch refs/heads/master
         to 1d01283125a224e96a3008dd4e28d92f6c26a7e1 (commit)
       from f2957c1f66b82c111f2df571a75a37f17eb6f3ce (commit)

commit 1d01283125a224e96a3008dd4e28d92f6c26a7e1
Author: Enrico Tröger <enr...@xfce.org>
Date:   Mon Oct 5 19:24:07 2009 +0200

    Fix displaying of additional bookmark information in the bookmark dialog

 src/bookmarkdialog.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/bookmarkdialog.c b/src/bookmarkdialog.c
index f8f47e1..647927e 100644
--- a/src/bookmarkdialog.c
+++ b/src/bookmarkdialog.c
@@ -90,8 +90,6 @@ static void update_row_in_model(GigoloBookmarkDialog *dialog, 
GtkTreeIter *iter,
        else
                port[0] = '\0';
 
-       if (NZV(tmp = gigolo_bookmark_get_folder(bm)))
-               g_string_append_printf(other_text, _("Folder: %s"), tmp);
        if (NZV(tmp = gigolo_bookmark_get_domain(bm)))
                g_string_append_printf(other_text, _("Domain: %s"), tmp);
        if (NZV(tmp = gigolo_bookmark_get_share(bm)))
@@ -100,6 +98,12 @@ static void update_row_in_model(GigoloBookmarkDialog 
*dialog, GtkTreeIter *iter,
                        g_string_append(other_text, ", ");
                g_string_append_printf(other_text, _("Share: %s"), tmp);
        }
+       if (NZV(tmp = gigolo_bookmark_get_folder(bm)))
+       {
+               if (other_text->len > 0)
+                       g_string_append(other_text, ", ");
+               g_string_append_printf(other_text, _("Folder: %s"), tmp);
+       }
 
        gtk_list_store_set(priv->store, iter,
                        COL_NAME, gigolo_bookmark_get_name(bm),
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

Reply via email to