From 090a16f664deff19e59301e5a1b39f175df9dd5a Mon Sep 17 00:00:00 2001 From: Alexander Butenko Date: Wed, 30 Jun 2010 21:19:15 -0400 Subject: [PATCH] Fix bookmark folder properties dialog --- midori/midori-browser.c | 6 +++--- panels/midori-bookmarks.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 3d75ab50..706fe913 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -788,7 +788,7 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, gtk_widget_show_all (hbox); entry_uri = NULL; - if (!KATZE_IS_ARRAY (bookmark)) + if (!is_folder) { hbox = gtk_hbox_new (FALSE, 8); gtk_container_set_border_width (GTK_CONTAINER (hbox), 4); @@ -891,7 +891,7 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, gtk_widget_show_all (hbox); check_app = NULL; - if (!KATZE_IS_ARRAY (bookmark)) + if (!is_folder) { hbox = gtk_hbox_new (FALSE, 8); gtk_container_set_border_width (GTK_CONTAINER (hbox), 1); @@ -917,7 +917,7 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser, gtk_entry_get_text (GTK_ENTRY (entry_desc))); katze_item_set_meta_integer (bookmark, "toolbar", gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check_toolbar))); - if (!KATZE_IS_ARRAY (bookmark)) + if (!is_folder) { katze_item_set_uri (bookmark, gtk_entry_get_text (GTK_ENTRY (entry_uri))); diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c index 1b3a26fb..f633d775 100644 --- a/panels/midori-bookmarks.c +++ b/panels/midori-bookmarks.c @@ -355,7 +355,7 @@ midori_bookmarks_edit_clicked_cb (GtkWidget* toolitem, g_assert (!ITEM_IS_SEPARATOR (item)); browser = midori_browser_get_for_widget (toolitem); - midori_browser_edit_bookmark_dialog_new (browser, item, FALSE, FALSE); + midori_browser_edit_bookmark_dialog_new (browser, item, FALSE, ITEM_IS_FOLDER (item)); g_object_unref (item); } @@ -750,7 +750,7 @@ midori_bookmarks_edit_activate_cb (GtkWidget* menuitem, g_assert (!ITEM_IS_SEPARATOR (item)); browser = midori_browser_get_for_widget (GTK_WIDGET (bookmarks)); - midori_browser_edit_bookmark_dialog_new (browser, item, FALSE, FALSE); + midori_browser_edit_bookmark_dialog_new (browser, item, FALSE, ITEM_IS_FOLDER (item)); } static void