pidgin: 90ac3829: If we encounter a buddy not in a group, ...

[markdoliner at pidgin.im]

----------------------------------------------------------------------
Revision: 90ac38291e09215e691c3b2716688783ce0c50b3
Parent:   4d5b14992dc5f14d190cd9b62d5aec5c5d5b07db
Author:   markdoliner at pidgin.im
Date:     12/12/11 03:53:24
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/90ac38291e09215e691c3b2716688783ce0c50b3

Changelog: 

If we encounter a buddy not in a group, or in a group with an invalid
UTF-8 name, then put them in the localized group "Buddies" rather than
in the sometimes-localized group "Orphans"

Changes against parent 4d5b14992dc5f14d190cd9b62d5aec5c5d5b07db

  patched  libpurple/protocols/oscar/family_feedbag.c
  patched  libpurple/protocols/oscar/oscar.c

-------------- next part --------------
============================================================
--- libpurple/protocols/oscar/oscar.c	d27e9d401f21dc6360a401905d74b7b5bf6cf10f
+++ libpurple/protocols/oscar/oscar.c	f32b4639e6846e12e06fe78b5cb9bbc4844e9d0f
@@ -4035,9 +4035,9 @@ static int purple_ssi_parselist(OscarDat
 					gname = groupitem ? groupitem->name : NULL;
 					gname_utf8 = oscar_utf8_try_convert(account, od, gname);
 
-					g = purple_find_group(gname_utf8 ? gname_utf8 : _("Orphans"));
+					g = purple_find_group(gname_utf8 ? gname_utf8 : _("Buddies"));
 					if (g == NULL) {
-						g = purple_group_new(gname_utf8 ? gname_utf8 : _("Orphans"));
+						g = purple_group_new(gname_utf8 ? gname_utf8 : _("Buddies"));
 						purple_blist_add_group(g, NULL);
 					}
 
@@ -4261,13 +4261,13 @@ purple_ssi_parseaddmod(OscarData *od, Fl
 		 */
 		b = purple_buddy_new(account, name, alias_utf8);
 
-		if (!(g = purple_find_group(gname_utf8 ? gname_utf8 : _("Orphans")))) {
-			g = purple_group_new(gname_utf8 ? gname_utf8 : _("Orphans"));
+		if (!(g = purple_find_group(gname_utf8 ? gname_utf8 : _("Buddies")))) {
+			g = purple_group_new(gname_utf8 ? gname_utf8 : _("Buddies"));
 			purple_blist_add_group(g, NULL);
 		}
 
 		purple_debug_info("oscar",
-				   "ssi: adding buddy %s to group %s to local list\n", name, gname_utf8 ? gname_utf8 : _("Orphans"));
+				   "ssi: adding buddy %s to group %s to local list\n", name, gname_utf8 ? gname_utf8 : _("Buddies"));
 		purple_blist_add_buddy(b, NULL, g, NULL);
 
 		/* Mobile users should always be online */
============================================================
--- libpurple/protocols/oscar/family_feedbag.c	e2f4e867824c3bb13716219e6ecd503ef1694ba5
+++ libpurple/protocols/oscar/family_feedbag.c	3777fc5770118db3a51a7575e226795c18e0e8fe
@@ -764,7 +764,7 @@ int aim_ssi_cleanlist(OscarData *od)
 				aim_ssi_del_from_private_list(od, NULL, cur->type);
 		} else if ((cur->type == AIM_SSI_TYPE_BUDDY) && ((cur->gid == 0x0000) || (!aim_ssi_itemlist_find(&od->ssi.local, cur->gid, 0x0000)))) {
 			char *alias = aim_ssi_getalias(&od->ssi.local, NULL, cur->name);
-			aim_ssi_addbuddy(od, cur->name, "orphans", NULL, alias, NULL, NULL, FALSE);
+			aim_ssi_addbuddy(od, cur->name, _("Buddies"), NULL, alias, NULL, NULL, FALSE);
 			aim_ssi_delbuddy(od, cur->name, NULL);
 			g_free(alias);
 		}