Mercurial > pidgin3 / file diff

--- a/libpurple/protocols/msn/dialog.c	Sun Apr 15 04:12:27 2007 +0000
+++ b/libpurple/protocols/msn/dialog.c	Sun Apr 15 04:29:56 2007 +0000
@@ -45,9 +45,7 @@
 		msn_userlist_add_buddy(userlist, data->who, MSN_LIST_FL, data->group);
 	}
 
-	if (data->group != NULL)
-		g_free(data->group);
-
+	g_free(data->group);
 	g_free(data->who);
 	g_free(data);
 }
@@ -63,9 +61,7 @@
 		msn_userlist_rem_buddy(userlist, data->who, MSN_LIST_FL, data->group);
 	}
 
-	if (data->group != NULL)
-		g_free(data->group);
-
+	g_free(data->group);
 	g_free(data->who);
 	g_free(data);
 }
@@ -93,13 +89,16 @@
 						  purple_account_get_username(account),
 						  purple_account_get_protocol_name(account));
 
-	if (group_name != NULL){
+	if (group_name != NULL)
+	{
 		reason = g_strdup_printf(_("%s on the local list is "
 								   "inside the group \"%s\" but not on "
 								   "the server list. "
 								   "Do you want this buddy to be added?"),
 								 passport, group_name);
-	}else{
+	}
+	else
+	{
 		reason = g_strdup_printf(_("%s is on the local list but "
 								   "not on the server list. "
 								   "Do you want this buddy to be added?"),
@@ -114,9 +113,9 @@
 	if (group_name != NULL)
 		group = purple_find_group(group_name);
 
-	if (group != NULL){
+	if (group != NULL)
 		buddy = purple_find_buddy_in_group(account, passport, group);
-	}else{
+	else
 		buddy = purple_find_buddy(account, passport);
 	}