From 7ceee62eb53671e2dd5211ca693e47877b55f2dd Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Sat, 8 Aug 2020 10:05:24 +0200 Subject: Fix tests and deprecations (fixes #1) --- .../service-version-multiwatch-manager-impolite.c | 56 +++++++++++----------- 1 file changed, 28 insertions(+), 28 deletions(-) (limited to 'tests/service-version-multiwatch-manager-impolite.c') diff --git a/tests/service-version-multiwatch-manager-impolite.c b/tests/service-version-multiwatch-manager-impolite.c index 68788b9..4e3a5a9 100644 --- a/tests/service-version-multiwatch-manager-impolite.c +++ b/tests/service-version-multiwatch-manager-impolite.c @@ -1,5 +1,5 @@ /* -Test for libindicator +Test for libayatana-indicator Copyright 2009 Canonical Ltd. @@ -22,7 +22,7 @@ License along with this library. If not, see #include -#include "libindicator/indicator-service-manager.h" +#include "libayatana-indicator/indicator-service-manager.h" #include "service-version-values.h" static GMainLoop * mainloop = NULL; @@ -32,51 +32,51 @@ static IndicatorServiceManager * goodis = NULL; gboolean timeout (gpointer data) { - g_debug("Timeout."); - passed = FALSE; - g_main_loop_quit(mainloop); - return FALSE; + 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; + 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"); + 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); + 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_seconds(1, timeout, NULL); - return FALSE; + return FALSE; } int 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")); + 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); + g_timeout_add(500, delay_start, NULL); - mainloop = g_main_loop_new(NULL, FALSE); - g_main_loop_run(mainloop); + 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; + g_debug("Quiting"); + if (passed) { + g_debug("Passed"); + return 0; + } + g_debug("Failed"); + return 1; } -- cgit v1.2.3