AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

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

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

	* gtk/gtkaction.c (connect_proxy, disconnect_proxy): Handle
	action_group being NULL.  (#150869,  Tommi Komulainen)
This commit is contained in:
Matthias Clasen 2004-08-24 14:51:39 +00:00 committed by Matthias Clasen
parent fabf8664f8
commit 81dba2e0b9
5 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
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

5
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
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

5
ChangeLog.pre-2-6
View File

@ -1,3 +1,8 @@
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

5
ChangeLog.pre-2-8
View File

@ -1,3 +1,8 @@
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

10
gtk/gtkaction.c
View File

@ -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