← Back to branch summary

~indicator-applet-developers/libappindicator/trunk.devel

« back to all changes in this revision

Viewing changes to tests/test-libappindicator-status-client.c

  • Committer: Tarmac
  • Author(s): Charles Kerr, Mathieu Trudel-Lapierre, Michael Terry
  • Date: 2013-01-30 11:06:26 UTC
  • mfrom: (247.1.6 fix-test-merge)
  • Revision ID: tarmac-20130130110626-l39zryx7jn4mcskg
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.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test-libappindicator-status-client.c
109
109
gint
110
110
main (gint argc, gchar * argv[])
111
111
{
112
 
        g_type_init();
113
 
 
114
112
        GError * error = NULL;
115
113
        DBusGConnection * session_bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
116
114
        if (error != NULL) {
118
116
                return 1;
119
117
        }
120
118
 
121
 
    DBusGProxy * bus_proxy = dbus_g_proxy_new_for_name(session_bus, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS);
 
119
        DBusGProxy * bus_proxy = dbus_g_proxy_new_for_name(session_bus, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS);
122
120
        guint nameret = 0;
123
121
 
124
122
        if (!org_freedesktop_DBus_request_name(bus_proxy, NOTIFICATION_WATCHER_DBUS_ADDR, 0, &nameret, &error)) {
137
135
        dbus_bus_add_match(dbus_g_connection_get_connection(session_bus), "type='signal',interface='" NOTIFICATION_ITEM_DBUS_IFACE "',member='NewStatus'", NULL);
138
136
 
139
137
        watchdog_hit = TRUE;
140
 
        g_timeout_add(1000, kill_func, NULL);
 
138
        g_timeout_add_seconds(20, kill_func, NULL);
141
139
 
142
140
        mainloop = g_main_loop_new(NULL, FALSE);
143
141
        g_main_loop_run(mainloop);