From 01d3c73210bf3ac68be7a486b3306f3fc0e6ccfe Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 16 May 2005 05:03:44 +0000 Subject: [PATCH] Be more careful when casting. (#304089, Philip Langdale) 2005-05-16 Matthias Clasen * gtk/gtktoggleaction.c (connect_proxy): Be more careful when casting. (#304089, Philip Langdale) --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ ChangeLog.pre-2-8 | 3 +++ gtk/gtktoggleaction.c | 2 +- 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ef3a59d05a..fa62e34792 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2005-05-16 Matthias Clasen + * gtk/gtktoggleaction.c (connect_proxy): Be more careful when + casting. (#304089, Philip Langdale) + * gtk/gtkstatusbar.c (gtk_statusbar_size_allocate): Only shrink the label if we need to. (#169390, Felix Riemann) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index ef3a59d05a..fa62e34792 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2005-05-16 Matthias Clasen + * gtk/gtktoggleaction.c (connect_proxy): Be more careful when + casting. (#304089, Philip Langdale) + * gtk/gtkstatusbar.c (gtk_statusbar_size_allocate): Only shrink the label if we need to. (#169390, Felix Riemann) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index ef3a59d05a..fa62e34792 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,8 @@ 2005-05-16 Matthias Clasen + * gtk/gtktoggleaction.c (connect_proxy): Be more careful when + casting. (#304089, Philip Langdale) + * gtk/gtkstatusbar.c (gtk_statusbar_size_allocate): Only shrink the label if we need to. (#169390, Felix Riemann) diff --git a/gtk/gtktoggleaction.c b/gtk/gtktoggleaction.c index 305be5b00a..f607d3d996 100644 --- a/gtk/gtktoggleaction.c +++ b/gtk/gtktoggleaction.c @@ -276,7 +276,7 @@ connect_proxy (GtkAction *action, toggle_action = GTK_TOGGLE_ACTION (action); /* do this before hand, so that we don't call the "activate" handler */ - if (GTK_IS_MENU_ITEM (proxy)) + if (GTK_IS_CHECK_MENU_ITEM (proxy)) gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (proxy), toggle_action->private_data->active); else if (GTK_IS_TOGGLE_TOOL_BUTTON (proxy))