diff options
| author | Michael Biebl <biebl@debian.org> | 2012-10-26 21:33:05 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2012-10-26 21:33:05 +0200 |
| commit | 3e08ba570f7e146b67c0f9dfd17dc04987ebac18 (patch) | |
| tree | ec993cb408a2edb4bb48ce86db4eaca09def6260 /src/supplicant-manager/nm-supplicant-interface.c | |
| parent | 74d97e718091bb137b480fb31d740fe20677812b (diff) | |
| parent | 36cb2f364a821e1be50b23e03a18891ec55adb06 (diff) | |
Merge tag 'upstream/0.9.6.4' into experimental
Upstream version 0.9.6.4
Diffstat (limited to 'src/supplicant-manager/nm-supplicant-interface.c')
| -rw-r--r-- | src/supplicant-manager/nm-supplicant-interface.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/supplicant-manager/nm-supplicant-interface.c b/src/supplicant-manager/nm-supplicant-interface.c index cbe7032f..dc35d5af 100644 --- a/src/supplicant-manager/nm-supplicant-interface.c +++ b/src/supplicant-manager/nm-supplicant-interface.c @@ -884,6 +884,7 @@ interface_add_cb (DBusGProxy *proxy, || g_error_matches (error, DBUS_GERROR, DBUS_GERROR_SPAWN_EXEC_FAILED) || g_error_matches (error, DBUS_GERROR, DBUS_GERROR_SPAWN_FORK_FAILED) || g_error_matches (error, DBUS_GERROR, DBUS_GERROR_SPAWN_FAILED) + || g_error_matches (error, DBUS_GERROR, DBUS_GERROR_TIMEOUT) || dbus_g_error_has_name (error, DBUS_ERROR_SPAWN_SERVICE_NOT_FOUND)) { /* Supplicant wasn't running and could be launched via service * activation. Wait for it to start by moving back to the INIT |