From c5aca6545eac6999a9c0a74ede4674366d712941 Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Mon, 14 Jan 2013 10:46:51 -0500 Subject: increase another test timeout to make amd64 build --- tests/test-libappindicator-status-client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/test-libappindicator-status-client.c') diff --git a/tests/test-libappindicator-status-client.c b/tests/test-libappindicator-status-client.c index 9e39ed8..811882b 100644 --- a/tests/test-libappindicator-status-client.c +++ b/tests/test-libappindicator-status-client.c @@ -137,7 +137,7 @@ main (gint argc, gchar * argv[]) dbus_bus_add_match(dbus_g_connection_get_connection(session_bus), "type='signal',interface='" NOTIFICATION_ITEM_DBUS_IFACE "',member='NewStatus'", NULL); watchdog_hit = TRUE; - g_timeout_add(1000, kill_func, NULL); + g_timeout_add_seconds(20, kill_func, NULL); mainloop = g_main_loop_new(NULL, FALSE); g_main_loop_run(mainloop); -- cgit v1.2.3 From 6a86412258be37bb971c41b8f0ebd0a19a1463d2 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Wed, 16 Jan 2013 14:53:52 -0500 Subject: Remove deprecated calls to g_type_init() --- tests/test-libappindicator-status-client.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'tests/test-libappindicator-status-client.c') diff --git a/tests/test-libappindicator-status-client.c b/tests/test-libappindicator-status-client.c index 811882b..50e9c08 100644 --- a/tests/test-libappindicator-status-client.c +++ b/tests/test-libappindicator-status-client.c @@ -109,8 +109,6 @@ kill_func (gpointer userdata) gint main (gint argc, gchar * argv[]) { - g_type_init(); - GError * error = NULL; DBusGConnection * session_bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error); if (error != NULL) { -- cgit v1.2.3 From 345b7af04ab99882da94328308e6a65bc2df5b31 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Tue, 29 Jan 2013 11:57:42 -0600 Subject: flush the dbus connection before exiting test-libappindicator-status-server --- tests/test-libappindicator-status-client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/test-libappindicator-status-client.c') diff --git a/tests/test-libappindicator-status-client.c b/tests/test-libappindicator-status-client.c index 50e9c08..cd60e6c 100644 --- a/tests/test-libappindicator-status-client.c +++ b/tests/test-libappindicator-status-client.c @@ -116,7 +116,7 @@ main (gint argc, gchar * argv[]) return 1; } - DBusGProxy * bus_proxy = dbus_g_proxy_new_for_name(session_bus, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS); + DBusGProxy * bus_proxy = dbus_g_proxy_new_for_name(session_bus, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS); guint nameret = 0; if (!org_freedesktop_DBus_request_name(bus_proxy, NOTIFICATION_WATCHER_DBUS_ADDR, 0, &nameret, &error)) { -- cgit v1.2.3