summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2004-10-08 05:00:34 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2004-10-08 05:00:34 +0000
commitf64d8567edff0d96a004c0e801ffb39fed272468 (patch)
tree1a55a762bb05f8532451650a0f9e1ef447ff873e
parentdaeea8b8710994bc480b548e73a6049856ba5613 (diff)
downloadgdk-pixbuf-f64d8567edff0d96a004c0e801ffb39fed272468.tar.gz
Also update smart separators if the visibility of a menuitem with a
2004-10-08 Matthias Clasen <mclasen@redhat.com> * gtk/gtkuimanager.c (update_node): Also update smart separators if the visibility of a menuitem with a submenu changes. (#153791, Christian Persch)
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLog.pre-2-106
-rw-r--r--ChangeLog.pre-2-66
-rw-r--r--ChangeLog.pre-2-86
-rw-r--r--gtk/gtkuimanager.c4
5 files changed, 27 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d66dafa69..67d3d1440 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2004-10-08 Matthias Clasen <mclasen@redhat.com>
+ * gtk/gtkuimanager.c (update_node): Also update smart separators
+ if the visibility of a menuitem with a submenu changes. (#153791,
+ Christian Persch)
+
+2004-10-08 Matthias Clasen <mclasen@redhat.com>
+
* gtk/gtkentry.h:
* gtk/gtkentry.c:
* gtk/gtkentrycompletion.c:
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d66dafa69..67d3d1440 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,11 @@
2004-10-08 Matthias Clasen <mclasen@redhat.com>
+ * gtk/gtkuimanager.c (update_node): Also update smart separators
+ if the visibility of a menuitem with a submenu changes. (#153791,
+ Christian Persch)
+
+2004-10-08 Matthias Clasen <mclasen@redhat.com>
+
* gtk/gtkentry.h:
* gtk/gtkentry.c:
* gtk/gtkentrycompletion.c:
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d66dafa69..67d3d1440 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,11 @@
2004-10-08 Matthias Clasen <mclasen@redhat.com>
+ * gtk/gtkuimanager.c (update_node): Also update smart separators
+ if the visibility of a menuitem with a submenu changes. (#153791,
+ Christian Persch)
+
+2004-10-08 Matthias Clasen <mclasen@redhat.com>
+
* gtk/gtkentry.h:
* gtk/gtkentry.c:
* gtk/gtkentrycompletion.c:
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d66dafa69..67d3d1440 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,11 @@
2004-10-08 Matthias Clasen <mclasen@redhat.com>
+ * gtk/gtkuimanager.c (update_node): Also update smart separators
+ if the visibility of a menuitem with a submenu changes. (#153791,
+ Christian Persch)
+
+2004-10-08 Matthias Clasen <mclasen@redhat.com>
+
* gtk/gtkentry.h:
* gtk/gtkentry.c:
* gtk/gtkentrycompletion.c:
diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c
index a42ce5e26..ddaa38a8f 100644
--- a/gtk/gtkuimanager.c
+++ b/gtk/gtkuimanager.c
@@ -2196,6 +2196,8 @@ update_node (GtkUIManager *self,
gtk_menu_shell_append (GTK_MENU_SHELL (menu), filler);
gtk_menu_item_set_submenu (GTK_MENU_ITEM (info->proxy), menu);
gtk_menu_shell_insert (GTK_MENU_SHELL (menushell), info->proxy, pos);
+ g_signal_connect (info->proxy, "notify::visible",
+ G_CALLBACK (update_smart_separators), 0);
}
}
else
@@ -2517,7 +2519,7 @@ update_node (GtkUIManager *self,
{
if (info->type == NODE_TYPE_MENU)
update_smart_separators (gtk_menu_item_get_submenu (GTK_MENU_ITEM (info->proxy)));
- else if (info->type == NODE_TYPE_TOOLBAR)
+ else if (info->type == NODE_TYPE_TOOLBAR || info->type == NODE_TYPE_POPUP)
update_smart_separators (info->proxy);
}