Revision: 16551
Author: thekingant
Date: 2006-07-23 11:59:17 -0700 (Sun, 23 Jul 2006)
ViewCVS: http://svn.sourceforge.net/gaim/?rev=16551&view=rev
Log Message:
-----------
Backport SVN revision #16550 from HEAD to v2_0_0
Original commit message:
Only set an account's status to the default status when
enabling it, not when disabling it. Fixes a very minor
weirdness.
ViewCVS Links:
-------------
http://svn.sourceforge.net/gaim/?rev=16550&view=rev
Modified Paths:
--------------
branches/v2_0_0/src/gtkaccount.c
Modified: branches/v2_0_0/src/gtkaccount.c
===================================================================
--- branches/v2_0_0/src/gtkaccount.c 2006-07-23 18:58:59 UTC (rev 16550)
+++ branches/v2_0_0/src/gtkaccount.c 2006-07-23 18:59:17 UTC (rev 16551)
@@ -2221,9 +2221,15 @@
COLUMN_ENABLED, &enabled,
-1);
- /* Set the statuses for this account to the current status */
- saved_status = gaim_savedstatus_get_current();
- gaim_savedstatus_activate_for_account(saved_status, account);
+ /*
+ * If we just enabled the account, then set the statuses
+ * to the current status.
+ */
+ if (!enabled)
+ {
+ saved_status = gaim_savedstatus_get_current();
+ gaim_savedstatus_activate_for_account(saved_status, account);
+ }
gaim_account_set_enabled(account, GAIM_GTK_UI, !enabled);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
