diff options
| author | Michael Biebl <biebl@debian.org> | 2011-04-08 07:31:15 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2011-04-08 07:31:15 +0200 |
| commit | 9f612fa9c09bbdc00071d871316da870c6bf0023 (patch) | |
| tree | 9c1be60eceefb3b069df4d2780f9c14967a62edc /test/nm-online.c | |
| parent | af468d82c62191b070d569257eb2f2ac61da98cc (diff) | |
| parent | f75dd6fd1975146623052b843b182dc32c3fbe46 (diff) | |
Merge commit 'upstream/0.8.998' into experimental
Diffstat (limited to 'test/nm-online.c')
| -rw-r--r-- | test/nm-online.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/test/nm-online.c b/test/nm-online.c index 27bf1789..985cc774 100644 --- a/test/nm-online.c +++ b/test/nm-online.c @@ -66,7 +66,9 @@ 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) + if ( state == NM_STATE_CONNECTED_LOCAL + || state == NM_STATE_CONNECTED_SITE + || state == NM_STATE_CONNECTED_GLOBAL) g_main_loop_quit (loop); return DBUS_HANDLER_RESULT_HANDLED; @@ -193,7 +195,9 @@ 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) + if ( state == NM_STATE_CONNECTED_LOCAL + || state == NM_STATE_CONNECTED_SITE + || state == NM_STATE_CONNECTED_GLOBAL) return 0; if (exit_no_nm && (state != NM_STATE_CONNECTING)) return 1; |