From ba84fd642cb93f5cd46fac00ccbddf33c7fe46cb Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 28 Sep 2011 14:57:38 -0400 Subject: releasing version 0.4.1-0ubuntu1 --- debian/changelog | 13 ++++++++----- debian/control | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 88621f2..c774a0a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,14 @@ -libappindicator (0.4.1-0ubuntu1~ppa1) oneiric; urgency=low +libappindicator (0.4.1-0ubuntu1) oneiric; urgency=low - * New upstream release (0.4.0). + [ Ted Gould ] + * New upstream release. * Fix VAPI file for Vala bindings (LP: #789588) - * New upstream release (0.4.1). - * Fix build. - -- Ted Gould Wed, 28 Sep 2011 12:53:44 -0500 + [ Ken VanDine ] + * debian/control + - build depend on valac-0.14 + + -- Ken VanDine Wed, 28 Sep 2011 14:41:38 -0400 libappindicator (0.3.91-0ubuntu1) oneiric; urgency=low diff --git a/debian/control b/debian/control index a61696a..d78f64d 100644 --- a/debian/control +++ b/debian/control @@ -31,7 +31,7 @@ Build-Depends: debhelper (>= 7.0), gir1.2-glib-2.0, gir1.2-gtk-2.0, gir1.2-gtk-3.0, - valac-0.12 + valac-0.14 Standards-Version: 3.9.1 Homepage: https://launchpad.net/libappindicator Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/libappindicator/ubuntu -- cgit v1.2.3 From 6ecd10fbb57cea400d59ad68da1d0fc602264c4e Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 30 Sep 2011 11:26:17 +0200 Subject: src/app-indicator.c: when using the fallback icon, first check if there is a "-panel" version of the icon available and if not fallback to the indicator one --- src/app-indicator.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/app-indicator.c b/src/app-indicator.c index c2f0f69..c9e7ab9 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -1523,20 +1523,21 @@ status_icon_changes (AppIndicator * self, gpointer data) GtkStatusIcon * icon = GTK_STATUS_ICON(data); gchar *longname = NULL; + /* set longname only if its actually in the icon theme */ + longname = append_panel_icon_suffix(app_indicator_get_icon(self)); + if (gtk_icon_theme_has_icon (gtk_icon_theme_get_default(), longname)) + gtk_status_icon_set_from_icon_name(icon, longname); + else + gtk_status_icon_set_from_icon_name(icon, app_indicator_get_icon(self)); + switch (app_indicator_get_status(self)) { case APP_INDICATOR_STATUS_PASSIVE: - longname = append_panel_icon_suffix(app_indicator_get_icon(self)); gtk_status_icon_set_visible(icon, FALSE); - gtk_status_icon_set_from_icon_name(icon, longname); break; case APP_INDICATOR_STATUS_ACTIVE: - longname = append_panel_icon_suffix(app_indicator_get_icon(self)); - gtk_status_icon_set_from_icon_name(icon, longname); gtk_status_icon_set_visible(icon, TRUE); break; case APP_INDICATOR_STATUS_ATTENTION: - longname = append_panel_icon_suffix(app_indicator_get_attention_icon(self)); - gtk_status_icon_set_from_icon_name(icon, longname); gtk_status_icon_set_visible(icon, TRUE); break; }; -- cgit v1.2.3 From f476076f2bc74a408f135895c9a6d7f96329bac0 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 30 Sep 2011 16:38:11 +0200 Subject: unbreak attention_icon --- src/app-indicator.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/src/app-indicator.c b/src/app-indicator.c index c9e7ab9..21276c6 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -1523,21 +1523,30 @@ status_icon_changes (AppIndicator * self, gpointer data) GtkStatusIcon * icon = GTK_STATUS_ICON(data); gchar *longname = NULL; - /* set longname only if its actually in the icon theme */ - longname = append_panel_icon_suffix(app_indicator_get_icon(self)); - if (gtk_icon_theme_has_icon (gtk_icon_theme_get_default(), longname)) - gtk_status_icon_set_from_icon_name(icon, longname); - else - gtk_status_icon_set_from_icon_name(icon, app_indicator_get_icon(self)); - switch (app_indicator_get_status(self)) { case APP_INDICATOR_STATUS_PASSIVE: + longname = append_panel_icon_suffix(app_indicator_get_icon(self)); + if (gtk_icon_theme_has_icon (gtk_icon_theme_get_default(), longname)) + gtk_status_icon_set_from_icon_name(icon, longname); + else + gtk_status_icon_set_from_icon_name(icon, app_indicator_get_icon(self)); gtk_status_icon_set_visible(icon, FALSE); break; case APP_INDICATOR_STATUS_ACTIVE: + longname = append_panel_icon_suffix(app_indicator_get_icon(self)); + if (gtk_icon_theme_has_icon (gtk_icon_theme_get_default(), longname)) + gtk_status_icon_set_from_icon_name(icon, longname); + else + gtk_status_icon_set_from_icon_name(icon, app_indicator_get_icon(self)); gtk_status_icon_set_visible(icon, TRUE); break; case APP_INDICATOR_STATUS_ATTENTION: + /* get the _attention_ icon here */ + longname = append_panel_icon_suffix(app_indicator_get_attention_icon(self)); + if (gtk_icon_theme_has_icon (gtk_icon_theme_get_default(), longname)) + gtk_status_icon_set_from_icon_name(icon, longname); + else + gtk_status_icon_set_from_icon_name(icon, app_indicator_get_icon(self)); gtk_status_icon_set_visible(icon, TRUE); break; }; -- cgit v1.2.3 From 4aca6f60949a7c707f33fa6f39257613b7d6d5d5 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 30 Sep 2011 16:44:39 +0200 Subject: src/app-indicator.c: honor icon_theme_path in the fallback --- src/app-indicator.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/app-indicator.c b/src/app-indicator.c index 21276c6..7b5e0f2 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -1523,10 +1523,19 @@ status_icon_changes (AppIndicator * self, gpointer data) GtkStatusIcon * icon = GTK_STATUS_ICON(data); gchar *longname = NULL; + GtkIconTheme *icon_theme; + if (self->priv->icon_theme_path != NULL) + { + icon_theme = gtk_icon_theme_new(); + gtk_icon_theme_prepend_search_path(icon_theme, self->priv->icon_theme_path); + } else { + icon_theme = gtk_icon_theme_get_default(); + } + switch (app_indicator_get_status(self)) { case APP_INDICATOR_STATUS_PASSIVE: longname = append_panel_icon_suffix(app_indicator_get_icon(self)); - if (gtk_icon_theme_has_icon (gtk_icon_theme_get_default(), longname)) + if (gtk_icon_theme_has_icon (icon_theme, longname)) gtk_status_icon_set_from_icon_name(icon, longname); else gtk_status_icon_set_from_icon_name(icon, app_indicator_get_icon(self)); @@ -1534,7 +1543,7 @@ status_icon_changes (AppIndicator * self, gpointer data) break; case APP_INDICATOR_STATUS_ACTIVE: longname = append_panel_icon_suffix(app_indicator_get_icon(self)); - if (gtk_icon_theme_has_icon (gtk_icon_theme_get_default(), longname)) + if (gtk_icon_theme_has_icon (icon_theme, longname)) gtk_status_icon_set_from_icon_name(icon, longname); else gtk_status_icon_set_from_icon_name(icon, app_indicator_get_icon(self)); @@ -1543,7 +1552,7 @@ status_icon_changes (AppIndicator * self, gpointer data) case APP_INDICATOR_STATUS_ATTENTION: /* get the _attention_ icon here */ longname = append_panel_icon_suffix(app_indicator_get_attention_icon(self)); - if (gtk_icon_theme_has_icon (gtk_icon_theme_get_default(), longname)) + if (gtk_icon_theme_has_icon (icon_theme, longname)) gtk_status_icon_set_from_icon_name(icon, longname); else gtk_status_icon_set_from_icon_name(icon, app_indicator_get_icon(self)); @@ -1554,6 +1563,9 @@ status_icon_changes (AppIndicator * self, gpointer data) if (longname) { g_free(longname); } + if (icon_theme != gtk_icon_theme_get_default()) { + g_object_unref(icon_theme); + } return; } -- cgit v1.2.3 From 5819385d28106fd7f511fc4e8eb4960b46a5fc37 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 30 Sep 2011 17:54:29 +0200 Subject: simplify --- src/app-indicator.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/app-indicator.c b/src/app-indicator.c index 7b5e0f2..13c7ce4 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -1523,13 +1523,10 @@ status_icon_changes (AppIndicator * self, gpointer data) GtkStatusIcon * icon = GTK_STATUS_ICON(data); gchar *longname = NULL; - GtkIconTheme *icon_theme; + GtkIconTheme *icon_theme = gtk_icon_theme_get_default(); if (self->priv->icon_theme_path != NULL) { - icon_theme = gtk_icon_theme_new(); - gtk_icon_theme_prepend_search_path(icon_theme, self->priv->icon_theme_path); - } else { - icon_theme = gtk_icon_theme_get_default(); + gtk_icon_theme_append_search_path(icon_theme, self->priv->icon_theme_path); } switch (app_indicator_get_status(self)) { @@ -1563,9 +1560,6 @@ status_icon_changes (AppIndicator * self, gpointer data) if (longname) { g_free(longname); } - if (icon_theme != gtk_icon_theme_get_default()) { - g_object_unref(icon_theme); - } return; } -- cgit v1.2.3 From ff65f9f759bad5b929e1057a3ca482ef0107649c Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 30 Sep 2011 18:04:27 +0200 Subject: src/app-indicator.c: do not add the same icon_theme_path again, gtk3 apparently does not check this --- src/app-indicator.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/app-indicator.c b/src/app-indicator.c index 13c7ce4..285abd6 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -1523,10 +1523,25 @@ status_icon_changes (AppIndicator * self, gpointer data) GtkStatusIcon * icon = GTK_STATUS_ICON(data); gchar *longname = NULL; + /* add the icon_theme_path once if needed */ GtkIconTheme *icon_theme = gtk_icon_theme_get_default(); if (self->priv->icon_theme_path != NULL) { - gtk_icon_theme_append_search_path(icon_theme, self->priv->icon_theme_path); + gchar **path; + gint n_elements, i; + gboolean found=FALSE; + gtk_icon_theme_get_search_path(icon_theme, &path, &n_elements); + for (i=0; i< n_elements || path[i] == NULL; i++) + { + if(g_strcmp0(path[i], self->priv->icon_theme_path) == 0) + { + found=TRUE; + break; + } + } + if(!found) + gtk_icon_theme_append_search_path(icon_theme, self->priv->icon_theme_path); + g_strfreev (path); } switch (app_indicator_get_status(self)) { -- cgit v1.2.3 From d1788f9e65073e31af39d638d72fcd2e0854ecf7 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 30 Sep 2011 18:14:52 +0200 Subject: src/app-indicator.c: hide first in passive mode and add comment about it --- src/app-indicator.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app-indicator.c b/src/app-indicator.c index 285abd6..f885cc7 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -1546,12 +1546,13 @@ status_icon_changes (AppIndicator * self, gpointer data) switch (app_indicator_get_status(self)) { case APP_INDICATOR_STATUS_PASSIVE: + /* hide first to avoid that the change is visible to the user */ + gtk_status_icon_set_visible(icon, FALSE); longname = append_panel_icon_suffix(app_indicator_get_icon(self)); if (gtk_icon_theme_has_icon (icon_theme, longname)) gtk_status_icon_set_from_icon_name(icon, longname); else gtk_status_icon_set_from_icon_name(icon, app_indicator_get_icon(self)); - gtk_status_icon_set_visible(icon, FALSE); break; case APP_INDICATOR_STATUS_ACTIVE: longname = append_panel_icon_suffix(app_indicator_get_icon(self)); -- cgit v1.2.3 From b1064de96e3dade8b4eceff1e5a103e6757a5643 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 30 Sep 2011 23:00:11 +0200 Subject: releasing version 0.4.1-0ubuntu2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 220b86c..d5bcbdf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -libappindicator (0.4.1-0ubuntu2) UNRELEASED; urgency=low +libappindicator (0.4.1-0ubuntu2) oneiric; urgency=low * src/app-indicator.c: - fix fallback icon of the GtkStatusIcon (LP: #820080), cherry pick of r221 from lp:libappindicator - -- Michael Vogt Fri, 30 Sep 2011 21:26:40 +0200 + -- Michael Vogt Fri, 30 Sep 2011 22:57:46 +0200 libappindicator (0.4.1-0ubuntu1) oneiric; urgency=low -- cgit v1.2.3 From 95620c4bca686364c0b98ec4cc9b5aa4fae40d65 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Tue, 24 Jan 2012 14:22:39 -0500 Subject: Don't specify pyglib-2.0-python2.6 in LDFLAGS, it isn't needed and only works with python2.6 --- bindings/python/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am index 0b606db..7febc11 100644 --- a/bindings/python/Makefile.am +++ b/bindings/python/Makefile.am @@ -19,7 +19,7 @@ pkgappindicator_PYTHON = __init__.py appindicatordir = $(pkgpyexecdir)/appindicator appindicator_LTLIBRARIES = _appindicator.la -_appindicator_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_appindicator -lpyglib-2.0-python2.6 +_appindicator_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_appindicator _appindicator_la_LIBADD = $(APPINDICATOR_PYTHON_LIBS) -L$(top_builddir)/src/.libs -lappindicator _appindicator_la_SOURCES = appindicatormodule.c nodist__appindicator_la_SOURCES = appindicator.c -- cgit v1.2.3 From 5452357568fb7c5f72fd7d9b6b73ae53cff0e1a7 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Tue, 24 Jan 2012 14:23:56 -0500 Subject: no change rebuild for libindicator7 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index d5bcbdf..f413635 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libappindicator (0.4.1-0ubuntu3) UNRELEASED; urgency=low + + * no change rebuild for libindicator7 + + -- Ken VanDine Tue, 24 Jan 2012 12:58:34 -0500 + libappindicator (0.4.1-0ubuntu2) oneiric; urgency=low * src/app-indicator.c: -- cgit v1.2.3 From 9055ae0aac5986a9c84ef30b34377a14b8c40298 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Tue, 24 Jan 2012 22:12:54 -0500 Subject: - Don't specify pyglib-2.0-python2.6 in LDFLAGS - dhr_autoreconf * debian/libappindicator1.symbols, debian/libappindicator3-1.symbols - added symbols * s/pyglib-2.0-python2.6/pyglib-2.0-python2.7/ for python bindings. --- debian/changelog | 15 +++++++++++---- debian/libappindicator1.symbols | 4 ++-- debian/libappindicator3-1.symbols | 4 ++-- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2603f91..15bf497 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,16 +1,23 @@ -libappindicator (0.4.1-0ubuntu3) UNRELEASED; urgency=low +libappindicator (0.4.1-0ubuntu4) UNRELEASED; urgency=low * rebuild for libindicator7 * bindings/python/Makefile.am - - Don't specify pyglib-2.0-python2.6 in LDFLAGS, it isn't needed and - only works with python2.6 + - Don't specify pyglib-2.0-python2.6 in LDFLAGS * debian/rules - - include autoreconf.mk + - dhr_autoreconf * debian/control - added build dep on dh-autoreconf + * debian/libappindicator1.symbols, debian/libappindicator3-1.symbols + - added symbols -- Ken VanDine Tue, 24 Jan 2012 12:58:34 -0500 +libappindicator (0.4.1-0ubuntu3) precise; urgency=low + + * s/pyglib-2.0-python2.6/pyglib-2.0-python2.7/ for python bindings. + + -- Adam Conrad Sat, 03 Dec 2011 21:28:16 -0700 + libappindicator (0.4.1-0ubuntu2) oneiric; urgency=low * src/app-indicator.c: diff --git a/debian/libappindicator1.symbols b/debian/libappindicator1.symbols index eb2e7b0..0ee8bd0 100644 --- a/debian/libappindicator1.symbols +++ b/debian/libappindicator1.symbols @@ -12,7 +12,7 @@ libappindicator.so.1 libappindicator1 #MINVER# app_indicator_get_label_guide@Base 0.2.91 app_indicator_get_menu@Base 0.2.91 app_indicator_get_ordering_index@Base 0.2.91 - app_indicator_get_secondary_activate_target@Base 0.4.1 + app_indicator_get_secondary_activate_target@Base 0.3.91 app_indicator_get_status@Base 0.2.91 app_indicator_get_type@Base 0.2.91 app_indicator_new@Base 0.2.91 @@ -25,6 +25,6 @@ libappindicator.so.1 libappindicator1 #MINVER# app_indicator_set_label@Base 0.2.91 app_indicator_set_menu@Base 0.2.91 app_indicator_set_ordering_index@Base 0.2.91 - app_indicator_set_secondary_activate_target@Base 0.4.1 + app_indicator_set_secondary_activate_target@Base 0.3.91 app_indicator_set_status@Base 0.2.91 app_indicator_status_get_type@Base 0.2.91 diff --git a/debian/libappindicator3-1.symbols b/debian/libappindicator3-1.symbols index b25a2b2..0dc29aa 100644 --- a/debian/libappindicator3-1.symbols +++ b/debian/libappindicator3-1.symbols @@ -12,7 +12,7 @@ libappindicator3.so.1 libappindicator3-1 #MINVER# app_indicator_get_label_guide@Base 0.2.92 app_indicator_get_menu@Base 0.2.92 app_indicator_get_ordering_index@Base 0.2.92 - app_indicator_get_secondary_activate_target@Base 0.4.1 + app_indicator_get_secondary_activate_target@Base 0.3.91 app_indicator_get_status@Base 0.2.92 app_indicator_get_type@Base 0.2.92 app_indicator_new@Base 0.2.92 @@ -25,6 +25,6 @@ libappindicator3.so.1 libappindicator3-1 #MINVER# app_indicator_set_label@Base 0.2.92 app_indicator_set_menu@Base 0.2.92 app_indicator_set_ordering_index@Base 0.2.92 - app_indicator_set_secondary_activate_target@Base 0.4.1 + app_indicator_set_secondary_activate_target@Base 0.3.91 app_indicator_set_status@Base 0.2.92 app_indicator_status_get_type@Base 0.2.92 -- cgit v1.2.3 From 996677f97a04275f47fcc3c540ed7df5333677fe Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 25 Jan 2012 09:50:46 -0500 Subject: releasing version 0.4.1-0ubuntu4 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 15bf497..7cd43a3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libappindicator (0.4.1-0ubuntu4) UNRELEASED; urgency=low +libappindicator (0.4.1-0ubuntu4) precise; urgency=low * rebuild for libindicator7 * bindings/python/Makefile.am @@ -10,7 +10,7 @@ libappindicator (0.4.1-0ubuntu4) UNRELEASED; urgency=low * debian/libappindicator1.symbols, debian/libappindicator3-1.symbols - added symbols - -- Ken VanDine Tue, 24 Jan 2012 12:58:34 -0500 + -- Ken VanDine Wed, 25 Jan 2012 09:49:38 -0500 libappindicator (0.4.1-0ubuntu3) precise; urgency=low -- cgit v1.2.3