From: <fon...@us...> - 2009-07-09 13:27:19
|
Revision: 4984 http://kmess.svn.sourceforge.net/kmess/?rev=4984&view=rev Author: fontknocker Date: 2009-07-09 13:27:13 +0000 (Thu, 09 Jul 2009) Log Message: ----------- Backport fix from trunk: fix bug which caused account data to be saved even if Remember Account was unchecked. Modified Paths: -------------- branches/kmess/kmess-2.0.x/ChangeLog branches/kmess/kmess-2.0.x/src/model/contactlist.cpp Modified: branches/kmess/kmess-2.0.x/ChangeLog =================================================================== --- branches/kmess/kmess-2.0.x/ChangeLog 2009-07-09 12:10:02 UTC (rev 4983) +++ branches/kmess/kmess-2.0.x/ChangeLog 2009-07-09 13:27:13 UTC (rev 4984) @@ -1,3 +1,6 @@ +2009-07-09 (Adam) + * Backport from trunk: fix bug where account would be saved when "Remember Account" was + unchecked. 2009-07-08 (Pano) * Added an Japanese translation by Daniel E. Moctezuma. Modified: branches/kmess/kmess-2.0.x/src/model/contactlist.cpp =================================================================== --- branches/kmess/kmess-2.0.x/src/model/contactlist.cpp 2009-07-09 12:10:02 UTC (rev 4983) +++ branches/kmess/kmess-2.0.x/src/model/contactlist.cpp 2009-07-09 13:27:13 UTC (rev 4984) @@ -1983,6 +1983,12 @@ // Save the properties of a group void ContactList::saveProperties( const Group *group ) const { + // Do not save account properties when it's a temporary account + if( CurrentAccount::instance()->isGuestAccount() ) + { + return; + } + const QString& handle( CurrentAccount::instance()->getHandle() ); KConfigGroup config( KMessConfig::instance()->getContactListConfig( handle, "Groups" ) ); @@ -1999,6 +2005,12 @@ // Save the properties of a contact void ContactList::saveProperties( const Contact *contact ) const { + // Do not save account properties when it's a temporary account + if( CurrentAccount::instance()->isGuestAccount() ) + { + return; + } + const QString& handle( CurrentAccount::instance()->getHandle() ); KConfigGroup config( KMessConfig::instance()->getContactListConfig( handle, "Contacts" ) ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |