diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2013-01-17 21:38:12 -0600 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2013-01-17 21:38:12 -0600 |
| commit | a2a38be7600e2a2c2b49c66902d912ca036a2c0f (patch) | |
| tree | 7a4524ce7ccc3701c73041fc8a4ac34020252924 | |
| parent | 7f0c3f996ce51a50587f2499312688ca98f1a868 (diff) | |
| parent | 9af7bd1f0b11b37110f72e2fba0d75910d991270 (diff) | |
| download | tdelibs-a2a38be7600e2a2c2b49c66902d912ca036a2c0f.tar.gz tdelibs-a2a38be7600e2a2c2b49c66902d912ca036a2c0f.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
| -rw-r--r-- | krandr/randr.cpp | 8 | ||||
| -rw-r--r-- | tdecore/networkbackends/network-manager/network-manager.cpp | 13 |
2 files changed, 17 insertions, 4 deletions
diff --git a/krandr/randr.cpp b/krandr/randr.cpp index 0300801ca..f1b1aae21 100644 --- a/krandr/randr.cpp +++ b/krandr/randr.cpp @@ -829,7 +829,13 @@ KDE_EXPORT void RandRDisplay::applyProposed(bool confirm) KDE_EXPORT bool RandRDisplay::showTestConfigurationDialog() { - return screen(0)->showTestConfigurationDialog(); + RandRScreen* firstScreen = screen(0); + if (firstScreen) { + return firstScreen->showTestConfigurationDialog(); + } + else { + return false; + } } KDE_EXPORT bool RandRScreen::showTestConfigurationDialog() diff --git a/tdecore/networkbackends/network-manager/network-manager.cpp b/tdecore/networkbackends/network-manager/network-manager.cpp index e0b11481c..8dc501590 100644 --- a/tdecore/networkbackends/network-manager/network-manager.cpp +++ b/tdecore/networkbackends/network-manager/network-manager.cpp @@ -3131,6 +3131,8 @@ bool TDENetworkConnectionManager_BackendNM::loadConnectionSecretsForGroup(TQStri } bool TDENetworkConnectionManager_BackendNM::saveConnection(TDENetworkConnection* connection) { + bool timed_out = FALSE; + if (!connection) { PRINT_ERROR(TQString("connection cannot be NULL!")); return FALSE; @@ -3199,6 +3201,7 @@ bool TDENetworkConnectionManager_BackendNM::saveConnection(TDENetworkConnection* tqApp->processEvents(); if (!nmCallTimeoutTimer.isActive()) { PRINT_ERROR(TQString("DBUS asynchronous call timed out!")) + timed_out = true; break; } } @@ -4409,11 +4412,12 @@ bool TDENetworkConnectionManager_BackendNM::saveConnection(TDENetworkConnection* tqApp->processEvents(); if (!nmCallTimeoutTimer.isActive()) { PRINT_ERROR(TQString("DBUS asynchronous call timed out!")) + timed_out = true; break; } } d->nmConnectionSettingsAsyncCallWaiting.remove(asyncCallID); - return TRUE; + return !timed_out; } else { // Error! @@ -4441,13 +4445,14 @@ bool TDENetworkConnectionManager_BackendNM::saveConnection(TDENetworkConnection* while (d->nmConnectionSettingsAsyncCallWaiting[asyncCallID]) { if (!nmCallTimeoutTimer.isActive()) { PRINT_ERROR(TQString("DBUS asynchronous call timed out!")) + timed_out = true; break; } tqApp->processEvents(); } d->nmConnectionSettingsAsyncCallWaiting.remove(asyncCallID); d->nmAddConnectionAsyncResponse.remove(asyncCallID); - return TRUE; + return !timed_out; } else { // Error! @@ -4460,6 +4465,7 @@ bool TDENetworkConnectionManager_BackendNM::saveConnection(TDENetworkConnection* bool TDENetworkConnectionManager_BackendNM::deleteConnection(TQString uuid) { TQT_DBusObjectPath existingConnection; TQT_DBusError error; + bool timed_out = false; bool ret; if (d->m_networkManagerSettings) { ret = d->m_networkManagerSettings->GetConnectionByUuid(uuid, existingConnection, error); @@ -4483,11 +4489,12 @@ bool TDENetworkConnectionManager_BackendNM::deleteConnection(TQString uuid) { tqApp->processEvents(); if (!nmCallTimeoutTimer.isActive()) { PRINT_ERROR(TQString("DBUS asynchronous call timed out!")) + timed_out = true; break; } } d->nmConnectionSettingsAsyncCallWaiting.remove(asyncCallID); - return TRUE; + return !timed_out; } else { PRINT_ERROR(TQString("Unable to remove connection with uuid '%1'").arg(uuid)) |