diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-09-07 07:23:57 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-09-09 02:53:45 +0800 |
| commit | fa9051e04051156a9e11e2af72a0d7342f4ea2e4 (patch) | |
| tree | 0d064bddb366257c660722359dc33f5ef3c610c7 /shell/e-shell-window-private.c | |
| parent | c9e7aa7aee6b407659843131cc8becdafa71992a (diff) | |
| download | gsoc2013-evolution-fa9051e04051156a9e11e2af72a0d7342f4ea2e4.tar gsoc2013-evolution-fa9051e04051156a9e11e2af72a0d7342f4ea2e4.tar.gz gsoc2013-evolution-fa9051e04051156a9e11e2af72a0d7342f4ea2e4.tar.bz2 gsoc2013-evolution-fa9051e04051156a9e11e2af72a0d7342f4ea2e4.tar.lz gsoc2013-evolution-fa9051e04051156a9e11e2af72a0d7342f4ea2e4.tar.xz gsoc2013-evolution-fa9051e04051156a9e11e2af72a0d7342f4ea2e4.tar.zst gsoc2013-evolution-fa9051e04051156a9e11e2af72a0d7342f4ea2e4.zip | |
Finish killing Bonobo.
Diffstat (limited to 'shell/e-shell-window-private.c')
| -rw-r--r-- | shell/e-shell-window-private.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/shell/e-shell-window-private.c b/shell/e-shell-window-private.c index 2cf24ba061..2934a82730 100644 --- a/shell/e-shell-window-private.c +++ b/shell/e-shell-window-private.c @@ -107,23 +107,20 @@ shell_window_init_switcher_style (EShellWindow *shell_window) static void shell_window_menu_item_select_cb (EShellWindow *shell_window, - GtkWidget *menu_item) + GtkWidget *widget) { GtkAction *action; GtkLabel *label; - gchar *tooltip = NULL; + const gchar *tooltip; - action = g_object_get_data (G_OBJECT (menu_item), "action"); - g_return_if_fail (GTK_IS_ACTION (action)); - - g_object_get (action, "tooltip", &tooltip, NULL); + action = gtk_widget_get_action (widget); + tooltip = gtk_action_get_tooltip (action); if (tooltip == NULL) return; label = GTK_LABEL (shell_window->priv->tooltip_label); gtk_label_set_text (label, tooltip); - g_free (tooltip); gtk_widget_show (shell_window->priv->tooltip_label); gtk_widget_hide (shell_window->priv->status_notebook); @@ -144,11 +141,6 @@ shell_window_connect_proxy_cb (EShellWindow *shell_window, if (!GTK_IS_MENU_ITEM (proxy)) return; - g_object_set_data_full ( - G_OBJECT (proxy), - "action", g_object_ref (action), - (GDestroyNotify) g_object_unref); - g_signal_connect_swapped ( proxy, "select", G_CALLBACK (shell_window_menu_item_select_cb), |