Don't let the empty menu filler affect visibility of separators. (#160500,

2004-12-13  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkuimanager.c (update_smart_separators): Don't let the
	empty menu filler affect visibility of separators.  (#160500,
	Christian Persch)

diff --git a/ChangeLog b/ChangeLog
index 0a1c754e976ea0936a47b84dfd5107e05e171b0e..c6b2cf07d5bfb6a5da028e7e49038a4034492bac 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-12-13  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkuimanager.c (update_smart_separators): Don't let the
+       empty menu filler affect visibility of separators.  (#160500,
+       Christian Persch)
+
 2004-12-12  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkcombobox.c (gtk_combo_box_menu_row_changed): Pass a 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0a1c754e976ea0936a47b84dfd5107e05e171b0e..c6b2cf07d5bfb6a5da028e7e49038a4034492bac 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2004-12-13  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkuimanager.c (update_smart_separators): Don't let the
+       empty menu filler affect visibility of separators.  (#160500,
+       Christian Persch)
+
 2004-12-12  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkcombobox.c (gtk_combo_box_menu_row_changed): Pass a 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 0a1c754e976ea0936a47b84dfd5107e05e171b0e..c6b2cf07d5bfb6a5da028e7e49038a4034492bac 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2004-12-13  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkuimanager.c (update_smart_separators): Don't let the
+       empty menu filler affect visibility of separators.  (#160500,
+       Christian Persch)
+
 2004-12-12  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkcombobox.c (gtk_combo_box_menu_row_changed): Pass a 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 0a1c754e976ea0936a47b84dfd5107e05e171b0e..c6b2cf07d5bfb6a5da028e7e49038a4034492bac 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2004-12-13  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkuimanager.c (update_smart_separators): Don't let the
+       empty menu filler affect visibility of separators.  (#160500,
+       Christian Persch)
+
 2004-12-12  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkcombobox.c (gtk_combo_box_menu_row_changed): Pass a 

diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c
index b5c9379ccaa2f904475ab890e925da028a78f247..e507a75e00f8cb9279caf836d6b5e9c367112d46 100644 (file)
--- a/gtk/gtkuimanager.c
+++ b/gtk/gtkuimanager.c
@@ -1959,7 +1959,6 @@ update_smart_separators (GtkWidget *proxy)
   else if (GTK_IS_MENU_ITEM (proxy) || GTK_IS_TOOL_ITEM (proxy))
     parent = gtk_widget_get_parent (proxy);
 
-  
   if (parent) 
     {
       gboolean visible;
@@ -1980,10 +1979,11 @@ update_smart_separators (GtkWidget *proxy)
       while (cur) 
        {
          if (g_object_get_data (cur->data, "gtk-empty-menu-item"))
-           filler = cur->data;
-
-         if (GTK_IS_SEPARATOR_MENU_ITEM (cur->data) ||
-             GTK_IS_SEPARATOR_TOOL_ITEM (cur->data))
+           {
+             filler = cur->data;
+           }
+         else if (GTK_IS_SEPARATOR_MENU_ITEM (cur->data) ||
+                  GTK_IS_SEPARATOR_TOOL_ITEM (cur->data))
            {
              gint mode = 
                GPOINTER_TO_INT (g_object_get_data (G_OBJECT (cur->data),