Be more careful when casting. (#304089, Philip Langdale)

2005-05-16  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtktoggleaction.c (connect_proxy): Be more careful when
	casting.  (#304089, Philip Langdale)

diff --git a/ChangeLog b/ChangeLog
index ef3a59d05aac39a78fdf442e25cb8d34aee6bcc7..fa62e34792e7f2df14324abd880a4ae717ca1ba8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-05-16  Matthias Clasen  <mclasen@redhat.com>
 
+       * 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 ef3a59d05aac39a78fdf442e25cb8d34aee6bcc7..fa62e34792e7f2df14324abd880a4ae717ca1ba8 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2005-05-16  Matthias Clasen  <mclasen@redhat.com>
 
+       * 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 ef3a59d05aac39a78fdf442e25cb8d34aee6bcc7..fa62e34792e7f2df14324abd880a4ae717ca1ba8 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
 2005-05-16  Matthias Clasen  <mclasen@redhat.com>
 
+       * 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 305be5b00aca36c0231c334dde521ef1985b6816..f607d3d9969909aa84d2831b8178834f2891ea55 100644 (file)
--- 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))