adium 2136:7b3b9d292693: Add an assert to prevent future subtle ...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/7b3b9d292693
revision:	2136:7b3b9d292693
author:		Zachary West <zacw at adium.im>
date:		Sun May 10 21:48:28 2009 -0400

Add an assert to prevent future subtle breakage.

diffstat:

 ChangeLogs/Changes.txt                             |  4 +++-
 Frameworks/Adium Framework/Source/AIListBookmark.m |  2 ++
 2 files changed, 5 insertions(+), 1 deletions(-)

diffs (26 lines):

diff -r 2657541805fb -r 7b3b9d292693 ChangeLogs/Changes.txt
--- a/ChangeLogs/Changes.txt	Sun May 10 21:36:27 2009 -0400
+++ b/ChangeLogs/Changes.txt	Sun May 10 21:48:28 2009 -0400
@@ -49,7 +49,9 @@
 Contacts
  * Authorization requests no longer create one alert panel per request; instead, Adium collects them in a single window, listing all pending requests with add, ignore, and deny buttons.
  * Reduced complexity when determining what account is preferred for messaging a given contact. (#10547)
- * Added support for contacts in multiple groups (no UI for putting contacts in multiple groups yet)
+ * Added support for contacts in multiple groups
+   * Hold option when dragging to add a contact to a secondary group.
+   * (info inspector stuff here)
  * Corrected adding contacts to multiple accounts. The "Add Contact" window was only adding to the existing account.
  * Add account-specific menu items (such as "Initiate Multi-User Chat" or "Initiate Direct IM") to the main Contact menu.
  * Corrected a bug where a combined contact would be "always visible" and toggling the preference would not unset it.
diff -r 2657541805fb -r 7b3b9d292693 Frameworks/Adium Framework/Source/AIListBookmark.m
--- a/Frameworks/Adium Framework/Source/AIListBookmark.m	Sun May 10 21:36:27 2009 -0400
+++ b/Frameworks/Adium Framework/Source/AIListBookmark.m	Sun May 10 21:48:28 2009 -0400
@@ -161,6 +161,8 @@
 - (NSString *)internalObjectID
 {
 	if (!internalObjectID) {
+		NSAssert(self.account != NULL, @"Null list bookmark account - make sure you didn't try to touch the internalObjectID before it was loaded.");
+		
 		// We're not like any other bookmarks by the same name.
 		internalObjectID = [[NSString stringWithFormat:@"%@.%@.%@", self.service.serviceID, self.UID, self.account.UID] retain];
 	}