Mercurial > pidgin

changeset 32387:d0dba386ca0a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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"
author Mark Doliner <mark@kingant.net>
date Mon, 12 Dec 2011 08:53:24 +0000
parents 978a070e8724
children 3a4fc19e168e
files libpurple/protocols/oscar/family_feedbag.c libpurple/protocols/oscar/oscar.c
diffstat 2 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/oscar/family_feedbag.c	Mon Dec 12 07:30:21 2011 +0000
+++ b/libpurple/protocols/oscar/family_feedbag.c	Mon Dec 12 08:53:24 2011 +0000
@@ -764,7 +764,7 @@
 				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);
 		}
--- a/libpurple/protocols/oscar/oscar.c	Mon Dec 12 07:30:21 2011 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Mon Dec 12 08:53:24 2011 +0000
@@ -4035,9 +4035,9 @@
 					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 @@
 		 */
 		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 */