From: Christian Dywan <christian@twotoasts.de>
Date: Tue, 8 Feb 2011 23:54:54 +0000 (+0100)
Subject: Avoid action accessors, use properties instead
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0f8cda7c6faa3d986f974f4edcaa5047750a3d8;p=midori

Avoid action accessors, use properties instead

Fixes: https://bugs.launchpad.net/midori/+bug/715306
---

diff --git a/midori/main.c b/midori/main.c
index 384ed302..a96af60e 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -1760,12 +1760,15 @@ main (int    argc,
             const gchar* name = gtk_action_get_name (action);
             const gchar* space = "                       ";
             gchar* padding = g_strndup (space, strlen (space) - strlen (name));
-            gchar* label = katze_strip_mnemonics (gtk_action_get_label (action));
-            const gchar* tooltip = gtk_action_get_tooltip (action);
-            g_print ("%s%s%s%s%s\n", name, padding, label,
+            gchar* label = katze_object_get_string (action, "label");
+            gchar* stripped = katze_strip_mnemonics (label);
+            gchar* tooltip = katze_object_get_string (action, "tooltip");
+            g_print ("%s%s%s%s%s\n", name, padding, stripped,
                      tooltip ? ": " : "", tooltip ? tooltip : "");
+            g_free (tooltip);
             g_free (padding);
             g_free (label);
+            g_free (stripped);
         }
         g_list_free (actions);
         gtk_widget_destroy (GTK_WIDGET (browser));