pidgin: a1d611f6: Make MySpace group handling more consist...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: a1d611f60e95c75092532152273d1dc730e89bc1
Ancestor: 342d7c1caf8a818cc92947373b005c0e62719197
Author: datallah at pidgin.im
Date: 2008-05-16T20:19:12
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/a1d611f60e95c75092532152273d1dc730e89bc1

Modified files:
        libpurple/protocols/myspace/myspace.c

ChangeLog: 

Make MySpace group handling more consistent. References #3378.

-------------- next part --------------
============================================================
--- libpurple/protocols/myspace/myspace.c	2bb03dbf1f14bd88735ed083293d0723f893db82
+++ libpurple/protocols/myspace/myspace.c	c486d50f99c5ec94bd9cd4aed86dabbdb408db03
@@ -2824,21 +2824,17 @@ msim_add_contact_from_server_cb(MsimSess
 	/* 1. Creates a new group, or gets existing group if it exists (or so
 	 * the documentation claims). */
 	group_name = msim_msg_get_string(contact_info, "GroupName");
-	if (group_name) {
-		group = purple_find_group(group_name);
-		if (!group) {
-			group = purple_group_new(group_name);
-			/* Add group to beginning. See #2752. */
-			purple_blist_add_group(group, NULL);
-
-		}
-
-		purple_debug_info("msim_add_contact_from_server_cb",
-				"adding to GroupName: %s\n", group_name);
-		g_free(group_name);
-	} else {
-		group = purple_group_new(_("IM Friends"));
+	if (!group_name) {
+		group_name = g_strdup(_("IM Friends"));
+		purple_debug_info("myspace", "No GroupName specified, defaulting to '%s'.\n", group_name);
 	}
+	group = purple_find_group(group_name);
+	if (!group) {
+		group = purple_group_new(group_name);
+		/* Add group to beginning. See #2752. */
+		purple_blist_add_group(group, NULL);
+	}
+	g_free(group_name);
 
 	/* 2. Get or create buddy */
 	buddy = purple_find_buddy(session->account, username);