diff options
| author | Ted Gould <ted@gould.cx> | 2010-06-17 13:24:56 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-06-17 13:24:56 -0500 |
| commit | c4314c88b78310e34af5b034dc0032ca55cb204b (patch) | |
| tree | e69057ed012754f8baab91ad6d3c7196890ca53a /tests/test-libappindicator-fallback-watcher.c | |
| parent | 53d1e557e4e9e6809cc2fc25dbaaf7cc4c5aa493 (diff) | |
| parent | cdb0efc773c4dacf3062cf6bdcb7ee70c7417983 (diff) | |
| download | libayatana-appindicator-c4314c88b78310e34af5b034dc0032ca55cb204b.tar.gz libayatana-appindicator-c4314c88b78310e34af5b034dc0032ca55cb204b.tar.bz2 libayatana-appindicator-c4314c88b78310e34af5b034dc0032ca55cb204b.zip | |
* Upstream Merge
* Test fixes to make them more reliable
Diffstat (limited to 'tests/test-libappindicator-fallback-watcher.c')
| -rw-r--r-- | tests/test-libappindicator-fallback-watcher.c | 13 |
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"); |