Make sure the separators used to demarkate placeholder ends don't show up

2004-04-22  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkuimanager.c (update_node): Make sure the separators
	used to demarkate placeholder ends don't show up on
	show_all().  (#140496, Murray Cumming)

diff --git a/ChangeLog b/ChangeLog
index b0aebb9cadd0203e97e40e9f04e040b9afaa2810..6cf12eef546e77545b0b94b612c3e017c5d50599 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-04-22  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkuimanager.c (update_node): Make sure the separators 
+       used to demarkate placeholder ends don't show up on 
+       show_all().  (#140496, Murray Cumming)
+
        * gtk/gtkspinbutton.c (spin_button_at_limit): Make spinbuttons
        work with negative increments.  (#137975, Tim Gerla)
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b0aebb9cadd0203e97e40e9f04e040b9afaa2810..6cf12eef546e77545b0b94b612c3e017c5d50599 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,9 @@
 2004-04-22  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkuimanager.c (update_node): Make sure the separators 
+       used to demarkate placeholder ends don't show up on 
+       show_all().  (#140496, Murray Cumming)
+
        * gtk/gtkspinbutton.c (spin_button_at_limit): Make spinbuttons
        work with negative increments.  (#137975, Tim Gerla)
 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index b0aebb9cadd0203e97e40e9f04e040b9afaa2810..6cf12eef546e77545b0b94b612c3e017c5d50599 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,5 +1,9 @@
 2004-04-22  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkuimanager.c (update_node): Make sure the separators 
+       used to demarkate placeholder ends don't show up on 
+       show_all().  (#140496, Murray Cumming)
+
        * gtk/gtkspinbutton.c (spin_button_at_limit): Make spinbuttons
        work with negative increments.  (#137975, Tim Gerla)
 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b0aebb9cadd0203e97e40e9f04e040b9afaa2810..6cf12eef546e77545b0b94b612c3e017c5d50599 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,9 @@
 2004-04-22  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkuimanager.c (update_node): Make sure the separators 
+       used to demarkate placeholder ends don't show up on 
+       show_all().  (#140496, Murray Cumming)
+
        * gtk/gtkspinbutton.c (spin_button_at_limit): Make spinbuttons
        work with negative increments.  (#137975, Tim Gerla)
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b0aebb9cadd0203e97e40e9f04e040b9afaa2810..6cf12eef546e77545b0b94b612c3e017c5d50599 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,9 @@
 2004-04-22  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkuimanager.c (update_node): Make sure the separators 
+       used to demarkate placeholder ends don't show up on 
+       show_all().  (#140496, Murray Cumming)
+
        * gtk/gtkspinbutton.c (spin_button_at_limit): Make spinbuttons
        work with negative increments.  (#137975, Tim Gerla)
 

diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c
index 93ab1a067cc44bfe7b63708bfcb60ae72f923a95..d7b6c6f6c4e6bd54b3f06c9fa971d6e40b6df8b3 100644 (file)
--- a/gtk/gtkuimanager.c
+++ b/gtk/gtkuimanager.c
@@ -2226,6 +2226,7 @@ update_node (GtkUIManager *self,
                  g_object_set_data (G_OBJECT (info->proxy),
                                     "gtk-separator-mode",
                                     GINT_TO_POINTER (SEPARATOR_MODE_HIDDEN));
+                 gtk_widget_set_no_show_all (info->proxy, TRUE);
                  gtk_menu_shell_insert (GTK_MENU_SHELL (menushell),
                                        NODE_INFO (node)->proxy, pos);
 
@@ -2233,6 +2234,7 @@ update_node (GtkUIManager *self,
                  g_object_set_data (G_OBJECT (info->extra),
                                     "gtk-separator-mode",
                                     GINT_TO_POINTER (SEPARATOR_MODE_HIDDEN));
+                 gtk_widget_set_no_show_all (info->extra, TRUE);
                  gtk_menu_shell_insert (GTK_MENU_SHELL (menushell),
                                         NODE_INFO (node)->extra, pos+1);
                }
@@ -2271,6 +2273,7 @@ update_node (GtkUIManager *self,
                  g_object_set_data (G_OBJECT (info->proxy),
                                     "gtk-separator-mode",
                                     GINT_TO_POINTER (SEPARATOR_MODE_HIDDEN));
+                 gtk_widget_set_no_show_all (info->proxy, TRUE);
 
                  item = gtk_separator_tool_item_new ();
                  gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, pos+1);
@@ -2278,6 +2281,7 @@ update_node (GtkUIManager *self,
                  g_object_set_data (G_OBJECT (info->extra),
                                     "gtk-separator-mode",
                                     GINT_TO_POINTER (SEPARATOR_MODE_HIDDEN));
+                 gtk_widget_set_no_show_all (info->extra, TRUE);
                }
            }
          break;