Adding an unwatch command to allow for graceful disconnection from a service if we're not interested in it.

4 files changed, 112 insertions, 5 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 80c4191..09a227d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -6,6 +6,7 @@ check_PROGRAMS = \
 	service-manager-no-connect \
 	service-manager-connect \
 	service-manager-connect-service \
+	service-manager-nostart-connect \
 	service-shutdown-timeout
 
 lib_LTLIBRARIES = \
@@ -200,6 +201,29 @@ TESTS += service-manager-connect-tester
 DISTCLEANFILES += service-manager-connect-tester session.conf service-manager-connect.service
 
 #############################
+# Service Manager Shutdown
+#############################
+
+service_manager_nostart_connect_SOURCES = \
+	service-manager-nostart-connect.c
+
+service_manager_nostart_connect_CFLAGS = \
+	-Wall -Werror \
+	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+
+service_manager_nostart_connect_LDADD = \
+	$(LIBINDICATOR_LIBS) \
+	$(top_builddir)/libindicator/.libs/libindicator.a
+
+service-manager-connect-nostart-tester: service-manager-nostart-connect service-manager-connect-service Makefile.am
+	@echo "#!/bin/sh" > $@
+	@echo dbus-test-runner --task ./service-manager-nostart-connect --task ./service-manager-connect-service >> $@
+	@chmod +x $@
+
+TESTS += service-manager-connect-nostart-tester
+DISTCLEANFILES += service-manager-connect-nostart-tester
+
+#############################
 # Test stuff
 #############################
 
diff --git a/tests/service-manager-connect-service.c b/tests/service-manager-connect-service.c
index 297f3ba..d60e414 100644
--- a/tests/service-manager-connect-service.c
+++ b/tests/service-manager-connect-service.c
@@ -8,7 +8,7 @@ static gboolean passed = FALSE;
 gboolean
 timeout (gpointer data)
 {
-	passed = TRUE;
+	passed = FALSE;
 	g_debug("Timeout with no shutdown.");
 	g_main_loop_quit(mainloop);
 	return FALSE;
@@ -17,8 +17,8 @@ timeout (gpointer data)
 void
 shutdown (void)
 {
-	g_error("Shutdown");
-	passed = FALSE;
+	g_debug("Shutdown");
+	passed = TRUE;
 	g_main_loop_quit(mainloop);
 	return;
 }
@@ -28,6 +28,8 @@ main (int argc, char ** argv)
 {
 	g_type_init();
 
+	g_debug("Starting service");
+
 	IndicatorService * is = indicator_service_new("org.ayatana.test");
 	g_signal_connect(G_OBJECT(is), INDICATOR_SERVICE_SIGNAL_SHUTDOWN, shutdown, NULL);
 
diff --git a/tests/service-manager-connect.c b/tests/service-manager-connect.c
index c252542..91d2bad 100644
--- a/tests/service-manager-connect.c
+++ b/tests/service-manager-connect.c
@@ -15,8 +15,22 @@ timeout (gpointer data)
 }
 
 void
-connection (void)
+connection (IndicatorServiceManager * sm, gboolean connected, gpointer user_data)
 {
+	static gboolean has_connected = FALSE;
+
+	if (has_connected && connected) {
+		g_warning("We got two connected signals.  FAIL.");
+		passed = FALSE;
+		return;
+	}
+
+	if (!connected) {
+		g_debug("Not connected");
+		return;
+	}
+
+	has_connected = TRUE;
 	g_debug("Connection");
 	passed = TRUE;
 	g_main_loop_quit(mainloop);
@@ -30,13 +44,15 @@ main (int argc, char ** argv)
 	g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL);
 
 	IndicatorServiceManager * is = indicator_service_manager_new("org.ayatana.test");
-	g_signal_connect(G_OBJECT(is), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, connection, NULL);
+	g_signal_connect(G_OBJECT(is), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, G_CALLBACK(connection), NULL);
 
 	g_timeout_add_seconds(1, timeout, NULL);
 
 	mainloop = g_main_loop_new(NULL, FALSE);
 	g_main_loop_run(mainloop);
 
+	g_object_unref(is);
+
 	g_debug("Quiting");
 	if (passed) {
 		g_debug("Passed");
diff --git a/tests/service-manager-nostart-connect.c b/tests/service-manager-nostart-connect.c
new file mode 100644
index 0000000..7107f42
--- /dev/null
+++ b/tests/service-manager-nostart-connect.c
@@ -0,0 +1,65 @@
+
+#include <glib.h>
+#include "libindicator/indicator-service-manager.h"
+
+static GMainLoop * mainloop = NULL;
+static gboolean passed = FALSE;
+
+gboolean
+timeout (gpointer data)
+{
+	passed = FALSE;
+	g_error("Timeout with no connection.");
+	g_main_loop_quit(mainloop);
+	return FALSE;
+}
+
+void
+connection (IndicatorServiceManager * sm, gboolean connected, gpointer user_data)
+{
+	static gboolean has_connected = FALSE;
+
+	if (has_connected && connected) {
+		g_warning("We got two connected signals.  FAIL.");
+		passed = FALSE;
+		return;
+	}
+
+	if (!connected) {
+		g_debug("Not connected");
+		return;
+	}
+
+	has_connected = TRUE;
+	g_debug("Connection");
+	passed = TRUE;
+	g_main_loop_quit(mainloop);
+	return;
+}
+
+int
+main (int argc, char ** argv)
+{
+	g_type_init();
+	g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL);
+
+	g_usleep(150000);
+
+	IndicatorServiceManager * is = indicator_service_manager_new("org.ayatana.test");
+	g_signal_connect(G_OBJECT(is), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, G_CALLBACK(connection), NULL);
+
+	g_timeout_add_seconds(1, timeout, NULL);
+
+	mainloop = g_main_loop_new(NULL, FALSE);
+	g_main_loop_run(mainloop);
+
+	g_object_unref(is);
+
+	g_debug("Quiting");
+	if (passed) {
+		g_debug("Passed");
+		return 0;
+	}
+	g_debug("Failed");
+	return 1;
+}