Commit 81dba2e0 authored by Matthias Clasen's avatar Matthias Clasen Committed by Matthias Clasen
Browse files

Handle action_group being NULL. (#150869, Tommi Komulainen)

2004-08-24  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkaction.c (connect_proxy, disconnect_proxy): Handle
	action_group being NULL.  (#150869,  Tommi Komulainen)
parent fabf8664
2004-08-24 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkaction.c (connect_proxy, disconnect_proxy): Handle
action_group being NULL. (#150869, Tommi Komulainen)
2004-08-24 Matthias Clasen <mclasen@redhat.com>
* gdk/gdkimage.c (allocate_scratch_images): Use the correct
......
2004-08-24 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkaction.c (connect_proxy, disconnect_proxy): Handle
action_group being NULL. (#150869, Tommi Komulainen)
2004-08-24 Matthias Clasen <mclasen@redhat.com>
* gdk/gdkimage.c (allocate_scratch_images): Use the correct
......
2004-08-24 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkaction.c (connect_proxy, disconnect_proxy): Handle
action_group being NULL. (#150869, Tommi Komulainen)
2004-08-24 Matthias Clasen <mclasen@redhat.com>
* gdk/gdkimage.c (allocate_scratch_images): Use the correct
......
2004-08-24 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkaction.c (connect_proxy, disconnect_proxy): Handle
action_group being NULL. (#150869, Tommi Komulainen)
2004-08-24 Matthias Clasen <mclasen@redhat.com>
* gdk/gdkimage.c (allocate_scratch_images): Use the correct
......
......@@ -784,8 +784,6 @@ static void
connect_proxy (GtkAction *action,
GtkWidget *proxy)
{
GtkActionGroup *group = action->private_data->action_group;
g_object_ref (action);
g_object_set_data_full (G_OBJECT (proxy), "gtk-action", action,
g_object_unref);
......@@ -945,15 +943,14 @@ connect_proxy (GtkAction *action,
G_CONNECT_SWAPPED);
}
_gtk_action_group_emit_connect_proxy (group, action, proxy);
if (action->private_data->action_group)
_gtk_action_group_emit_connect_proxy (action->private_data->action_group, action, proxy);
}
static void
disconnect_proxy (GtkAction *action,
GtkWidget *proxy)
{
GtkActionGroup *group = action->private_data->action_group;
g_object_set_data (G_OBJECT (proxy), "gtk-action", NULL);
/* remove proxy from list of proxies */
......@@ -992,7 +989,8 @@ disconnect_proxy (GtkAction *action,
G_CALLBACK (gtk_action_create_menu_proxy),
action);
_gtk_action_group_emit_disconnect_proxy (group, action, proxy);
if (action->private_data->action_group)
_gtk_action_group_emit_disconnect_proxy (action->private_data->action_group, action, proxy);
}
void
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment