From 8f0f2ad3c02996ce2362eab5383f0a4ab9175427 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 1 Dec 2009 10:40:17 -0600 Subject: Making the timeout a failure case, and making it so that we want a graceful shutdown. --- tests/service-manager-connect.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tests/service-manager-connect.c') diff --git a/tests/service-manager-connect.c b/tests/service-manager-connect.c index c252542..b62c2c9 100644 --- a/tests/service-manager-connect.c +++ b/tests/service-manager-connect.c @@ -37,6 +37,8 @@ main (int argc, char ** argv) mainloop = g_main_loop_new(NULL, FALSE); g_main_loop_run(mainloop); + g_object_unref(is); + g_debug("Quiting"); if (passed) { g_debug("Passed"); -- cgit v1.2.3 From d69de93483b5ad9e709f59dac00af7ff7f4df477 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 1 Dec 2009 10:43:10 -0600 Subject: Updating connection prototype to get all the data. --- tests/service-manager-connect.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/service-manager-connect.c') diff --git a/tests/service-manager-connect.c b/tests/service-manager-connect.c index b62c2c9..4519b83 100644 --- a/tests/service-manager-connect.c +++ b/tests/service-manager-connect.c @@ -15,7 +15,7 @@ timeout (gpointer data) } void -connection (void) +connection (IndicatorServiceManager * sm, gboolean connected, gpointer user_data) { g_debug("Connection"); passed = TRUE; @@ -30,7 +30,7 @@ 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); -- cgit v1.2.3 From 6e89bf096ce0c261e2fece0cbeb6289ea21e8c5a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 1 Dec 2009 10:47:13 -0600 Subject: Checking to make sure we don't get connected twice, that'd be an error. --- tests/service-manager-connect.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'tests/service-manager-connect.c') diff --git a/tests/service-manager-connect.c b/tests/service-manager-connect.c index 4519b83..91d2bad 100644 --- a/tests/service-manager-connect.c +++ b/tests/service-manager-connect.c @@ -17,6 +17,20 @@ timeout (gpointer data) 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); -- cgit v1.2.3