aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac2
-rw-r--r--debian/changelog13
-rw-r--r--src/applet-main.c6
3 files changed, 18 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 4372dc5..3ae3656 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_INIT(src/applet-main.c)
AC_PREREQ(2.53)
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-applet, 0.1)
+AM_INIT_AUTOMAKE(indicator-applet, 0.1.1)
AM_MAINTAINER_MODE
diff --git a/debian/changelog b/debian/changelog
index 0fd8e83..56ba0b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,15 +16,24 @@ indicator-applet (0.1-0ubuntu3~ppa1) intrepid; urgency=low
-- Ted Gould <ted@ubuntu.com> Wed, 18 Feb 2009 14:05:14 -0600
-indicator-applet (0.1-0ubuntu2) UNRELEASED; urgency=low
+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.
* debian/control: Fix Vcs-Bzr.
* debian/control: Update package descriptions; the messaging part is
provided by indicator-messages.
* debian/copyright: Fix leftover word "either" from the license
description.
- -- Martin Pitt <martin.pitt@ubuntu.com> Tue, 17 Feb 2009 11:26:38 +0100
+ -- Martin Pitt <martin.pitt@ubuntu.com> Thu, 19 Feb 2009 16:12:01 +0100
indicator-applet (0.1-0ubuntu1) jaunty; urgency=low
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);