aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Pitt <martin.pitt@canonical.com>2009-02-19 17:25:15 +0100
committerMartin Pitt <martin.pitt@canonical.com>2009-02-19 17:25:15 +0100
commit3bc5b8e8105d698e7782c8090148dbe8f135161f (patch)
tree71021e0655e95ddd9b07cc36ab3db29a4360916f
parent477eb614f187d1b7e35018c5a13df6db364395d0 (diff)
downloadlibayatana-indicator-3bc5b8e8105d698e7782c8090148dbe8f135161f.tar.gz
libayatana-indicator-3bc5b8e8105d698e7782c8090148dbe8f135161f.tar.bz2
libayatana-indicator-3bc5b8e8105d698e7782c8090148dbe8f135161f.zip
src/applet-main.c, applet_fill_cb(): Do not show anything if we
are running under a stracciatella GNOME session (i. e. without Ubuntu components). See UbuntuSpec:stracciatella-session.
-rw-r--r--debian/changelog8
-rw-r--r--src/applet-main.c6
2 files changed, 14 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 9c0b5f5..a9fce89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+indicator-applet (0.1.1-0ubuntu2) UNRELEASED; urgency=low
+
+ * src/applet-main.c, applet_fill_cb(): Do not show anything if we
+ are running under a stracciatella GNOME session (i. e. without
+ Ubuntu components). See UbuntuSpec:stracciatella-session.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com> Thu, 19 Feb 2009 17:24:04 +0100
+
indicator-applet (0.1.1-0ubuntu1) jaunty; urgency=low
* New upstream release with some icon changes.
diff --git a/src/applet-main.c b/src/applet-main.c
index 57dc6b3..6efd33f 100644
--- a/src/applet-main.c
+++ b/src/applet-main.c
@@ -100,6 +100,12 @@ applet_fill_cb (PanelApplet * applet, const gchar * iid, gpointer data)
GtkWidget *menubar;
gint i;
gint indicators_loaded = 0;
+
+ /* check if we are running stracciatella session */
+ if (g_strcmp0(g_getenv("GDMSESSION"), "gnome-stracciatella") == 0) {
+ g_debug("Running stracciatella GNOME session, disabling myself");
+ return TRUE;
+ }
/* Set panel options */
gtk_container_set_border_width(GTK_CONTAINER (applet), 0);