diff options
| author | Matthias Clasen <matthiasc@src.gnome.org> | 2009-01-23 17:10:08 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2009-01-23 17:10:08 +0000 |
| commit | 33d5c3d696c7a32ec3cd0344ca1eead97b33c134 (patch) | |
| tree | 124fb5137b705e8e9eed33c062e237ab55e52452 /gtk/gtkuimanager.c | |
| parent | faf6a832d44232562f8e28d80891febd99a57797 (diff) | |
| download | gtk+-33d5c3d696c7a32ec3cd0344ca1eead97b33c134.tar.gz | |
Fix pltcheck issues
svn path=/trunk/; revision=22198
Diffstat (limited to 'gtk/gtkuimanager.c')
| -rw-r--r-- | gtk/gtkuimanager.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c index 1066af9227..24267a6bfa 100644 --- a/gtk/gtkuimanager.c +++ b/gtk/gtkuimanager.c @@ -31,6 +31,7 @@ #include "config.h" #include <string.h> +#include "gtkactivatable.h" #include "gtkbuildable.h" #include "gtkintl.h" #include "gtkmarshalers.h" @@ -2351,7 +2352,7 @@ update_node (GtkUIManager *self, } } - gtk_action_disconnect_proxy (info->action, info->proxy); + gtk_activatable_set_related_action (GTK_ACTIVATABLE (info->proxy), NULL); gtk_container_remove (GTK_CONTAINER (info->proxy->parent), info->proxy); g_object_unref (info->proxy); @@ -2416,7 +2417,7 @@ update_node (GtkUIManager *self, } } else - gtk_action_connect_proxy (action, info->proxy); + gtk_activatable_set_related_action (GTK_ACTIVATABLE (info->proxy), action); if (prev_submenu) { @@ -2559,7 +2560,7 @@ update_node (GtkUIManager *self, g_signal_handlers_disconnect_by_func (info->proxy, G_CALLBACK (update_smart_separators), NULL); - gtk_action_disconnect_proxy (info->action, info->proxy); + gtk_activatable_set_related_action (GTK_ACTIVATABLE (info->proxy), NULL); gtk_container_remove (GTK_CONTAINER (info->proxy->parent), info->proxy); g_object_unref (info->proxy); @@ -2587,7 +2588,7 @@ update_node (GtkUIManager *self, G_CALLBACK (update_smart_separators), NULL); gtk_menu_item_set_submenu (GTK_MENU_ITEM (info->proxy), NULL); - gtk_action_connect_proxy (action, info->proxy); + gtk_activatable_set_related_action (GTK_ACTIVATABLE (info->proxy), action); } if (info->proxy) @@ -2611,7 +2612,7 @@ update_node (GtkUIManager *self, g_signal_handlers_disconnect_by_func (info->proxy, G_CALLBACK (update_smart_separators), NULL); - gtk_action_disconnect_proxy (info->action, info->proxy); + gtk_activatable_set_related_action (GTK_ACTIVATABLE (info->proxy), NULL); gtk_container_remove (GTK_CONTAINER (info->proxy->parent), info->proxy); g_object_unref (info->proxy); @@ -2638,7 +2639,7 @@ update_node (GtkUIManager *self, g_signal_handlers_disconnect_by_func (info->proxy, G_CALLBACK (update_smart_separators), NULL); - gtk_action_connect_proxy (action, info->proxy); + gtk_activatable_set_related_action (GTK_ACTIVATABLE (info->proxy), action); } if (info->proxy) |