Merging new upstream release and some changes from Ubuntu.

Don't drop debian/source

* 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.

1 files changed, 48 insertions, 0 deletions

diff --git a/tests/service-version-multiwatch-service.c b/tests/service-version-multiwatch-service.c
new file mode 100644
index 0000000..9920306
--- /dev/null
+++ b/tests/service-version-multiwatch-service.c
@@ -0,0 +1,48 @@
+
+#include <glib.h>
+#include "libindicator/indicator-service.h"
+#include "service-version-values.h"
+
+static GMainLoop * mainloop = NULL;
+static gboolean passed = FALSE;
+
+gboolean
+timeout (gpointer data)
+{
+	passed = FALSE;
+	g_debug("Timeout with no shutdown.");
+	g_main_loop_quit(mainloop);
+	return FALSE;
+}
+
+void
+shutdown (void)
+{
+	g_debug("Shutdown");
+	passed = TRUE;
+	g_main_loop_quit(mainloop);
+	return;
+}
+
+int
+main (int argc, char ** argv)
+{
+	g_type_init();
+	g_debug("Service starting");
+
+	IndicatorService * 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(2, timeout, NULL);
+
+	mainloop = g_main_loop_new(NULL, FALSE);
+	g_main_loop_run(mainloop);
+
+	g_debug("Quiting");
+	if (passed) {
+		g_debug("Passed");
+		return 0;
+	}
+	g_debug("Failed");
+	return 1;
+}