aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-02-22 16:47:08 -0600
committerTed Gould <ted@gould.cx>2010-02-22 16:47:08 -0600
commit1b76f58cc8a759e305b9d2fa2b388eac2f4f77f8 (patch)
tree8416a0f7a38ed30526be9ffb76450ad6c83e7e8d
parentbc743fa9de3904d9d497d94b409b7143194524e5 (diff)
parent78429e88e6fd7354ec8a2dcbfe0931368a5b7fa2 (diff)
downloadlibayatana-appindicator-1b76f58cc8a759e305b9d2fa2b388eac2f4f77f8.tar.gz
libayatana-appindicator-1b76f58cc8a759e305b9d2fa2b388eac2f4f77f8.tar.bz2
libayatana-appindicator-1b76f58cc8a759e305b9d2fa2b388eac2f4f77f8.zip
* Upstream Merge
* Blocking tearoffs
-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))