[Xfce4-commits] <midori:master> Display correct folder name in bookmark edit dialog

[Christian Dywan]

Updating branch refs/heads/master
         to 067eb6c3ece102b8d03532a983caba371de56a2f (commit)
       from 659b7c351ebcff1eb2fa5bfdb8a2d85b84f8e978 (commit)

commit 067eb6c3ece102b8d03532a983caba371de56a2f
Author: Alexander Butenko <a.butenka at gmail.com>
Date:   Fri Jul 2 11:08:08 2010 -0400

    Display correct folder name in bookmark edit dialog

 midori/midori-browser.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 388bcdc..5dbb2bf 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -855,9 +855,9 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser,
                 const unsigned char* name = sqlite3_column_text (statement, 0);
                 gtk_list_store_insert_with_values (model, NULL, G_MAXINT,
                     0, name, 1, PANGO_ELLIPSIZE_END, -1);
-                /* FIXME: Not working */
-                /*if (katze_item_get_parent (bookmark) == item)
-                    gtk_combo_box_set_active (GTK_COMBO_BOX (combo_folder), n);*/
+                if (!new_bookmark
+                    && g_str_equal (katze_item_get_meta_string (bookmark, "folder"), name))
+                    gtk_combo_box_set_active (GTK_COMBO_BOX (combo_folder), n);
                 n++;
         }
         if (n < 2)