Merge lp:~indicator-applet-developers/indicator-application/lucid into lp:~ubuntu-desktop/indicator-application/ubuntu

[Ted Gould]

[Ted Gould (ted)]

0.0.14

=== modified file '.bzrignore'
--- .bzrignore	2010-02-06 01:30:10 +0000
+++ .bzrignore	2010-02-25 21:25:22 +0000
@@ -1,6 +1,5 @@
 data/indicator-application.service
 compile
-indicator-application-[0-9].[0-9].[0-9].tar.gz
 m4/
 src/indicator-application-service
 src/libappindicator.la
@@ -93,3 +92,11 @@
 tests/test-libappindicator-status
 tests/test-libappindicator-status-client
 tests/test-libappindicator-status-server
+bindings/mono/AppIndicator.Test.dll
+bindings/mono/libappindicator-api.middle
+bindings/mono/examples/IndicatorExample.exe
+src/libappindicator/app-indicator-enum-types.gen.c
+indicator-application-[0-9].[0-9].[0-9].tar.gz
+indicator-application-[0-9].[0-9].[0-9].tar.gz.asc
+indicator-application-[0-9].[0-9].[0-9][0-9].tar.gz
+indicator-application-[0-9].[0-9].[0-9][0-9].tar.gz.asc
 
=== modified file 'bindings/mono/libappindicator-api.metadata'
--- bindings/mono/libappindicator-api.metadata	2010-01-12 04:59:17 +0000
+++ bindings/mono/libappindicator-api.metadata	2010-02-25 21:25:22 +0000
@@ -2,9 +2,13 @@
 <metadata>
 	<attr path="/api/namespace/object[@cname='AppIndicator']" name="name">ApplicationIndicator</attr>
 	<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='new_attention_icon']" name="name">NewAttentionIcon</attr>
+	<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='new_attention_icon']" name="cname">new-attention-icon</attr>
 	<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='new_status']" name="name">NewStatus</attr>
+	<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='new_status']" name="cname">new-status</attr>
 	<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='connection_changed']" name="name">ConnectionChanged</attr>
+	<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='connection_changed']" name="cname">connection-changed</attr>
 	<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='new_icon']" name="name">NewIcon</attr>
+	<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='new_icon']" name="cname">new-icon</attr>
 	<attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='id']" name="name">ID</attr>
 	<attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_CATEGORY_S']" name="hidden"></attr>
 	<attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_CATEGORY_S']" name="hidden"></attr>
 
=== modified file 'configure.ac'
--- configure.ac	2010-02-23 16:26:10 +0000
+++ configure.ac	2010-02-25 21:25:22 +0000
@@ -1,11 +1,11 @@
 
-AC_INIT(indicator-application, 0.0.13, [e-mail])
+AC_INIT(indicator-application, 0.0.14, [e-mail])
 AC_COPYRIGHT([Copyright 2009, 2010 Canonical])
 
 AC_PREREQ(2.53)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-application, 0.0.13)
+AM_INIT_AUTOMAKE(indicator-application, 0.0.14)
 
 AM_MAINTAINER_MODE
 
 
=== modified file 'debian/changelog'
--- debian/changelog	2010-02-23 16:52:35 +0000
+++ debian/changelog	2010-02-25 21:25:22 +0000
@@ -1,3 +1,24 @@
+indicator-application (0.0.14-0ubuntu1~ppa1) lucid; urgency=low
+
+  * Upstream release 0.0.14
+    ∘ Fix mono bindings to include proper metadata (LP: #526620)
+    ∘ Send connection changed signal when the proxy is created
+      and destroyed (LP: #527082)
+    ∘ Hide the fallback status icon before unrefing it. (LP: #526041)
+    ∘ Increase dbus-glib version check to 0.82
+    ∘ Handle menu layout changes and visibility changes better.
+    ∘ Improve testing stability
+    ∘ Read menu sensitivity on startup.
+    ∘ Handle null strings when evaluating whether we have an
+      attention icon.
+    ∘ Remove dbus objects when we fallback
+    ∘ Disconnect client_menu_changed signal handlers on cleanup.
+    ∘ Handle cases where the menu gets unset on updates.
+    ∘ Fix custom labels on stock items.
+    ∘ Adds support for submenus
+
+ -- Ted Gould <[e-mail]>  Thu, 25 Feb 2010 15:22:28 -0600
+
 indicator-application (0.0.13-0ubuntu8) lucid; urgency=low
 
   * Upstream Merge
 
=== modified file 'src/libappindicator/app-indicator.c'
--- src/libappindicator/app-indicator.c	2010-02-23 15:52:09 +0000
+++ src/libappindicator/app-indicator.c	2010-02-25 21:25:22 +0000
@@ -387,6 +387,9 @@
 		g_signal_handlers_disconnect_by_func(G_OBJECT(priv->watcher_proxy), watcher_proxy_destroyed, self);
 		g_object_unref(G_OBJECT(priv->watcher_proxy));
 		priv->watcher_proxy = NULL;
+
+	    /* Emit the AppIndicator::connection-changed signal*/
+        g_signal_emit (self, signals[CONNECTION_CHANGED], 0, FALSE);
 	}
 
 	if (priv->connection != NULL) {
@@ -625,6 +628,9 @@
 	org_freedesktop_StatusNotifierWatcher_register_status_notifier_item_async(priv->watcher_proxy, path, register_service_cb, self);
 	g_free(path);
 
+	/* Emit the AppIndicator::connection-changed signal*/
+    g_signal_emit (self, signals[CONNECTION_CHANGED], 0, TRUE);
+
 	return;
 }
 
@@ -639,6 +645,10 @@
 	dbus_g_connection_unregister_g_object(self->priv->connection,
 					      G_OBJECT(self));
 	self->priv->watcher_proxy = NULL;
+
+    /* Emit the AppIndicator::connection-changed signal*/
+    g_signal_emit (self, signals[CONNECTION_CHANGED], 0, FALSE);
+	
 	start_fallback_timer(self, FALSE);
 	return;
 }
@@ -885,6 +895,7 @@
 {
 	g_signal_handlers_disconnect_by_func(G_OBJECT(self), status_icon_status_wrapper, status_icon);
 	g_signal_handlers_disconnect_by_func(G_OBJECT(self), status_icon_changes, status_icon);
+	gtk_widget_hide(GTK_WIDGET(status_icon));
 	g_object_unref(G_OBJECT(status_icon));
 	return;
 }