From 6a19b7b8946ffe3d9e7ac79e4fe0a213e20be74e Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Thu, 17 Feb 2005 22:59:47 +0000 Subject: [PATCH] make sure expand is initialized, cast to GTK_SEPARATOR_TOOL_ITEM. Thu Feb 17 14:58:16 2005 Manish Singh * gtk/gtkuimanager.c (start_element_handler): make sure expand is initialized, cast to GTK_SEPARATOR_TOOL_ITEM. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkuimanager.c | 5 +++-- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index de209179a2..2da3a8cf09 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Feb 17 14:58:16 2005 Manish Singh + + * 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 * gtk/gtkcombobox.c: Pass gtk_widget_get_toplevel() a GTK_WIDGET. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index de209179a2..2da3a8cf09 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Thu Feb 17 14:58:16 2005 Manish Singh + + * 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 * gtk/gtkcombobox.c: Pass gtk_widget_get_toplevel() a GTK_WIDGET. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index de209179a2..2da3a8cf09 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Thu Feb 17 14:58:16 2005 Manish Singh + + * 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 * gtk/gtkcombobox.c: Pass gtk_widget_get_toplevel() a GTK_WIDGET. diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c index a2dc4ac611..015bbfac92 100644 --- 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