aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-02-16 10:29:27 -0600
committerTed Gould <ted@gould.cx>2010-02-16 10:29:27 -0600
commit66e7fd1d00bb4844e4506b481894c7ad341dcfd1 (patch)
treeae771fbe56ab4bbcb326bda915a67995627b019d
parent99f3dd583adc89eb13328c8a152790542dd20f07 (diff)
parentde406e516344899c4006ce989e5915d7e39a1267 (diff)
downloadlibayatana-appindicator-66e7fd1d00bb4844e4506b481894c7ad341dcfd1.tar.gz
libayatana-appindicator-66e7fd1d00bb4844e4506b481894c7ad341dcfd1.tar.bz2
libayatana-appindicator-66e7fd1d00bb4844e4506b481894c7ad341dcfd1.zip
* Upstream Merge
* Fixing a crash by checking for NULL
-rw-r--r--debian/changelog7
-rw-r--r--src/libappindicator/app-indicator.c9
2 files changed, 13 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index b0f12a3..4bd0fd0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+indicator-application (0.0.13-0ubuntu3~ppa2) UNRELEASED; urgency=low
+
+ * Upstream Merge
+ * Fixing a crash by checking for NULL
+
+ -- Ted Gould <ted@ubuntu.com> Tue, 16 Feb 2010 10:29:07 -0600
+
indicator-application (0.0.13-0ubuntu3~ppa1) lucid; urgency=low
* Upstream Merge
diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c
index 0324a34..88f6bb6 100644
--- a/src/libappindicator/app-indicator.c
+++ b/src/libappindicator/app-indicator.c
@@ -1252,9 +1252,12 @@ setup_dbusmenu (AppIndicator *self)
priv = self->priv;
root = dbusmenu_menuitem_new ();
- gtk_container_forall (GTK_CONTAINER (priv->menu),
- container_iterate,
- root);
+ if (priv->menu)
+ {
+ gtk_container_forall (GTK_CONTAINER (priv->menu),
+ container_iterate,
+ root);
+ }
if (priv->menuservice == NULL)
{