# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1047687534 0
# Node ID 66be56dc86cb7af359a38503b6284fbfd43d0c23
# Parent  fd69b80cb349c56f81f0c0ea5e3259cca59ef5e7
[gaim-migrate @ 5103]
This re-enables server-stored aliases for AIM and ICQ, and it includes
a fix for the problem The Sean was having.

Gaim is too sexy.  It needs to put its shirt back on before something
breaks.

committer: Tailor Script <tailor@pidgin.im>

diff -r fd69b80cb349 -r 66be56dc86cb src/dialogs.c
--- a/src/dialogs.c	Fri Mar 14 23:53:28 2003 +0000
+++ b/src/dialogs.c	Sat Mar 15 00:18:54 2003 +0000
@@ -3348,11 +3348,7 @@
 static void do_alias_bud(GtkWidget *w, struct buddy *b)
 {
 	const char *al = gtk_entry_get_text(GTK_ENTRY(aliasname));
-	if (al && strlen(al))
-		g_snprintf(b->alias, sizeof(b->alias), "%s", al);
-	else
-		b->alias[0] = '\0';
-	gaim_blist_alias_buddy (b, al);
+	gaim_blist_alias_buddy (b, (al && strlen(al)) ? al : NULL);
 	serv_alias_buddy(b);
 	gaim_blist_save();
 	destroy_dialog(aliasdlg, aliasdlg);
diff -r fd69b80cb349 -r 66be56dc86cb src/protocols/oscar/oscar.c
--- a/src/protocols/oscar/oscar.c	Fri Mar 14 23:53:28 2003 +0000
+++ b/src/protocols/oscar/oscar.c	Sat Mar 15 00:18:54 2003 +0000
@@ -4508,13 +4508,11 @@
 							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)
+							if (!alias && buddy->alias && strlen(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);