diff options
| author | Michael Biebl <biebl@debian.org> | 2011-04-21 10:42:53 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2011-04-21 10:42:53 +0200 |
| commit | 8baa1aca8dfd35e3190d7d5655eb83b5b901e263 (patch) | |
| tree | a9ac1e67d0c22a48330c76f08fc5291f85307055 /test/nm-online.c | |
| parent | f75dd6fd1975146623052b843b182dc32c3fbe46 (diff) | |
Imported Upstream version 0.8.4.0 upstream/0.8.4.0
Diffstat (limited to 'test/nm-online.c')
| -rw-r--r-- | test/nm-online.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/test/nm-online.c b/test/nm-online.c index 985cc774..27bf1789 100644 --- a/test/nm-online.c +++ b/test/nm-online.c @@ -66,9 +66,7 @@ static DBusHandlerResult dbus_filter (DBusConnection *connection G_GNUC_UNUSED, if (!dbus_message_get_args (message, NULL, DBUS_TYPE_UINT32, &state, DBUS_TYPE_INVALID)) return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; - if ( state == NM_STATE_CONNECTED_LOCAL - || state == NM_STATE_CONNECTED_SITE - || state == NM_STATE_CONNECTED_GLOBAL) + if (state == NM_STATE_CONNECTED) g_main_loop_quit (loop); return DBUS_HANDLER_RESULT_HANDLED; @@ -195,9 +193,7 @@ int main (int argc, char *argv[]) /* Check after we setup the filter to ensure that we cannot race. */ state = check_online (connection); - if ( state == NM_STATE_CONNECTED_LOCAL - || state == NM_STATE_CONNECTED_SITE - || state == NM_STATE_CONNECTED_GLOBAL) + if (state == NM_STATE_CONNECTED) return 0; if (exit_no_nm && (state != NM_STATE_CONNECTING)) return 1; |