diff options
| author | Christian Persch <chpe@gnome.org> | 2007-12-02 12:34:28 +0000 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2007-12-02 12:34:28 +0000 |
| commit | 8f5839ad805917259b9e6cb1b8d2c1b72d4df21b (patch) | |
| tree | 7ad52cc2dacd4f5395a13ef192d4cc904f8f9d48 | |
| parent | ab167896e8bcf240e2c677d70dec4df4378aefb1 (diff) | |
| download | glade-8f5839ad805917259b9e6cb1b8d2c1b72d4df21b.tar.gz | |
Use gtk_widget_get_action. Bug #500943.
2007-12-02 Christian Persch <chpe@gnome.org>
* src/glade-window.c: (menu_item_selected_cb),
(ui_connect_proxy_cb): Use gtk_widget_get_action. Bug #500943.
svn path=/trunk/; revision=1648
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/glade-window.c | 11 |
2 files changed, 9 insertions, 7 deletions
@@ -1,5 +1,10 @@ 2007-12-02 Christian Persch <chpe@gnome.org> + * src/glade-window.c: (menu_item_selected_cb), + (ui_connect_proxy_cb): Use gtk_widget_get_action. Bug #500943. + +2007-12-02 Christian Persch <chpe@gnome.org> + * src/main.c: (main): Use g_option_context_set_translation domain, and use N_() when setting the summary. Bug #500940. diff --git a/src/glade-window.c b/src/glade-window.c index 4a1301de..8d5994e1 100644 --- a/src/glade-window.c +++ b/src/glade-window.c @@ -2315,13 +2315,12 @@ static GtkRadioActionEntry radio_entries[] = { static guint n_radio_entries = G_N_ELEMENTS (radio_entries); static void -menu_item_selected_cb (GtkItem *item, GladeWindow *window) +menu_item_selected_cb (GtkWidget *item, GladeWindow *window) { GtkAction *action; gchar *tooltip; - action = GTK_ACTION (g_object_get_data (G_OBJECT (item), "action-for-proxy")); - + action = gtk_widget_get_action (item); g_object_get (G_OBJECT (action), "tooltip", &tooltip, NULL); if (tooltip != NULL) @@ -2345,10 +2344,8 @@ ui_connect_proxy_cb (GtkUIManager *ui, GladeWindow *window) { if (GTK_IS_MENU_ITEM (proxy)) - { - g_object_set_data (G_OBJECT (proxy), "action-for-proxy", action); - - g_signal_connect(G_OBJECT(proxy), "select", + { + g_signal_connect(G_OBJECT(proxy), "select", G_CALLBACK (menu_item_selected_cb), window); g_signal_connect(G_OBJECT(proxy), "deselect", G_CALLBACK (menu_item_deselected_cb), window); |