adium-1.4 3516:9bc8dc826e36: Maybe this is to risky to include i...

[commits at adium.im]

details:	http://hg.adium.im/adium-1.4/rev/9bc8dc826e36
revision:	3516:9bc8dc826e36
branch:		(none)
author:		Thijs Alkemade <thijsalkemade at gmail.com>
date:		Thu Jun 16 00:41:52 2011 +0200

Maybe this is to risky to include in 1.4.3.

Backed out changeset 7ab7cfe526ed

diffs (26 lines):

diff -r 7ab7cfe526ed -r 9bc8dc826e36 Plugins/Purple Service/SLPurpleCocoaAdapter.m
--- a/Plugins/Purple Service/SLPurpleCocoaAdapter.m	Thu Jun 16 00:32:59 2011 +0200
+++ b/Plugins/Purple Service/SLPurpleCocoaAdapter.m	Thu Jun 16 00:41:52 2011 +0200
@@ -1003,17 +1003,14 @@
 	
 	// Find an existing buddy in the group.
 	buddy = purple_find_buddy_in_group(account, buddyUTF8String, group);
-	if (!buddy) {
-		buddy = purple_buddy_new(account, buddyUTF8String, aliasUTF8String);
-		
-		/* purple_blist_add_buddy() will move an existing contact serverside, but will not add a buddy serverside.
-		 * We're working with a new contact, hopefully, so we want to call serv_add_buddy() after modifying the purple list.
-		 * This is the order done in add_buddy_cb() in gtkblist.c */
-		purple_blist_add_buddy(buddy, NULL, group, NULL);
-	}
+	if (!buddy) buddy = purple_buddy_new(account, buddyUTF8String, aliasUTF8String);
 
 	AILog(@"Adding buddy %s to group %s with alias %s",purple_buddy_get_name(buddy), group->name, aliasUTF8String);
 
+	/* purple_blist_add_buddy() will move an existing contact serverside, but will not add a buddy serverside.
+	 * We're working with a new contact, hopefully, so we want to call serv_add_buddy() after modifying the purple list.
+	 * This is the order done in add_buddy_cb() in gtkblist.c */
+	purple_blist_add_buddy(buddy, NULL, group, NULL);
 	purple_account_add_buddy(account, buddy);
 }