Swiftdiff options
| -rw-r--r-- | BuildTools/SCons/SConstruct | 3 | ||||
| -rw-r--r-- | Swift/Controllers/MainController.cpp | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct index 8cb21c2..3f441cb 100644 --- a/BuildTools/SCons/SConstruct +++ b/BuildTools/SCons/SConstruct @@ -47,7 +47,8 @@ if env["PLATFORM"] == "darwin" : if env["PLATFORM"] == "win32" : env.Tool("WindowsBundle", toolpath = ["#/BuildTools/SCons/Tools"]) #So we don't need to escalate with UAC - env['ENV']['TMP'] = os.environ['TMP'] + if "TMP" is os.environ.keys() : + env['ENV']['TMP'] = os.environ['TMP'] # Override SConscript to handle tests oldSConscript = SConscript diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp index 511f420..965e73d 100644 --- a/Swift/Controllers/MainController.cpp +++ b/Swift/Controllers/MainController.cpp @@ -243,6 +243,9 @@ void MainController::handleChangeStatusRequest(StatusShow::Type show, const Stri } void MainController::sendPresence(boost::shared_ptr<Presence> presence) { + rosterController_->getWindow()->setMyStatusType(presence->getShow()); + rosterController_->getWindow()->setMyStatusText(presence->getStatus()); + // Copy presence before adding extra information lastSentPresence_ = presence->clone(); |