[Xfce4-commits] <midori:master> Fix popup menu on folders in history

[Christian Dywan]

Updating branch refs/heads/master
         to fb634e19b9cb30721e4d918198ba2097c206881a (commit)
       from 090a16f664deff19e59301e5a1b39f175df9dd5a (commit)

commit fb634e19b9cb30721e4d918198ba2097c206881a
Author: Alexander Butenko <a.butenka at gmail.com>
Date:   Wed Jun 30 21:24:43 2010 -0400

    Fix popup menu on folders in history

 panels/midori-history.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/panels/midori-history.c b/panels/midori-history.c
index ba3fe3f..c5691d0 100644
--- a/panels/midori-history.c
+++ b/panels/midori-history.c
@@ -631,9 +631,8 @@ midori_history_popup_item (GtkWidget*     menu,
         gtk_label_set_text_with_mnemonic (GTK_LABEL (gtk_bin_get_child (
         GTK_BIN (menuitem))), label);
     if (!strcmp (stock_id, GTK_STOCK_EDIT))
-        gtk_widget_set_sensitive (menuitem,
-            KATZE_IS_ARRAY (item) || uri != NULL);
-    else if (!KATZE_IS_ARRAY (item) && strcmp (stock_id, GTK_STOCK_DELETE))
+        gtk_widget_set_sensitive (menuitem, uri != NULL);
+    else if (katze_item_get_uri (item) && strcmp (stock_id, GTK_STOCK_DELETE))
         gtk_widget_set_sensitive (menuitem, uri != NULL);
     g_object_set_data (G_OBJECT (menuitem), "KatzeItem", item);
     g_signal_connect (menuitem, "activate", G_CALLBACK (callback), history);
@@ -736,7 +735,7 @@ midori_history_popup (GtkWidget*      widget,
     GtkWidget* menuitem;
 
     menu = gtk_menu_new ();
-    if (KATZE_IS_ARRAY (item))
+    if (!katze_item_get_uri (item))
         midori_history_popup_item (menu,
             STOCK_TAB_NEW, _("Open all in _Tabs"),
             item, midori_history_open_in_tab_activate_cb, history);