[Xfce4-commits] <midori:master> Don't use gtk_action_get_tooltip since it is GTK+ 2.16 only

[Christian Dywan]

Updating branch refs/heads/master
         to e4b09739fa2cc9dbba3bcb5cb4d67af4d1caaf4d (commit)
       from 2d1481699ad7c97171cd31ff95b2a781e8fd9876 (commit)

commit e4b09739fa2cc9dbba3bcb5cb4d67af4d1caaf4d
Author: Christian Dywan <christian at twotoasts.de>
Date:   Thu Oct 1 23:19:01 2009 +0200

    Don't use gtk_action_get_tooltip since it is GTK+ 2.16 only

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

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 1cbcabb..d1ef4ff 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -2524,15 +2524,16 @@ midori_browser_menu_item_select_cb (GtkWidget*     menuitem,
                                     MidoriBrowser* browser)
 {
     GtkAction* action = gtk_widget_get_action (menuitem);
-    const gchar* tooltip = action ? gtk_action_get_tooltip (action) : NULL;
+    gchar* tooltip = action ? katze_object_get_string (action, "tooltip") : NULL;
     if (!tooltip)
     {
         /* This is undocumented object data, used by KatzeArrayAction. */
         KatzeItem* item = g_object_get_data (G_OBJECT (menuitem), "KatzeItem");
         if (item)
-            tooltip = katze_item_get_uri (item);
+            tooltip = g_strdup (katze_item_get_uri (item));
     }
     _midori_browser_set_statusbar_text (browser, tooltip);
+    g_free (tooltip);
 }
 
 static void