aboutsummaryrefslogtreecommitdiff
path: root/src/libappindicator/app-indicator.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/libappindicator/app-indicator.c')
-rw-r--r--src/libappindicator/app-indicator.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c
index 97d5cd8..7c1ac82 100644
--- a/src/libappindicator/app-indicator.c
+++ b/src/libappindicator/app-indicator.c
@@ -1158,6 +1158,10 @@ container_iterate (GtkWidget *widget,
const gchar *label = NULL;
gboolean label_set = FALSE;
+ if (GTK_IS_TEAROFF_MENU_ITEM(widget)) {
+ return;
+ }
+
child = dbusmenu_menuitem_new ();
if (GTK_IS_SEPARATOR_MENU_ITEM (widget))
@@ -1240,7 +1244,7 @@ container_iterate (GtkWidget *widget,
submenu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (widget));
if (submenu != NULL)
{
- gtk_container_forall (GTK_CONTAINER (submenu),
+ gtk_container_foreach (GTK_CONTAINER (submenu),
container_iterate,
child);
g_signal_connect_object (submenu,
@@ -1288,7 +1292,7 @@ submenu_changed (GtkWidget *widget,
dbusmenu_menuitem_child_delete (root, c);
}
- gtk_container_forall (GTK_CONTAINER (widget),
+ gtk_container_foreach (GTK_CONTAINER (widget),
container_iterate,
root);
}
@@ -1304,7 +1308,7 @@ setup_dbusmenu (AppIndicator *self)
if (priv->menu)
{
- gtk_container_forall (GTK_CONTAINER (priv->menu),
+ gtk_container_foreach (GTK_CONTAINER (priv->menu),
container_iterate,
root);
}