adium-1.4 3090:da0b923fe3e7: Further improved documentation
commits at adium.im
commits at adium.im
Mon Oct 18 03:55:21 UTC 2010
details: http://hg.adium.im/adium-1.4/rev/da0b923fe3e7
revision: 3090:da0b923fe3e7
author: Evan Schoenberg
date: Sun Oct 17 22:55:16 2010 -0500
Further improved documentation
diffs (13 lines):
diff -r 9d4fb0b87d2b -r da0b923fe3e7 Frameworks/Adium Framework/Source/AIAbstractAccount.m
--- a/Frameworks/Adium Framework/Source/AIAbstractAccount.m Sun Oct 17 22:52:13 2010 -0500
+++ b/Frameworks/Adium Framework/Source/AIAbstractAccount.m Sun Oct 17 22:55:16 2010 -0500
@@ -203,6 +203,9 @@
* deletes that icon, this indicates that no icon at all should be used for the account.
*/
} else if (!isTemporary && [[adium.preferenceController preferenceForKey:KEY_USE_USER_ICON group:GROUP_ACCOUNT_STATUS] boolValue]) {
+ /* For non-temporary accounts, load the global icon if it is to be used. The user may have set a global icon, then selected
+ * not to send an icon at all, so we must check the boolean preference first.
+ */
userIconData = [adium.preferenceController preferenceForKey:KEY_USER_ICON group:GROUP_ACCOUNT_STATUS];
/* If there isn't an icon set manually at the global level, we still need to check for one under KEY_DEFAULT_USER_ICON.
More information about the commits
mailing list