From 613ad629e7409c8d8542851c3b84f1e313877378 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 9 Jul 2010 09:22:20 -0500 Subject: Freeing the service. --- tests/service-version-good-service.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) 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); -- cgit v1.2.3 From dac4891e4e3c809ccc3ac08f0d7e317962808792 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 9 Jul 2010 09:30:25 -0500 Subject: A could of protections for the core. --- libindicator/indicator-service.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libindicator/indicator-service.c b/libindicator/indicator-service.c index db234e2..fc35a03 100644 --- a/libindicator/indicator-service.c +++ b/libindicator/indicator-service.c @@ -466,6 +466,9 @@ _indicator_service_server_un_watch (IndicatorService * service, DBusGMethodInvoc static void unwatch_core (IndicatorService * service, const gchar * name) { + g_return_if_fail(name != NULL); + g_return_if_fail(INDICATOR_IS_SERVICE(service)); + IndicatorServicePrivate * priv = INDICATOR_SERVICE_GET_PRIVATE(service); /* Remove us from the watcher list here */ -- cgit v1.2.3 From 74a24d7651432fb151cddb024a562bdb71aaee57 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 9 Jul 2010 09:53:20 -0500 Subject: Stop asking for the name, instead let's find it on our own. --- libindicator/indicator-service.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/libindicator/indicator-service.c b/libindicator/indicator-service.c index fc35a03..d0f8ed2 100644 --- a/libindicator/indicator-service.c +++ b/libindicator/indicator-service.c @@ -395,14 +395,26 @@ try_and_get_name (IndicatorService * service) return; } +/* Look in the hash table for the proxy, as it won't give us + its name. */ +static gboolean +hash_table_find (gpointer key, gpointer value, gpointer user_data) +{ + if (value == user_data) { + return TRUE; + } + return FALSE; +} + /* If the proxy gets destroyed that's the same as getting an unwatch signal. Make it so. */ static void proxy_destroyed (GObject * proxy, gpointer user_data) { g_return_if_fail(INDICATOR_IS_SERVICE(user_data)); + IndicatorServicePrivate * priv = INDICATOR_SERVICE_GET_PRIVATE(user_data); - const gchar * name = dbus_g_proxy_get_bus_name(DBUS_G_PROXY(proxy)); + gchar * name = (gchar *)g_hash_table_find(priv->watchers, hash_table_find, proxy); unwatch_core(INDICATOR_SERVICE(user_data), name); return; -- cgit v1.2.3 From 01130c5baedfd8547c984a14423a613282e71d42 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 9 Jul 2010 10:39:44 -0500 Subject: Start a multi watch test --- tests/Makefile.am | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tests/Makefile.am b/tests/Makefile.am index 13fef2d..04a6ed3 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -303,6 +303,18 @@ service-version-tester: service-version-manager service-version-bad-service serv TESTS += service-version-tester DISTCLEANFILES += service-version-tester service-version-bad.service service-version-good.service +############################# +# Service Versions +############################# + +service-version-multiwatch-tester: service-version-manager service-version-good-service session.conf service-version-good.service Makefile.am + @echo "#!/bin/sh" > $@ + @echo dbus-test-runner --dbus-config $(builddir)/session.conf --task ./service-version-manager --task-name Manager1 --task ./service-version-manager --task-name Manager2 >> $@ + @chmod +x $@ + +TESTS += service-version-multiwatch-tester +DISTCLEANFILES += service-version-multiwatch-tester + ############################# # Service Manager Shutdown ############################# -- cgit v1.2.3 From 6786532d0efae7037c1b5d4f970359c6410d2cd7 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 9 Jul 2010 10:42:20 -0500 Subject: Making a new manager --- tests/Makefile.am | 18 +++++++++-- tests/service-version-multiwatch-manager.c | 52 ++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 tests/service-version-multiwatch-manager.c diff --git a/tests/Makefile.am b/tests/Makefile.am index 04a6ed3..35e07f4 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -307,9 +307,23 @@ DISTCLEANFILES += service-version-tester service-version-bad.service service-ver # Service Versions ############################# -service-version-multiwatch-tester: service-version-manager service-version-good-service session.conf service-version-good.service Makefile.am +check_PROGRAMS += service-version-multiwatch-manager + +service_version_manager_SOURCES = \ + service-version-values.h \ + service-version-multiwatch-manager.c + +service_version_multiwatch_manager_CFLAGS = \ + -Wall -Werror \ + $(LIBINDICATOR_CFLAGS) -I$(top_srcdir) + +service_version_multiwatch_manager_LDADD = \ + $(LIBINDICATOR_LIBS) \ + $(top_builddir)/libindicator/.libs/libindicator.a + +service-version-multiwatch-tester: service-version-multiwatch-manager service-version-good-service session.conf service-version-good.service Makefile.am @echo "#!/bin/sh" > $@ - @echo dbus-test-runner --dbus-config $(builddir)/session.conf --task ./service-version-manager --task-name Manager1 --task ./service-version-manager --task-name Manager2 >> $@ + @echo dbus-test-runner --dbus-config $(builddir)/session.conf --task ./service-version-multiwatch-manager --task-name Manager1 --task ./service-version-multiwatch-manager --task-name Manager2 >> $@ @chmod +x $@ TESTS += service-version-multiwatch-tester diff --git a/tests/service-version-multiwatch-manager.c b/tests/service-version-multiwatch-manager.c new file mode 100644 index 0000000..7293d43 --- /dev/null +++ b/tests/service-version-multiwatch-manager.c @@ -0,0 +1,52 @@ + +#include +#include "libindicator/indicator-service-manager.h" +#include "service-version-values.h" + +static GMainLoop * mainloop = NULL; +static gboolean passed = FALSE; + +gboolean +timeout (gpointer data) +{ + g_debug("Timeout."); + passed = FALSE; + g_main_loop_quit(mainloop); + return FALSE; +} + +void +connection_good (IndicatorServiceManager * sm, gboolean connected, gpointer user_data) +{ + if (!connected) return; + g_debug("Connection From Service."); + 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_print("Manager: DBUS_SESSION_BUS_ADDRESS = %s\n", g_getenv("DBUS_SESSION_BUS_ADDRESS")); + + IndicatorServiceManager * goodis = indicator_service_manager_new_version("org.ayatana.version.good", SERVICE_VERSION_GOOD); + g_signal_connect(G_OBJECT(goodis), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, G_CALLBACK(connection_good), NULL); + + g_timeout_add_seconds(1, timeout, NULL); + + mainloop = g_main_loop_new(NULL, FALSE); + g_main_loop_run(mainloop); + + g_object_unref(goodis); + + g_debug("Quiting"); + if (passed) { + g_debug("Passed"); + return 0; + } + g_debug("Failed"); + return 1; +} -- cgit v1.2.3 From 054704d88d207c21c95823e6a8f1d1e4a884eece Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 9 Jul 2010 10:42:46 -0500 Subject: Ignoring the new builds. --- .bzrignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.bzrignore b/.bzrignore index 38d60ed..f48ec1e 100644 --- a/.bzrignore +++ b/.bzrignore @@ -152,3 +152,5 @@ tests/test-desktop-shortcuts tests/test-desktop-shortcuts-tester tests/test-desktop-shortcuts-touch-test libindicator/libindicator_la-indicator-image-helper.lo +tests/service-version-multiwatch-manager +tests/service-version-multiwatch-tester -- cgit v1.2.3 From 5731c1e07e2c2ca4d192213b3128bc5b7a3339b8 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 9 Jul 2010 10:45:18 -0500 Subject: Starting the service ourselves. --- tests/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 35e07f4..7690f10 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -323,7 +323,7 @@ service_version_multiwatch_manager_LDADD = \ service-version-multiwatch-tester: service-version-multiwatch-manager service-version-good-service session.conf service-version-good.service Makefile.am @echo "#!/bin/sh" > $@ - @echo dbus-test-runner --dbus-config $(builddir)/session.conf --task ./service-version-multiwatch-manager --task-name Manager1 --task ./service-version-multiwatch-manager --task-name Manager2 >> $@ + @echo dbus-test-runner --dbus-config $(builddir)/session.conf --task ./service-version-good-service --task-name Service --task ./service-version-multiwatch-manager --task-name Manager1 --task ./service-version-multiwatch-manager --task-name Manager2 >> $@ @chmod +x $@ TESTS += service-version-multiwatch-tester -- cgit v1.2.3 From 56dd41e5fcadc452ad1c5b0892e3cd0b5fa3da2f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 9 Jul 2010 10:50:25 -0500 Subject: Delaying the watchers to ensure that we don't dbus activate, and removing the session.conf to even allow for that. --- tests/Makefile.am | 4 ++-- tests/service-version-multiwatch-manager.c | 17 +++++++++++++---- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 7690f10..12d6dc3 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -321,9 +321,9 @@ service_version_multiwatch_manager_LDADD = \ $(LIBINDICATOR_LIBS) \ $(top_builddir)/libindicator/.libs/libindicator.a -service-version-multiwatch-tester: service-version-multiwatch-manager service-version-good-service session.conf service-version-good.service Makefile.am +service-version-multiwatch-tester: service-version-multiwatch-manager service-version-good-service Makefile.am @echo "#!/bin/sh" > $@ - @echo dbus-test-runner --dbus-config $(builddir)/session.conf --task ./service-version-good-service --task-name Service --task ./service-version-multiwatch-manager --task-name Manager1 --task ./service-version-multiwatch-manager --task-name Manager2 >> $@ + @echo dbus-test-runner --task ./service-version-good-service --task-name Service --task ./service-version-multiwatch-manager --task-name Manager1 --task ./service-version-multiwatch-manager --task-name Manager2 >> $@ @chmod +x $@ TESTS += service-version-multiwatch-tester diff --git a/tests/service-version-multiwatch-manager.c b/tests/service-version-multiwatch-manager.c index 7293d43..2edbd73 100644 --- a/tests/service-version-multiwatch-manager.c +++ b/tests/service-version-multiwatch-manager.c @@ -5,6 +5,7 @@ static GMainLoop * mainloop = NULL; static gboolean passed = FALSE; +static IndicatorServiceManager * goodis = NULL; gboolean timeout (gpointer data) @@ -25,6 +26,17 @@ connection_good (IndicatorServiceManager * sm, gboolean connected, gpointer user return; } +gboolean +delay_start (gpointer data) +{ + goodis = indicator_service_manager_new_version("org.ayatana.version.good", SERVICE_VERSION_GOOD); + g_signal_connect(G_OBJECT(goodis), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, G_CALLBACK(connection_good), NULL); + + g_timeout_add_seconds(1, timeout, NULL); + + return FALSE; +} + int main (int argc, char ** argv) { @@ -32,10 +44,7 @@ main (int argc, char ** argv) g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL); g_print("Manager: DBUS_SESSION_BUS_ADDRESS = %s\n", g_getenv("DBUS_SESSION_BUS_ADDRESS")); - IndicatorServiceManager * goodis = indicator_service_manager_new_version("org.ayatana.version.good", SERVICE_VERSION_GOOD); - g_signal_connect(G_OBJECT(goodis), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, G_CALLBACK(connection_good), NULL); - - g_timeout_add_seconds(1, timeout, NULL); + g_timeout_add(500, delay_start, NULL); mainloop = g_main_loop_new(NULL, FALSE); g_main_loop_run(mainloop); -- cgit v1.2.3 From 7c7b497e39c3a00b898a3d854a284de06e5fd081 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 9 Jul 2010 10:52:28 -0500 Subject: Okay, we need our own service too. Bah. --- .bzrignore | 1 + tests/Makefile.am | 18 ++++++++++-- tests/service-version-multiwatch-service.c | 47 ++++++++++++++++++++++++++++++ 3 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 tests/service-version-multiwatch-service.c diff --git a/.bzrignore b/.bzrignore index f48ec1e..cef9d4e 100644 --- a/.bzrignore +++ b/.bzrignore @@ -154,3 +154,4 @@ tests/test-desktop-shortcuts-touch-test libindicator/libindicator_la-indicator-image-helper.lo tests/service-version-multiwatch-manager tests/service-version-multiwatch-tester +tests/service-version-multiwatch-service diff --git a/tests/Makefile.am b/tests/Makefile.am index 12d6dc3..6a7fb42 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -321,9 +321,23 @@ service_version_multiwatch_manager_LDADD = \ $(LIBINDICATOR_LIBS) \ $(top_builddir)/libindicator/.libs/libindicator.a -service-version-multiwatch-tester: service-version-multiwatch-manager service-version-good-service Makefile.am +check_PROGRAMS += service-version-multiwatch-service + +service_version_multiwatch_service_SOURCES = \ + service-version-values.h \ + service-version-multiwatch-service.c + +service_version_multiwatch_service_CFLAGS = \ + -Wall -Werror \ + $(LIBINDICATOR_CFLAGS) -I$(top_srcdir) + +service_version_multiwatch_service_LDADD = \ + $(LIBINDICATOR_LIBS) \ + $(top_builddir)/libindicator/.libs/libindicator.a + +service-version-multiwatch-tester: service-version-multiwatch-manager service-version-multiwatch-service Makefile.am @echo "#!/bin/sh" > $@ - @echo dbus-test-runner --task ./service-version-good-service --task-name Service --task ./service-version-multiwatch-manager --task-name Manager1 --task ./service-version-multiwatch-manager --task-name Manager2 >> $@ + @echo dbus-test-runner --task ./service-version-multiwatch-service --task-name Service --task ./service-version-multiwatch-manager --task-name Manager1 --task ./service-version-multiwatch-manager --task-name Manager2 >> $@ @chmod +x $@ TESTS += service-version-multiwatch-tester diff --git a/tests/service-version-multiwatch-service.c b/tests/service-version-multiwatch-service.c new file mode 100644 index 0000000..bcfe46d --- /dev/null +++ b/tests/service-version-multiwatch-service.c @@ -0,0 +1,47 @@ + +#include +#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(); + + 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(1, 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; +} -- cgit v1.2.3 From 990a881daae02537ecc76272471bc012ca17773a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 9 Jul 2010 10:53:48 -0500 Subject: Longer timeout --- tests/service-version-multiwatch-service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/service-version-multiwatch-service.c b/tests/service-version-multiwatch-service.c index bcfe46d..ac92b36 100644 --- a/tests/service-version-multiwatch-service.c +++ b/tests/service-version-multiwatch-service.c @@ -32,7 +32,7 @@ main (int argc, char ** argv) 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(1, timeout, NULL); + g_timeout_add_seconds(2, timeout, NULL); mainloop = g_main_loop_new(NULL, FALSE); g_main_loop_run(mainloop); -- cgit v1.2.3 From dceee48da02357fcb92e45f030711a6e734a0f73 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 9 Jul 2010 10:55:59 -0500 Subject: Up to 5 watchers. --- tests/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 6a7fb42..852a963 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -337,7 +337,7 @@ service_version_multiwatch_service_LDADD = \ service-version-multiwatch-tester: service-version-multiwatch-manager service-version-multiwatch-service Makefile.am @echo "#!/bin/sh" > $@ - @echo dbus-test-runner --task ./service-version-multiwatch-service --task-name Service --task ./service-version-multiwatch-manager --task-name Manager1 --task ./service-version-multiwatch-manager --task-name Manager2 >> $@ + @echo dbus-test-runner --task ./service-version-multiwatch-service --task-name Service --task ./service-version-multiwatch-manager --task-name Manager1 --task ./service-version-multiwatch-manager --task-name Manager2 --task ./service-version-multiwatch-manager --task-name Manager3 --task ./service-version-multiwatch-manager --task-name Manager4 --task ./service-version-multiwatch-manager --task-name Manager5 >> $@ @chmod +x $@ TESTS += service-version-multiwatch-tester -- cgit v1.2.3 From b43f81d0ece9bb9c150ccbeba793f385bef6ce3b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 9 Jul 2010 10:58:17 -0500 Subject: A couple debug messages to make the test easier to read the output from. --- tests/service-version-multiwatch-manager.c | 2 ++ tests/service-version-multiwatch-service.c | 1 + 2 files changed, 3 insertions(+) diff --git a/tests/service-version-multiwatch-manager.c b/tests/service-version-multiwatch-manager.c index 2edbd73..771426f 100644 --- a/tests/service-version-multiwatch-manager.c +++ b/tests/service-version-multiwatch-manager.c @@ -29,6 +29,8 @@ connection_good (IndicatorServiceManager * sm, gboolean connected, gpointer user gboolean delay_start (gpointer data) { + g_debug("Starting Manager"); + goodis = indicator_service_manager_new_version("org.ayatana.version.good", SERVICE_VERSION_GOOD); g_signal_connect(G_OBJECT(goodis), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, G_CALLBACK(connection_good), NULL); diff --git a/tests/service-version-multiwatch-service.c b/tests/service-version-multiwatch-service.c index ac92b36..9920306 100644 --- a/tests/service-version-multiwatch-service.c +++ b/tests/service-version-multiwatch-service.c @@ -28,6 +28,7 @@ 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); -- cgit v1.2.3 -- cgit v1.2.3 From b0360dd4abbc5074909f0e4ccb2c21dff74bce29 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 9 Jul 2010 13:06:58 -0500 Subject: Adding an impolite manager. --- .bzrignore | 1 + tests/Makefile.am | 18 ++++++- .../service-version-multiwatch-manager-impolite.c | 61 ++++++++++++++++++++++ 3 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 tests/service-version-multiwatch-manager-impolite.c diff --git a/.bzrignore b/.bzrignore index cef9d4e..c3c6afd 100644 --- a/.bzrignore +++ b/.bzrignore @@ -155,3 +155,4 @@ libindicator/libindicator_la-indicator-image-helper.lo tests/service-version-multiwatch-manager tests/service-version-multiwatch-tester tests/service-version-multiwatch-service +tests/service-version-multiwatch-manager-impolite diff --git a/tests/Makefile.am b/tests/Makefile.am index 852a963..2b3b170 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -321,6 +321,20 @@ service_version_multiwatch_manager_LDADD = \ $(LIBINDICATOR_LIBS) \ $(top_builddir)/libindicator/.libs/libindicator.a +check_PROGRAMS += service-version-multiwatch-manager-impolite + +service_version_manager_impolite_SOURCES = \ + service-version-values.h \ + service-version-multiwatch-manager-impolite.c + +service_version_multiwatch_manager_impolite_CFLAGS = \ + -Wall -Werror \ + $(LIBINDICATOR_CFLAGS) -I$(top_srcdir) + +service_version_multiwatch_manager_impolite_LDADD = \ + $(LIBINDICATOR_LIBS) \ + $(top_builddir)/libindicator/.libs/libindicator.a + check_PROGRAMS += service-version-multiwatch-service service_version_multiwatch_service_SOURCES = \ @@ -335,9 +349,9 @@ service_version_multiwatch_service_LDADD = \ $(LIBINDICATOR_LIBS) \ $(top_builddir)/libindicator/.libs/libindicator.a -service-version-multiwatch-tester: service-version-multiwatch-manager service-version-multiwatch-service Makefile.am +service-version-multiwatch-tester: service-version-multiwatch-manager service-version-multiwatch-service service-version-multiwatch-manager-impolite Makefile.am @echo "#!/bin/sh" > $@ - @echo dbus-test-runner --task ./service-version-multiwatch-service --task-name Service --task ./service-version-multiwatch-manager --task-name Manager1 --task ./service-version-multiwatch-manager --task-name Manager2 --task ./service-version-multiwatch-manager --task-name Manager3 --task ./service-version-multiwatch-manager --task-name Manager4 --task ./service-version-multiwatch-manager --task-name Manager5 >> $@ + @echo dbus-test-runner --task ./service-version-multiwatch-service --task-name Service --task ./service-version-multiwatch-manager --task-name Manager1 --task ./service-version-multiwatch-manager --task-name Manager2 --task ./service-version-multiwatch-manager --task-name Manager3 --task ./service-version-multiwatch-manager --task-name Manager4 --task ./service-version-multiwatch-manager --task-name Manager5 --task ./service-version-multiwatch-manager-impolite --task-name Impolite1 >> $@ @chmod +x $@ TESTS += service-version-multiwatch-tester diff --git a/tests/service-version-multiwatch-manager-impolite.c b/tests/service-version-multiwatch-manager-impolite.c new file mode 100644 index 0000000..8bfd3c6 --- /dev/null +++ b/tests/service-version-multiwatch-manager-impolite.c @@ -0,0 +1,61 @@ + +#include +#include "libindicator/indicator-service-manager.h" +#include "service-version-values.h" + +static GMainLoop * mainloop = NULL; +static gboolean passed = FALSE; +static IndicatorServiceManager * goodis = NULL; + +gboolean +timeout (gpointer data) +{ + g_debug("Timeout."); + passed = FALSE; + g_main_loop_quit(mainloop); + return FALSE; +} + +void +connection_good (IndicatorServiceManager * sm, gboolean connected, gpointer user_data) +{ + if (!connected) return; + g_debug("Connection From Service."); + passed = TRUE; + g_main_loop_quit(mainloop); + return; +} + +gboolean +delay_start (gpointer data) +{ + g_debug("Starting Manager"); + + goodis = indicator_service_manager_new_version("org.ayatana.version.good", SERVICE_VERSION_GOOD); + g_signal_connect(G_OBJECT(goodis), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, G_CALLBACK(connection_good), NULL); + + g_timeout_add_seconds(1, timeout, NULL); + + return FALSE; +} + +int +main (int argc, char ** argv) +{ + g_type_init(); + g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL); + g_print("Manager: DBUS_SESSION_BUS_ADDRESS = %s\n", g_getenv("DBUS_SESSION_BUS_ADDRESS")); + + g_timeout_add(500, delay_start, 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; +} -- cgit v1.2.3 From 57503088efa419f9c7ceb6c77a06df5c3a1a2556 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 9 Jul 2010 13:07:57 -0500 Subject: Lots of impoliteness to make sure. --- tests/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 2b3b170..9d5e496 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -351,7 +351,7 @@ service_version_multiwatch_service_LDADD = \ service-version-multiwatch-tester: service-version-multiwatch-manager service-version-multiwatch-service service-version-multiwatch-manager-impolite Makefile.am @echo "#!/bin/sh" > $@ - @echo dbus-test-runner --task ./service-version-multiwatch-service --task-name Service --task ./service-version-multiwatch-manager --task-name Manager1 --task ./service-version-multiwatch-manager --task-name Manager2 --task ./service-version-multiwatch-manager --task-name Manager3 --task ./service-version-multiwatch-manager --task-name Manager4 --task ./service-version-multiwatch-manager --task-name Manager5 --task ./service-version-multiwatch-manager-impolite --task-name Impolite1 >> $@ + @echo dbus-test-runner --task ./service-version-multiwatch-service --task-name Service --task ./service-version-multiwatch-manager --task-name Manager1 --task ./service-version-multiwatch-manager --task-name Manager2 --task ./service-version-multiwatch-manager --task-name Manager3 --task ./service-version-multiwatch-manager --task-name Manager4 --task ./service-version-multiwatch-manager --task-name Manager5 --task ./service-version-multiwatch-manager-impolite --task-name Impolite1 --task ./service-version-multiwatch-manager-impolite --task-name Impolite2 --task ./service-version-multiwatch-manager-impolite --task-name Impolite3 >> $@ @chmod +x $@ TESTS += service-version-multiwatch-tester -- cgit v1.2.3 From c7eee08171b40c224564a5fffd3a4c5f0e32f7c9 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 9 Jul 2010 13:13:21 -0500 Subject: We want the key not the value. --- libindicator/indicator-service.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/libindicator/indicator-service.c b/libindicator/indicator-service.c index d0f8ed2..55fb650 100644 --- a/libindicator/indicator-service.c +++ b/libindicator/indicator-service.c @@ -395,12 +395,20 @@ try_and_get_name (IndicatorService * service) return; } +typedef struct _hash_table_find_t hash_table_find_t; +struct _hash_table_find_t { + GObject * proxy; + gchar * name; +}; + /* Look in the hash table for the proxy, as it won't give us its name. */ static gboolean hash_table_find (gpointer key, gpointer value, gpointer user_data) { - if (value == user_data) { + hash_table_find_t * finddata = (hash_table_find_t *)user_data; + if (value == finddata->proxy) { + finddata->name = key; return TRUE; } return FALSE; @@ -414,8 +422,11 @@ proxy_destroyed (GObject * proxy, gpointer user_data) g_return_if_fail(INDICATOR_IS_SERVICE(user_data)); IndicatorServicePrivate * priv = INDICATOR_SERVICE_GET_PRIVATE(user_data); - gchar * name = (gchar *)g_hash_table_find(priv->watchers, hash_table_find, proxy); - unwatch_core(INDICATOR_SERVICE(user_data), name); + hash_table_find_t finddata = {0}; + finddata.proxy = proxy; + + g_hash_table_find(priv->watchers, hash_table_find, &finddata); + unwatch_core(INDICATOR_SERVICE(user_data), finddata.name); return; } -- cgit v1.2.3