# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1047686008 0
# Node ID fd69b80cb349c56f81f0c0ea5e3259cca59ef5e7
# Parent  b6f33ba0a0c025f8af0fa719772c283d69fe5d96
[gaim-migrate @ 5102]
Landshark

committer: Tailor Script <tailor@pidgin.im>

diff -r b6f33ba0a0c0 -r fd69b80cb349 src/protocols/oscar/oscar.c
--- a/src/protocols/oscar/oscar.c	Fri Mar 14 23:47:26 2003 +0000
+++ b/src/protocols/oscar/oscar.c	Fri Mar 14 23:53:28 2003 +0000
@@ -4488,7 +4488,6 @@
 	if (export)
 		gaim_blist_save();
 
-#if 0
 	{ /* Add from local list to server list */
 		GaimBlistNode *gnode, *bnode;
 		struct group *group;
@@ -4509,11 +4508,13 @@
 							g_free(servernick);
 						}
 						if (aim_ssi_itemlist_exists(sess->ssi.local, buddy->name)) {
+#if 0
 							/* Store local alias on server */
 							char *alias = aim_ssi_getalias(sess->ssi.local, group->name, buddy->name);
 							if (!alias && buddy->alias)
 								aim_ssi_aliasbuddy(sess, od->conn, group->name, buddy->name, buddy->alias);
 							free(alias);
+#endif
 						} else {
 							debug_printf("ssi: adding buddy %s from local list to server list\n", buddy->name);
 							aim_ssi_addbuddy(sess, od->conn, buddy->name, group->name, gaim_get_buddy_alias_only(buddy), NULL, NULL, 0);
@@ -4543,7 +4544,6 @@
 			if (report_idle && !(tmp & 0x400))
 				aim_ssi_setpresence(sess, fr->conn, tmp | 0x400);
 	} /* end adding buddies from local list to server list */
-#endif
 
 	{ /* Check for maximum number of buddies */
 		GSList *groups = gaim_blist_groups(), *cur;