aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog7
-rw-r--r--src/libappindicator/app-indicator.c4
2 files changed, 11 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 81e47a9..48ed41d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+indicator-application (0.0.13-0ubuntu3~ppa3~menu3) UNRELEASED; urgency=low
+
+ * Upstream Merge
+ * Blocking tearoffs
+
+ -- Ted Gould <ted@ubuntu.com> Mon, 22 Feb 2010 16:46:48 -0600
+
indicator-application (0.0.13-0ubuntu3~ppa3~menu2) lucid; urgency=low
* Upstream Merge
diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c
index 0490031..70ca6a2 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))