adium 5559:4ca40d9eb4b6: Make sure primaryString is not still nil.

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/4ca40d9eb4b6
revision:	5559:4ca40d9eb4b6
branch:		(none)
author:		Frank Dowsett <wixardy at adium.im>
date:		Wed Jun 12 17:20:42 2013 -0400

Make sure primaryString is not still nil.
Subject: adium 5560:b963405c7eaa: Looks like these don't need to be mutable.

details:	http://hg.adium.im/adium/rev/b963405c7eaa
revision:	5560:b963405c7eaa
branch:		(none)
author:		Frank Dowsett <wixardy at adium.im>
date:		Wed Jun 12 17:28:08 2013 -0400

Looks like these don't need to be mutable.

diffs (50 lines):

diff -r 52f2e3473b38 -r b963405c7eaa Frameworks/Adium Framework/Source/AIAbstractListController.m
--- a/Frameworks/Adium Framework/Source/AIAbstractListController.m	Wed Jun 12 14:06:36 2013 -0400
+++ b/Frameworks/Adium Framework/Source/AIAbstractListController.m	Wed Jun 12 17:28:08 2013 -0400
@@ -698,7 +698,7 @@
 {
 	BOOL			isGroup = [listObject isKindOfClass:[AIListGroup class]];
 	
-	NSMutableArray			*locationsArray = [NSArray arrayWithObjects:
+	NSArray			*locationsArray = [NSArray arrayWithObjects:
 		[NSNumber numberWithInt:(isGroup ? Context_Group_Manage : Context_Contact_Manage)],
 		[NSNumber numberWithInt:(isGroup ? Context_Group_AttachDetach : Context_Contact_AttachDetach)],
 		[NSNumber numberWithInt:Context_Contact_Action],
diff -r 52f2e3473b38 -r b963405c7eaa Plugins/Purple Service/adiumPurpleRequest.m
--- a/Plugins/Purple Service/adiumPurpleRequest.m	Wed Jun 12 14:06:36 2013 -0400
+++ b/Plugins/Purple Service/adiumPurpleRequest.m	Wed Jun 12 17:28:08 2013 -0400
@@ -220,6 +220,8 @@
 											 [NSValue valueWithPointer:userData],@"userData",
 											 titleString,@"TitleString",nil];
 			
+			if (!primaryString)
+				primaryString = @"";
 			// If we have both a primary and secondary string, use the primary as a header.
 			if (secondaryString) {
 				[infoDict setObject:primaryString forKey:@"MessageHeader"];
diff -r 52f2e3473b38 -r b963405c7eaa Source/AILogViewerWindowController.m
--- a/Source/AILogViewerWindowController.m	Wed Jun 12 14:06:36 2013 -0400
+++ b/Source/AILogViewerWindowController.m	Wed Jun 12 17:28:08 2013 -0400
@@ -1008,7 +1008,7 @@
     NSRange				searchRange, foundRange;
     NSString			*plainBigString = [bigString string];
 	NSUInteger			plainBigStringLength = [plainBigString length];
-	NSMutableDictionary *attributeDictionary = nil;
+	NSDictionary		*attributeDictionary = nil;
 
     outRange->location = NSNotFound;
 
diff -r 52f2e3473b38 -r b963405c7eaa Source/AISCLViewPlugin.m
--- a/Source/AISCLViewPlugin.m	Wed Jun 12 14:06:36 2013 -0400
+++ b/Source/AISCLViewPlugin.m	Wed Jun 12 17:28:08 2013 -0400
@@ -522,8 +522,8 @@
 	NSMutableArray *detachedWindowsDicts = [[NSMutableArray alloc] init];
 
 	for (AIListWindowController *windowController in [contactLists copy]) {
-		NSMutableDictionary *dict = [NSDictionary dictionaryWithObject:[[[windowController contactList] containedObjects] valueForKey:@"UID"]
-																forKey:DETACHED_WINDOW_GROUPS];
+		NSDictionary *dict = [NSDictionary dictionaryWithObject:[[[windowController contactList] containedObjects] valueForKey:@"UID"]
+														 forKey:DETACHED_WINDOW_GROUPS];
 		[detachedWindowsDicts addObject:dict];
 		[self closeContactList:windowController];
 	}