From 38d72805158b5d996b7661fa8d445352b4852f46 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 23 Feb 2011 10:47:05 +1100 Subject: * debian/control: - Use new GTK3 package naming --- debian/changelog | 7 +++++++ debian/control | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index fe711ee..813ae47 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libindicator (0.3.19-0ubuntu2) natty; urgency=low + + * debian/control: + - Use new GTK3 package naming + + -- Robert Ancell Wed, 23 Feb 2011 10:46:46 +1100 + libindicator (0.3.19-0ubuntu1~ppa1) natty; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 03085a2..c408e18 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.41), libglib2.0-dev (>= 2.22), libgtk2.0-dev (>= 2.18), - libgtk3.0-dev (>= 2.91.3), + libgtk-3-dev (>= 2.91.3), libtool, intltool, gtk-doc-tools, @@ -72,7 +72,7 @@ Section: libdevel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libgtk3.0-dev (>= 2.91.3), + libgtk-3-dev (>= 2.91.3), libindicator3-3 (= ${binary:Version}) Description: panel indicator applet - library development files This library contains information to build indicators to go into -- cgit v1.2.3 From 9b34e7c064a685f377634e35310dd40663f60455 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 2 Mar 2011 13:55:16 -0600 Subject: Adding a target environment key and checking for that over others. --- libindicator/indicator-desktop-shortcuts.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/libindicator/indicator-desktop-shortcuts.c b/libindicator/indicator-desktop-shortcuts.c index b04b482..7a92f48 100644 --- a/libindicator/indicator-desktop-shortcuts.c +++ b/libindicator/indicator-desktop-shortcuts.c @@ -30,6 +30,7 @@ License along with this library. If not, see #define GROUP_SUFFIX "Shortcut Group" #define SHORTCUTS_KEY "X-Ayatana-Desktop-Shortcuts" +#define ENVIRON_KEY "TargetEnvironment" #define PROP_DESKTOP_FILE_S "desktop-file" #define PROP_IDENTITY_S "identity" @@ -295,6 +296,31 @@ parse_keyfile (IndicatorDesktopShortcuts * ids) static gboolean should_show (GKeyFile * keyfile, const gchar * group, const gchar * identity) { + if (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; + gsize num_env = 0; + gchar ** envs = g_key_file_get_string_list(keyfile, group, ENVIRON_KEY, &num_env, NULL); + + for (j = 0; j < num_env; j++) { + if (g_strcmp0(envs[j], identity) == 0) { + break; + } + } + + if (envs != NULL) { + g_strfreev(envs); + } + + if (j == num_env) { + return FALSE; + } + 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 there is a list of OnlyShowIn entries we need to check to see if we're in that list. If not, we drop this nick */ if (g_key_file_has_key(keyfile, group, G_KEY_FILE_DESKTOP_KEY_ONLY_SHOW_IN, NULL)) { -- cgit v1.2.3 From 61e9b95cdde7ad38321389723d2309540c222475 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 2 Mar 2011 13:57:04 -0600 Subject: Removing warning that there are no shortcuts, that's a valid thing to have. --- libindicator/indicator-desktop-shortcuts.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libindicator/indicator-desktop-shortcuts.c b/libindicator/indicator-desktop-shortcuts.c index 7a92f48..7de4084 100644 --- a/libindicator/indicator-desktop-shortcuts.c +++ b/libindicator/indicator-desktop-shortcuts.c @@ -174,7 +174,6 @@ set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec } if (!g_key_file_has_key(keyfile, G_KEY_FILE_DESKTOP_GROUP, SHORTCUTS_KEY, NULL)) { - g_warning("Keyfile from file '%s' does not have '" SHORTCUTS_KEY "' key", g_value_get_string(value)); g_key_file_free(keyfile); break; } -- cgit v1.2.3 From 12047a58bcc26a3b2073452484cd8add0d8d2969 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 3 Mar 2011 13:52:38 -0600 Subject: 0.3.20 --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index cae787a..a81543e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,10 @@ -AC_INIT(libindicator, 0.3.19, ted@canonical.com) +AC_INIT(libindicator, 0.3.20, ted@canonical.com) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(libindicator, 0.3.19) +AM_INIT_AUTOMAKE(libindicator, 0.3.20) AM_MAINTAINER_MODE m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES]) -- cgit v1.2.3 From 879dc15d5e6beaf53791e81c1e238d9cfc6469a4 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 3 Mar 2011 14:02:16 -0600 Subject: releasing version 0.3.20-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 80388c4..b10d227 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libindicator (0.3.20-0ubuntu1~ppa1) UNRELEASED; urgency=low +libindicator (0.3.20-0ubuntu1~ppa1) natty; urgency=low * New upstream release. * Use the "TargetEnvironment" key in shortcuts - -- Ted Gould Thu, 03 Mar 2011 13:59:14 -0600 + -- Ted Gould Thu, 03 Mar 2011 14:02:12 -0600 libindicator (0.3.19-0ubuntu3) natty; urgency=low -- cgit v1.2.3