make sure expand is initialized, cast to GTK_SEPARATOR_TOOL_ITEM.

Thu Feb 17 14:58:16 2005  Manish Singh  <yosh@gimp.org>

        * gtk/gtkuimanager.c (start_element_handler): make sure expand
        is initialized, cast to GTK_SEPARATOR_TOOL_ITEM.

diff --git a/ChangeLog b/ChangeLog
index de209179a2a3464c818c68c1e2b40e39244d6200..2da3a8cf093368a41a8b2c22a4eca2553d4f9080 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Feb 17 14:58:16 2005  Manish Singh  <yosh@gimp.org>
+
+       * gtk/gtkuimanager.c (start_element_handler): make sure expand
+       is initialized, cast to GTK_SEPARATOR_TOOL_ITEM.
+
 Thu Feb 17 14:52:57 2005  Manish Singh  <yosh@gimp.org>
 
        * gtk/gtkcombobox.c: Pass gtk_widget_get_toplevel() a GTK_WIDGET.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index de209179a2a3464c818c68c1e2b40e39244d6200..2da3a8cf093368a41a8b2c22a4eca2553d4f9080 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Thu Feb 17 14:58:16 2005  Manish Singh  <yosh@gimp.org>
+
+       * gtk/gtkuimanager.c (start_element_handler): make sure expand
+       is initialized, cast to GTK_SEPARATOR_TOOL_ITEM.
+
 Thu Feb 17 14:52:57 2005  Manish Singh  <yosh@gimp.org>
 
        * gtk/gtkcombobox.c: Pass gtk_widget_get_toplevel() a GTK_WIDGET.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index de209179a2a3464c818c68c1e2b40e39244d6200..2da3a8cf093368a41a8b2c22a4eca2553d4f9080 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Thu Feb 17 14:58:16 2005  Manish Singh  <yosh@gimp.org>
+
+       * gtk/gtkuimanager.c (start_element_handler): make sure expand
+       is initialized, cast to GTK_SEPARATOR_TOOL_ITEM.
+
 Thu Feb 17 14:52:57 2005  Manish Singh  <yosh@gimp.org>
 
        * gtk/gtkcombobox.c: Pass gtk_widget_get_toplevel() a GTK_WIDGET.

diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c
index a2dc4ac61191d72be8385ff06ebc01ce68495e02..015bbfac9259c2f4fec2c901cbd24f0455f8e5bd 100644 (file)
--- a/gtk/gtkuimanager.c
+++ b/gtk/gtkuimanager.c
@@ -1103,7 +1103,7 @@ start_element_handler (GMarkupParseContext *context,
   const gchar *action;
   GQuark action_quark;
   gboolean top;
-  gboolean expand;
+  gboolean expand = FALSE;
   
   gboolean raise_error = TRUE;
 
@@ -2496,7 +2496,8 @@ update_node (GtkUIManager *self,
              if (info->expand)
                {
                  gtk_tool_item_set_expand (GTK_TOOL_ITEM (item), TRUE);
-                 gtk_separator_tool_item_set_draw (item, FALSE);
+                 gtk_separator_tool_item_set_draw
+                   (GTK_SEPARATOR_TOOL_ITEM (item), FALSE);
                  separator_mode = SEPARATOR_MODE_VISIBLE;
                }
                else