From 5c5f7780b413dccb4b55f30da70a433a6f400020 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Fri, 12 Apr 2013 13:56:52 +0200 Subject: tests: fix compilation and make check. --- tests/service-manager-connect-service.c | 2 -- tests/service-manager-connect.c | 1 - tests/service-manager-no-connect.c | 1 - tests/service-manager-nostart-connect.c | 1 - tests/service-shutdown-timeout.c | 2 -- tests/service-version-bad-service.c | 2 -- tests/service-version-good-service.c | 2 -- tests/service-version-manager.c | 1 - tests/service-version-multiwatch-manager-impolite.c | 1 - tests/service-version-multiwatch-manager.c | 1 - tests/service-version-multiwatch-service.c | 1 - tests/test-desktop-shortcuts.c | 3 +-- tests/test-loader.c | 1 - 13 files changed, 1 insertion(+), 18 deletions(-) (limited to 'tests') diff --git a/tests/service-manager-connect-service.c b/tests/service-manager-connect-service.c index 09a7ba1..e56060a 100644 --- a/tests/service-manager-connect-service.c +++ b/tests/service-manager-connect-service.c @@ -48,8 +48,6 @@ shutdown (void) int main (int argc, char ** argv) { - g_type_init(); - g_debug("Starting service"); IndicatorService * is = indicator_service_new("org.ayatana.test"); diff --git a/tests/service-manager-connect.c b/tests/service-manager-connect.c index 5e7684f..5b07972 100644 --- a/tests/service-manager-connect.c +++ b/tests/service-manager-connect.c @@ -62,7 +62,6 @@ connection (IndicatorServiceManager * sm, gboolean connected, gpointer user_data int main (int argc, char ** argv) { - g_type_init(); g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL); IndicatorServiceManager * is = indicator_service_manager_new("org.ayatana.test"); diff --git a/tests/service-manager-no-connect.c b/tests/service-manager-no-connect.c index fab0607..ad28507 100644 --- a/tests/service-manager-no-connect.c +++ b/tests/service-manager-no-connect.c @@ -48,7 +48,6 @@ connection (void) int main (int argc, char ** argv) { - g_type_init(); g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL); IndicatorServiceManager * is = indicator_service_manager_new("my.test.name"); diff --git a/tests/service-manager-nostart-connect.c b/tests/service-manager-nostart-connect.c index ce0ac80..48f4997 100644 --- a/tests/service-manager-nostart-connect.c +++ b/tests/service-manager-nostart-connect.c @@ -62,7 +62,6 @@ connection (IndicatorServiceManager * sm, gboolean connected, gpointer user_data int main (int argc, char ** argv) { - g_type_init(); g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL); g_usleep(150000); diff --git a/tests/service-shutdown-timeout.c b/tests/service-shutdown-timeout.c index e461af0..b909077 100644 --- a/tests/service-shutdown-timeout.c +++ b/tests/service-shutdown-timeout.c @@ -48,8 +48,6 @@ shutdown (void) int main (int argc, char ** argv) { - g_type_init(); - IndicatorService * is = indicator_service_new("my.test.name"); g_signal_connect(G_OBJECT(is), INDICATOR_SERVICE_SIGNAL_SHUTDOWN, shutdown, NULL); diff --git a/tests/service-version-bad-service.c b/tests/service-version-bad-service.c index 12081d1..556575e 100644 --- a/tests/service-version-bad-service.c +++ b/tests/service-version-bad-service.c @@ -49,8 +49,6 @@ shutdown (void) int main (int argc, char ** argv) { - g_type_init(); - IndicatorService * is = indicator_service_new_version("org.ayatana.version.bad", SERVICE_VERSION_BAD); g_signal_connect(G_OBJECT(is), INDICATOR_SERVICE_SIGNAL_SHUTDOWN, shutdown, NULL); diff --git a/tests/service-version-good-service.c b/tests/service-version-good-service.c index 17f987e..9c0dde7 100644 --- a/tests/service-version-good-service.c +++ b/tests/service-version-good-service.c @@ -62,8 +62,6 @@ shutdown (void) int main (int argc, char ** argv) { - g_type_init(); - is = indicator_service_new_version("org.ayatana.version.good", SERVICE_VERSION_GOOD); g_signal_connect(G_OBJECT(is), INDICATOR_SERVICE_SIGNAL_SHUTDOWN, shutdown, NULL); diff --git a/tests/service-version-manager.c b/tests/service-version-manager.c index 9e582f5..63bd6b0 100644 --- a/tests/service-version-manager.c +++ b/tests/service-version-manager.c @@ -58,7 +58,6 @@ connection_good (IndicatorServiceManager * sm, gboolean connected, gpointer user 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")); diff --git a/tests/service-version-multiwatch-manager-impolite.c b/tests/service-version-multiwatch-manager-impolite.c index b4cd1c8..68788b9 100644 --- a/tests/service-version-multiwatch-manager-impolite.c +++ b/tests/service-version-multiwatch-manager-impolite.c @@ -64,7 +64,6 @@ delay_start (gpointer data) 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")); diff --git a/tests/service-version-multiwatch-manager.c b/tests/service-version-multiwatch-manager.c index 4db6769..633ee59 100644 --- a/tests/service-version-multiwatch-manager.c +++ b/tests/service-version-multiwatch-manager.c @@ -64,7 +64,6 @@ delay_start (gpointer data) 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")); diff --git a/tests/service-version-multiwatch-service.c b/tests/service-version-multiwatch-service.c index 30b7f00..1333d7a 100644 --- a/tests/service-version-multiwatch-service.c +++ b/tests/service-version-multiwatch-service.c @@ -49,7 +49,6 @@ shutdown (void) 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); diff --git a/tests/test-desktop-shortcuts.c b/tests/test-desktop-shortcuts.c index 2e121fa..4f20d3e 100644 --- a/tests/test-desktop-shortcuts.c +++ b/tests/test-desktop-shortcuts.c @@ -125,7 +125,7 @@ test_desktop_shortcuts_launch (void) const gchar ** nicks = indicator_desktop_shortcuts_get_nicks(ids); g_assert(nicks_contains(nicks, "touch")); - g_assert(indicator_desktop_shortcuts_nick_exec(ids, "touch")); + g_assert(indicator_desktop_shortcuts_nick_exec_with_context(ids, "touch", NULL)); g_usleep(100000); g_assert(g_file_test(BUILD_DIR "/test-desktop-shortcuts-touch-test", G_FILE_TEST_EXISTS)); @@ -149,7 +149,6 @@ test_desktop_shortcuts_suite (void) int main (int argc, char ** argv) { - g_type_init (); g_test_init (&argc, &argv, NULL); gtk_init(&argc, &argv); diff --git a/tests/test-loader.c b/tests/test-loader.c index 45901cb..28187ad 100644 --- a/tests/test-loader.c +++ b/tests/test-loader.c @@ -362,7 +362,6 @@ test_loader_creation_deletion_suite (void) int main (int argc, char ** argv) { - g_type_init (); g_test_init (&argc, &argv, NULL); gtk_init(&argc, &argv); -- cgit v1.2.3