Merging lp:~ubuntu-desktop/libindicator/ubuntu

* Merged in fix for (LP: #603489)
* New upstream release.
  * Removing checking for style properties that aren't used.
  * Make it so that a watcher dying is the same as unregistering.
* Merge debian changes
	* Drop debian/source/*
* debian/control: Switch VCS for this branch to be the indicator
  applet developers branch.
* Revert cdbs drop, as requested by the Ubuntu maintainers.
* Update Maintainer and Vcs-* fields for pkg-ayatana.
* Merge Ubuntu package into Debian.
  Closes: #549999
* debian/copyright:
  + Update to machine readable format.
* debian/control:
  + Drop cdbs Build-Dep, bump debhelper to >=7.
  + Standards-Version 3.8.4.
  + Update Vcs-* fields.
  + Drop GNOME from Description, the package is not GNOME specific.
  + Slightly update Description, thanks lintian.
* debian/rules:
  + Use minimal debhelper 7 rules without cdbs.
  + Disable tests for now, they fail (launchpad 587811)
* debian/source/format:
  + Add file, make package 3.0 (quilt).

1 files changed, 14 insertions, 1 deletions

diff --git a/tests/service-version-good-service.c b/tests/service-version-good-service.c
index bcfe46d..12a6a32 100644
--- a/tests/service-version-good-service.c
+++ b/tests/service-version-good-service.c
@@ -5,12 +5,19 @@
 
 static GMainLoop * mainloop = NULL;
 static gboolean passed = FALSE;
+static IndicatorService * is = NULL;
 
 gboolean
 timeout (gpointer data)
 {
 	passed = FALSE;
 	g_debug("Timeout with no shutdown.");
+
+	if (is != NULL) {
+		g_object_unref(is);
+		is = NULL;
+	}
+
 	g_main_loop_quit(mainloop);
 	return FALSE;
 }
@@ -20,6 +27,12 @@ shutdown (void)
 {
 	g_debug("Shutdown");
 	passed = TRUE;
+
+	if (is != NULL) {
+		g_object_unref(is);
+		is = NULL;
+	}
+
 	g_main_loop_quit(mainloop);
 	return;
 }
@@ -29,7 +42,7 @@ main (int argc, char ** argv)
 {
 	g_type_init();
 
-	IndicatorService * is = indicator_service_new_version("org.ayatana.version.good", SERVICE_VERSION_GOOD);
+	is = indicator_service_new_version("org.ayatana.version.good", SERVICE_VERSION_GOOD);
 	g_signal_connect(G_OBJECT(is), INDICATOR_SERVICE_SIGNAL_SHUTDOWN, shutdown, NULL);
 
 	g_timeout_add_seconds(1, timeout, NULL);