changeset 7727:72c0d2c66f45

[gaim-migrate @ 8372] (10:49:40) faceprint: no no no no no (10:49:51) LSchiere2: what did i get wrong faceprint? (10:50:05) faceprint: server aliases (10:50:11) LSchiere2: what about them? (10:50:18) Paco-Paco: they don't belong in blist.xml (10:50:24) faceprint: bingo (10:50:25) LSchiere2: i asked sean (10:50:36) SeanEgan: He did (10:50:38) Paco-Paco: yeah that bugged me but I wasn't going to get involved (10:51:04) SeanEgan: but I'd listen to faceprint. (10:51:08) LSchiere2: it makes sense, both winicq and winaim use them even after the person goes offline (10:51:20) faceprint: and so does the oscar prpl (10:51:28) faceprint: but the core didn't (10:51:33) faceprint: and everyone was happy (10:51:37) datallah: whats wrong w/ saving them as long as they are refreshed when appropriate? (10:51:58) faceprint: datallah: doing it in the core assumes certain things about how they're handled in all prpls (10:51:58) LSchiere2: so the correct fix would be to change the protocols instead of the blist? (10:52:22) faceprint: right. the prpls know what's going on, so they should store it as a setting like oscar does committer: Tailor Script <[e-mail]>

--- a/src/blist.c	Wed Dec 03 15:14:16 2003 +0000
+++ b/src/blist.c	Wed Dec 03 15:53:54 2003 +0000
@@ -396,8 +396,6 @@
 
 	if (conv)
 		gaim_conversation_autoset_title(conv);
-
-	gaim_blist_save();
 }
 
 void gaim_blist_rename_group(GaimGroup *group, const char *name)
@@ -1937,7 +1935,7 @@
 {
 	GaimAccount *account;
 	GaimBuddy *buddy;
-	char *name = NULL, *alias = NULL, *server_alias = NULL;
+	char *name = NULL, *alias = NULL;
 	const char *acct_name, *proto, *protocol;
 	xmlnode *x;
 
@@ -1962,9 +1960,6 @@
 	if((x = xmlnode_get_child(bnode, "alias")))
 		alias = xmlnode_get_data(x);
 
-	if((x = xmlnode_get_child(bnode, "server_alias")))
-		server_alias = xmlnode_get_data(x);
-
 	buddy = gaim_buddy_new(account, name, alias);
 	gaim_blist_add_buddy(buddy, contact, group,
 			gaim_blist_get_last_child((GaimBlistNode*)contact));
@@ -1978,9 +1973,6 @@
 	g_free(name);
 	if(alias)
 		g_free(alias);
-
-	if(server_alias)
-		g_free(server_alias);
 }
 
 static void parse_contact(GaimGroup *group, xmlnode *cnode)
@@ -2310,13 +2302,10 @@
 static void print_buddy(FILE *file, GaimBuddy *buddy) {
 	char *bud_name = g_markup_escape_text(buddy->name, -1);
 	char *bud_alias = NULL;
-	char *bud_server_alias = NULL;
 	char *acct_name = g_markup_escape_text(buddy->account->username, -1);
 	int proto_num = gaim_account_get_protocol(buddy->account);
 	if(buddy->alias)
 		bud_alias= g_markup_escape_text(buddy->alias, -1);
-	if(buddy->server_alias)
-		bud_server_alias= g_markup_escape_text(buddy->server_alias, -1);
 	fprintf(file, "\t\t\t\t<buddy account=\"%s\" proto=\"%s\"", acct_name,
 			gaim_account_get_protocol_id(buddy->account));
 	if(proto_num != -1)
@@ -2327,15 +2316,11 @@
 	if(bud_alias) {
 		fprintf(file, "\t\t\t\t\t<alias>%s</alias>\n", bud_alias);
 	}
-	if(bud_server_alias) {
-		fprintf(file, "\t\t\t\t\t<server_alias>%s</server_alias>\n", bud_server_alias);
-	}
 	g_hash_table_foreach(buddy->node.settings, blist_print_buddy_settings, file);
 	fprintf(file, "\t\t\t\t</buddy>\n");
 	g_free(bud_name);
 	g_free(bud_alias);
 	g_free(acct_name);
-	g_free(bud_server_alias);
 }
 
 static void gaim_blist_write(FILE *file, GaimAccount *exp_acct) {