Sync with U. Desktop

7 files changed, 83 insertions, 14 deletions

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
diff --git a/debian/changelog b/debian/changelog
index 88621f2..7cd43a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,42 @@
-libappindicator (0.4.1-0ubuntu1~ppa1) oneiric; urgency=low
+libappindicator (0.4.1-0ubuntu4) precise; urgency=low
 
-  * New upstream release (0.4.0).
+  * rebuild for libindicator7
+  * bindings/python/Makefile.am
+    - Don't specify pyglib-2.0-python2.6 in LDFLAGS
+  * debian/rules
+    - dhr_autoreconf
+  * debian/control
+    - added build dep on dh-autoreconf
+  * debian/libappindicator1.symbols, debian/libappindicator3-1.symbols
+    - added symbols
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Wed, 25 Jan 2012 09:49:38 -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 <adconrad@ubuntu.com>  Sat, 03 Dec 2011 21:28:16 -0700
+
+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 <michael.vogt@ubuntu.com>  Fri, 30 Sep 2011 22:57:46 +0200
+
+libappindicator (0.4.1-0ubuntu1) oneiric; urgency=low
+
+  [ Ted Gould ]
+  * New upstream release.
     * Fix VAPI file for Vala bindings (LP: #789588)
-  * New upstream release (0.4.1).
-    * Fix build.
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 28 Sep 2011 12:53:44 -0500
+  [ Ken VanDine ]
+  * debian/control
+    - build depend on valac-0.14
+
+ -- Ken VanDine <ken.vandine@canonical.com>  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..1f2a597 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,8 @@ Build-Depends: debhelper (>= 7.0),
                gir1.2-glib-2.0,
                gir1.2-gtk-2.0,
                gir1.2-gtk-3.0,
-               valac-0.12
+               dh-autoreconf,
+               valac-0.14
 Standards-Version: 3.9.1
 Homepage: https://launchpad.net/libappindicator
 Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/libappindicator/ubuntu
diff --git a/debian/libappindicator1.symbols b/debian/libappindicator1.symbols
index 4525737..0ee8bd0 100644
--- a/debian/libappindicator1.symbols
+++ b/debian/libappindicator1.symbols
@@ -12,6 +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.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
@@ -24,5 +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.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 03b5e24..0dc29aa 100644
--- a/debian/libappindicator3-1.symbols
+++ b/debian/libappindicator3-1.symbols
@@ -12,6 +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.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
@@ -24,5 +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.3.91
  app_indicator_set_status@Base 0.2.92
  app_indicator_status_get_type@Base 0.2.92
diff --git a/debian/rules b/debian/rules
index 599b53e..b2507f5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,7 @@ API_VERSION = 0.1
 DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc --enable-introspection
 
 configure-stamp-%:
+	dh_autoreconf
 	mkdir build-$*
 	cd build-$* && PYTHON=`which $*` \
 		$(DEB_CONFIGURE_SCRIPT) $(DEB_CONFIGURE_NORMAL_ARGS) --srcdir=..
diff --git a/src/app-indicator.c b/src/app-indicator.c
index c2f0f69..f885cc7 100644
--- a/src/app-indicator.c
+++ b/src/app-indicator.c
@@ -1523,20 +1523,52 @@ 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)
+        {
+                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)) {
 	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);
+                /* 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));
 		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);
+                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, 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);
+                /* get the _attention_ icon here */
+                longname = append_panel_icon_suffix(app_indicator_get_attention_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, TRUE);
 		break;
 	};