diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2013-01-30 11:06:26 +0000 |
|---|---|---|
| committer | Tarmac <Unknown> | 2013-01-30 11:06:26 +0000 |
| commit | bd333ad26f451f27f0d412f8a42f42459377bd7c (patch) | |
| tree | 88817c7c7f21fc3c63395767e9c42acd588eefef /tests/test-libappindicator-status-client.c | |
| parent | ee33a9adfc9c657c3be11a8bcaf25e687fdde026 (diff) | |
| parent | 3e9b3f1cd28e9c9e1263796297f5d648a163be9e (diff) | |
| download | libayatana-appindicator-bd333ad26f451f27f0d412f8a42f42459377bd7c.tar.gz libayatana-appindicator-bd333ad26f451f27f0d412f8a42f42459377bd7c.tar.bz2 libayatana-appindicator-bd333ad26f451f27f0d412f8a42f42459377bd7c.zip | |
This is a continuation of ~mathieu-tl/libappindicator/fix-test-merge/ which adds fixes for bug #1102589, bug #1102595, bug #1109128, and bug #1103087, which should get it finally passing CI. Fixes: https://bugs.launchpad.net/bugs/1102589, https://bugs.launchpad.net/bugs/1102595, https://bugs.launchpad.net/bugs/1103087, https://bugs.launchpad.net/bugs/1109128.
Approved by Ted Gould, PS Jenkins bot.
Diffstat (limited to 'tests/test-libappindicator-status-client.c')
| -rw-r--r-- | tests/test-libappindicator-status-client.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/test-libappindicator-status-client.c b/tests/test-libappindicator-status-client.c index 9e39ed8..cd60e6c 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) { @@ -118,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)) { @@ -137,7 +135,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); |