# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1210969152 0
# Node ID 77fc073e5a0b5bbc7123604d13013856958ca707
# Parent  18c3c7d8bdbd4134c56d77563a4dff0d50beadaf
Make MySpace group handling more consistent. References #3378.

diff -r 18c3c7d8bdbd -r 77fc073e5a0b libpurple/protocols/myspace/myspace.c
--- a/libpurple/protocols/myspace/myspace.c	Fri May 16 20:02:20 2008 +0000
+++ b/libpurple/protocols/myspace/myspace.c	Fri May 16 20:19:12 2008 +0000
@@ -2824,21 +2824,17 @@
 	/* 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);