AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-26 13:41:07 +00:00
Code Issues Projects Releases Wiki Activity

Some more

Browse Source
This commit is contained in:
Matthias Clasen 2006-01-05 17:39:17 +00:00
parent d623d6a529
commit c781cbbee8
3 changed files with 11 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,11 +1,13 @@
2006-01-05 Matthias Clasen <mclasen@redhat.com> 2006-01-05 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkaction.c (connect_proxy): Use a weak reference rather * gtk/gtkaction.c (connect_proxy, disconnect_proxy):
than the destroy signal to track proxies going away. Use a weak reference rather than the destroy signal to track
proxies going away.
* gtk/gtkbindings.c (binding_signal_new): Revert the last change. * gtk/gtkbindings.c (binding_signal_new): Revert the last change.
* gtk/gtkaction.c (gtk_action_sync_property): Removed. * gtk/gtkaction.c (gtk_action_sync_property):
(gtk_action_sync_stock_id): Removed.
2006-01-05 Rodrigo Moya <rodrigo@novell.com> 2006-01-05 Rodrigo Moya <rodrigo@novell.com>

8
ChangeLog.pre-2-10
View File

@ -1,11 +1,13 @@
2006-01-05 Matthias Clasen <mclasen@redhat.com> 2006-01-05 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkaction.c (connect_proxy): Use a weak reference rather * gtk/gtkaction.c (connect_proxy, disconnect_proxy):
than the destroy signal to track proxies going away. Use a weak reference rather than the destroy signal to track
proxies going away.
* gtk/gtkbindings.c (binding_signal_new): Revert the last change. * gtk/gtkbindings.c (binding_signal_new): Revert the last change.
* gtk/gtkaction.c (gtk_action_sync_property): Removed. * gtk/gtkaction.c (gtk_action_sync_property):
(gtk_action_sync_stock_id): Removed.
2006-01-05 Rodrigo Moya <rodrigo@novell.com> 2006-01-05 Rodrigo Moya <rodrigo@novell.com>

21
gtk/gtkaction.c
View File

@ -618,23 +618,6 @@ _gtk_action_sync_menu_visible (GtkAction *action,
gboolean _gtk_menu_is_empty (GtkWidget *menu); gboolean _gtk_menu_is_empty (GtkWidget *menu);
static void
gtk_action_sync_stock_id (GtkAction *action,
GParamSpec *pspec,
GtkWidget *proxy)
{
GtkWidget *image = NULL;
if (GTK_IS_IMAGE_MENU_ITEM (proxy))
{
image = gtk_image_menu_item_get_image (GTK_IMAGE_MENU_ITEM (proxy));
if (GTK_IS_IMAGE (image))
gtk_image_set_from_stock (GTK_IMAGE (image),
action->private_data->stock_id, GTK_ICON_SIZE_MENU);
}
}
static gboolean static gboolean
gtk_action_create_menu_proxy (GtkToolItem *tool_item, gtk_action_create_menu_proxy (GtkToolItem *tool_item,
GtkAction *action) GtkAction *action)
@ -809,6 +792,7 @@ disconnect_proxy (GtkAction *action,
{ {
g_object_set_qdata (G_OBJECT (proxy), quark_gtk_action_proxy, NULL); g_object_set_qdata (G_OBJECT (proxy), quark_gtk_action_proxy, NULL);
g_object_weak_unref (G_OBJECT (proxy), (GWeakNotify)remove_proxy, action);
remove_proxy (action, proxy); remove_proxy (action, proxy);
/* disconnect the activate handler */ /* disconnect the activate handler */
@ -816,9 +800,6 @@ disconnect_proxy (GtkAction *action,
G_CALLBACK (gtk_action_activate), G_CALLBACK (gtk_action_activate),
action); action);
g_signal_handlers_disconnect_by_func (action,
G_CALLBACK (gtk_action_sync_stock_id), proxy);
/* toolbar button specific synchronisers ... */ /* toolbar button specific synchronisers ... */
g_signal_handlers_disconnect_by_func (proxy, g_signal_handlers_disconnect_by_func (proxy,
G_CALLBACK (gtk_action_create_menu_proxy), G_CALLBACK (gtk_action_create_menu_proxy),