diff options
author | Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> | 2013-01-23 12:57:19 -0500 |
---|---|---|
committer | Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> | 2013-01-23 12:57:19 -0500 |
commit | 1c9c770b6f15b6743997eb5a9c9c8d1faa57ebd7 (patch) | |
tree | e6070a75b148a3c49aaa29c4b2cefcc9c886072e /tests/test-libappindicator-status-client.c | |
parent | ee33a9adfc9c657c3be11a8bcaf25e687fdde026 (diff) | |
parent | 6a86412258be37bb971c41b8f0ebd0a19a1463d2 (diff) | |
download | libayatana-appindicator-1c9c770b6f15b6743997eb5a9c9c8d1faa57ebd7.tar.gz libayatana-appindicator-1c9c770b6f15b6743997eb5a9c9c8d1faa57ebd7.tar.bz2 libayatana-appindicator-1c9c770b6f15b6743997eb5a9c9c8d1faa57ebd7.zip |
resolve conflicts on acinclude.m4
Diffstat (limited to 'tests/test-libappindicator-status-client.c')
-rw-r--r-- | tests/test-libappindicator-status-client.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tests/test-libappindicator-status-client.c b/tests/test-libappindicator-status-client.c index 9e39ed8..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) { @@ -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); |