From: <fon...@us...> - 2010-03-17 10:07:37
|
Revision: 5963 http://kmess.svn.sourceforge.net/kmess/?rev=5963&view=rev Author: fontknocker Date: 2010-03-17 10:07:27 +0000 (Wed, 17 Mar 2010) Log Message: ----------- Fix bug where account settings were not fully saved under certain conditions. Fix bug where "Log in Automatically" was not saved if disabled after being enabled. Also, if a contact is already blocked when they are removed, do not re-add them to the allow list. Modified Paths: -------------- branches/kmess/kmess-2.0.x/ChangeLog branches/kmess/kmess-2.0.x/src/kmess.cpp branches/kmess/kmess-2.0.x/src/network/msnnotificationconnection.cpp branches/kmess/kmess-2.0.x/src/settings/accountpage.cpp Modified: branches/kmess/kmess-2.0.x/ChangeLog =================================================================== --- branches/kmess/kmess-2.0.x/ChangeLog 2010-03-16 11:02:00 UTC (rev 5962) +++ branches/kmess/kmess-2.0.x/ChangeLog 2010-03-17 10:07:27 UTC (rev 5963) @@ -1,3 +1,7 @@ +2010-03-17 (Adam) + * Fix bug where account properties were not properly updated in some cases. + * Fix bug where "Log in Automatically" was not obeyed and saved if it was unchecked after being enabled. + * When removing a contact that is already blocked, do not add them to the allow list. 2010-03-16 (Pano) * Added a Galician translation by Indalecio Freiría Santos. Modified: branches/kmess/kmess-2.0.x/src/kmess.cpp =================================================================== --- branches/kmess/kmess-2.0.x/src/kmess.cpp 2010-03-16 11:02:00 UTC (rev 5962) +++ branches/kmess/kmess-2.0.x/src/kmess.cpp 2010-03-17 10:07:27 UTC (rev 5963) @@ -867,7 +867,7 @@ #endif // Try to find an existing account - Account *account = AccountsManager::instance()->getAccountByHandle(handle); + Account *account = AccountsManager::instance()->getAccountByHandle(handle); if( account != 0 ) { // Found an existing account. @@ -893,6 +893,11 @@ account->setUseAutologin( true ); } + if ( ! autologin ) + { + account->setUseAutologin( false ); + } + startConnection( account ); return; } Modified: branches/kmess/kmess-2.0.x/src/network/msnnotificationconnection.cpp =================================================================== --- branches/kmess/kmess-2.0.x/src/network/msnnotificationconnection.cpp 2010-03-16 11:02:00 UTC (rev 5962) +++ branches/kmess/kmess-2.0.x/src/network/msnnotificationconnection.cpp 2010-03-17 10:07:27 UTC (rev 5963) @@ -2583,7 +2583,7 @@ // if not blocking, make sure we re-add to the Allow list. // ABContactDelete removes them from the Allow list for some reason. This was what // caused the "you've been added" dialog to popup for deleted contacts on the next login. - if ( ! block ) + if ( ! block && ! contact->isBlocked() ) { allowContact( handle ); } Modified: branches/kmess/kmess-2.0.x/src/settings/accountpage.cpp =================================================================== --- branches/kmess/kmess-2.0.x/src/settings/accountpage.cpp 2010-03-16 11:02:00 UTC (rev 5962) +++ branches/kmess/kmess-2.0.x/src/settings/accountpage.cpp 2010-03-17 10:07:27 UTC (rev 5963) @@ -22,6 +22,8 @@ #include "../utils/kmessconfig.h" #include "../utils/kmessshared.h" #include "../kmessdebug.h" +#include "../currentaccount.h" + #include <config-kmess.h> #include <QFileInfo> @@ -391,6 +393,11 @@ account->setStatusOptions( useIdleTimerCheckBox_->isChecked(), idleTimeSpinBox_->value(), hideNotificationsWhenBusyCheckBox_->isChecked() ); + + if ( account->getHandle() == CurrentAccount::instance()->getHandle() ) + { + CurrentAccount::instance()->copyAccount( account ); + } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |