From 690ffa93f9f32b08817cdfad53e61ebab0c405bf Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 16 Mar 2011 11:08:28 -0500 Subject: Make sure not to use TargetEnvironment on the desktop group --- libindicator/indicator-desktop-shortcuts.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/libindicator/indicator-desktop-shortcuts.c b/libindicator/indicator-desktop-shortcuts.c index 7de4084..5d16cda 100644 --- a/libindicator/indicator-desktop-shortcuts.c +++ b/libindicator/indicator-desktop-shortcuts.c @@ -59,7 +59,7 @@ static void indicator_desktop_shortcuts_finalize (GObject *object); static void set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec); static void get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec); static void parse_keyfile (IndicatorDesktopShortcuts * ids); -static gboolean should_show (GKeyFile * keyfile, const gchar * group, const gchar * identity); +static gboolean should_show (GKeyFile * keyfile, const gchar * group, const gchar * identity, gboolean should_have_target); G_DEFINE_TYPE (IndicatorDesktopShortcuts, indicator_desktop_shortcuts, G_TYPE_OBJECT); @@ -269,12 +269,12 @@ parse_keyfile (IndicatorDesktopShortcuts * ids) continue; } - if (!should_show(priv->keyfile, G_KEY_FILE_DESKTOP_GROUP, priv->identity)) { + if (!should_show(priv->keyfile, G_KEY_FILE_DESKTOP_GROUP, priv->identity, FALSE)) { g_free(groupname); continue; } - if (!should_show(priv->keyfile, groupname, priv->identity)) { + if (!should_show(priv->keyfile, groupname, priv->identity, TRUE)) { g_free(groupname); continue; } @@ -293,9 +293,9 @@ parse_keyfile (IndicatorDesktopShortcuts * ids) /* Checks the ONLY_SHOW_IN and NOT_SHOW_IN keys for a group to see if we should be showing ourselves. */ static gboolean -should_show (GKeyFile * keyfile, const gchar * group, const gchar * identity) +should_show (GKeyFile * keyfile, const gchar * group, const gchar * identity, gboolean should_have_target) { - if (g_key_file_has_key(keyfile, group, ENVIRON_KEY, NULL)) { + if (should_have_target && g_key_file_has_key(keyfile, group, ENVIRON_KEY, NULL)) { /* If we've got this key, we're going to return here and not process the deprecated keys. */ gint j; @@ -317,7 +317,9 @@ should_show (GKeyFile * keyfile, const gchar * group, const gchar * identity) } return TRUE; } else { - g_warning(GROUP_SUFFIX " does not have key '" ENVIRON_KEY "' falling back to deprecated use of '" G_KEY_FILE_DESKTOP_KEY_ONLY_SHOW_IN "' and '" G_KEY_FILE_DESKTOP_KEY_NOT_SHOW_IN "'."); + if (should_have_target) { + g_warning(GROUP_SUFFIX " does not have key '" ENVIRON_KEY "' falling back to deprecated use of '" G_KEY_FILE_DESKTOP_KEY_ONLY_SHOW_IN "' and '" G_KEY_FILE_DESKTOP_KEY_NOT_SHOW_IN "'."); + } } /* If there is a list of OnlyShowIn entries we need to check -- cgit v1.2.3 From c2457798b0df1f41fbdb1a2952abde64e673ab4b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 16 Mar 2011 13:17:22 -0500 Subject: 0.3.21 --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index a81543e..4f60db7 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,10 @@ -AC_INIT(libindicator, 0.3.20, ted@canonical.com) +AC_INIT(libindicator, 0.3.21, ted@canonical.com) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(libindicator, 0.3.20) +AM_INIT_AUTOMAKE(libindicator, 0.3.21) AM_MAINTAINER_MODE m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES]) -- cgit v1.2.3 From b36a86701b639aee81a2599de7389419674d120c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 16 Mar 2011 13:29:24 -0500 Subject: releasing version 0.3.21-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7e3da0e..c5882d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libindicator (0.3.21-0ubuntu1~ppa1) UNRELEASED; urgency=low +libindicator (0.3.21-0ubuntu1~ppa1) natty; urgency=low * New upstream release. ∘ Don't check for TargetEnvironment on the desktop group - -- Ted Gould Wed, 16 Mar 2011 13:22:47 -0500 + -- Ted Gould Wed, 16 Mar 2011 13:29:21 -0500 libindicator (0.3.20-0ubuntu1) natty; urgency=low -- cgit v1.2.3