aboutsummaryrefslogtreecommitdiff
path: root/tests/test-libappindicator-fallback-watcher.c
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-06-21 14:13:54 -0500
committerTed Gould <ted@gould.cx>2010-06-21 14:13:54 -0500
commit3439224475debe3d7e8977a0a15a4a9c728fc8b7 (patch)
treef993851a278addc0965c014f44eadcd1292c55ea /tests/test-libappindicator-fallback-watcher.c
parent0f7ba97faf10422fd32628636c81563b04d8a6fc (diff)
parent20f0c1d8e534fc1b1d0824baa2aa5464d2b0f998 (diff)
downloadlibayatana-appindicator-3439224475debe3d7e8977a0a15a4a9c728fc8b7.tar.gz
libayatana-appindicator-3439224475debe3d7e8977a0a15a4a9c728fc8b7.tar.bz2
libayatana-appindicator-3439224475debe3d7e8977a0a15a4a9c728fc8b7.zip
Import upstream version 0.2.1
Diffstat (limited to 'tests/test-libappindicator-fallback-watcher.c')
-rw-r--r--tests/test-libappindicator-fallback-watcher.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/tests/test-libappindicator-fallback-watcher.c b/tests/test-libappindicator-fallback-watcher.c
index 70e01d1..5494082 100644
--- a/tests/test-libappindicator-fallback-watcher.c
+++ b/tests/test-libappindicator-fallback-watcher.c
@@ -27,6 +27,8 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
#include "../src/dbus-shared.h"
+gboolean kill_func (gpointer userdata);
+
static GMainLoop * mainloop = NULL;
static DBusHandlerResult
@@ -36,6 +38,10 @@ dbus_filter (DBusConnection * connection, DBusMessage * message, void * user_dat
DBusMessage * reply = dbus_message_new_method_return(message);
dbus_connection_send(connection, reply, NULL);
dbus_message_unref(reply);
+
+ /* Let the messages get out, but we're done at this point */
+ g_timeout_add(50, kill_func, NULL);
+
return DBUS_HANDLER_RESULT_HANDLED;
}
@@ -78,7 +84,7 @@ main (int argv, char ** argc)
return 1;
}
- g_usleep(250000);
+ g_usleep(500000);
g_debug("Initing");
@@ -96,8 +102,9 @@ main (int argv, char ** argc)
dbus_connection_add_filter(dbus_g_connection_get_connection(session_bus), dbus_filter, NULL, NULL);
- /* After we've got the name, let it unfallback, and then we'll drop again */
- g_timeout_add(250, kill_func, NULL);
+ /* This is the final kill function. It really shouldn't happen
+ unless we get an error. */
+ g_timeout_add(2000, kill_func, NULL);
g_debug("Entering Mainloop");