Mercurial > pidgin

changeset 9453:28280c108cc4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 10277] Ok, this should make those "<foo> logged out" type messages actually say "<foo>" instead of "". I hope I did this right. committer: Tailor Script <tailor@pidgin.im>
author Tim Ringenbach <marv@pidgin.im>
date Mon, 05 Jul 2004 19:24:33 +0000
parents 0de62d92fb3b
children b6feee45f33d
files src/server.c
diffstat 1 files changed, 14 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/src/server.c	Mon Jul 05 19:19:36 2004 +0000
+++ b/src/server.c	Mon Jul 05 19:24:33 2004 +0000
@@ -1137,6 +1137,7 @@
 	GaimAccount *account;
 	GaimConversation *c;
 	GaimBuddy *b;
+	char *alias;
 	GSList *buddies;
 	int old_idle;
 	time_t current_time = time(NULL);
@@ -1160,6 +1161,8 @@
 		gaim_blist_rename_buddy(b, name);
 	}
 
+	alias = gaim_escape_html(gaim_get_buddy_alias(b));
+
 	old_idle = b->idle;
 
 	if (loggedin) {
@@ -1173,8 +1176,7 @@
 
 	if (signing_on) {
 		if (c != NULL) {
-			char *tmp = g_strdup_printf(_("%s logged in."),
-										gaim_get_buddy_alias(b));
+			char *tmp = g_strdup_printf(_("%s logged in."), alias);
 
 			gaim_conversation_write(c, NULL, tmp, GAIM_MESSAGE_SYSTEM,
 									time(NULL));
@@ -1183,8 +1185,7 @@
 		else if (awayqueue && find_queue_total_by_name(b->name)) {
 			struct queued_message *qm = g_new0(struct queued_message, 1);
 			g_snprintf(qm->name, sizeof(qm->name), "%s", b->name);
-			qm->message = g_strdup_printf(_("%s logged in."),
-										  gaim_get_buddy_alias(b));
+			qm->message = g_strdup_printf(_("%s logged in."), alias);
 			qm->account = gc->account;
 			qm->tm = time(NULL);
 			qm->flags = GAIM_MESSAGE_SYSTEM;
@@ -1196,8 +1197,7 @@
 		   gaim_prefs_get_bool("/core/logging/log_signon_signoff")) {
 			GaimAccount *account = gaim_connection_get_account(gc);
 			GaimLog *log = gaim_account_get_log(account);
-			char *tmp = g_strdup_printf(_("%s signed on"),
-										gaim_get_buddy_alias(b));
+			char *tmp = g_strdup_printf(_("%s signed on"), alias);
 
 			gaim_log_write(log, GAIM_MESSAGE_SYSTEM, gaim_get_buddy_alias(b),
 						   current_time, tmp);
@@ -1212,9 +1212,9 @@
 		char *tmp = NULL;
 
 		if((b->uc & UC_UNAVAILABLE) && !(type & UC_UNAVAILABLE))
-			tmp = g_strdup_printf(_("%s came back"), gaim_get_buddy_alias(b));
+			tmp = g_strdup_printf(_("%s came back"), alias);
 		else if(!(b->uc & UC_UNAVAILABLE) && (type & UC_UNAVAILABLE))
-			tmp = g_strdup_printf(_("%s went away"), gaim_get_buddy_alias(b));
+			tmp = g_strdup_printf(_("%s went away"), alias);
 
 		if(tmp){
 			gaim_log_write(log, GAIM_MESSAGE_SYSTEM, gaim_get_buddy_alias(b),
@@ -1228,8 +1228,7 @@
 		   gaim_prefs_get_bool("/core/logging/log_idle_state")) {
 			GaimAccount *account = gaim_connection_get_account(gc);
 			GaimLog *log = gaim_account_get_log(account);
-			char *tmp = g_strdup_printf(_("%s became idle"),
-										gaim_get_buddy_alias(b));
+			char *tmp = g_strdup_printf(_("%s became idle"), alias);
 
 			gaim_log_write(log, GAIM_MESSAGE_SYSTEM, gaim_get_buddy_alias(b),
 						   current_time, tmp);
@@ -1240,8 +1239,7 @@
 		   gaim_prefs_get_bool("/core/logging/log_idle_state")) {
 			GaimAccount *account = gaim_connection_get_account(gc);
 			GaimLog *log = gaim_account_get_log(account);
-			char *tmp = g_strdup_printf(_("%s became unidle"),
-										gaim_get_buddy_alias(b));
+			char *tmp = g_strdup_printf(_("%s became unidle"), alias);
 
 			gaim_log_write(log, GAIM_MESSAGE_SYSTEM, gaim_get_buddy_alias(b),
 						   current_time, tmp);
@@ -1251,16 +1249,14 @@
 
 	if (signing_off) {
 		if (c != NULL) {
-			char *tmp = g_strdup_printf(_("%s logged out."),
-										gaim_get_buddy_alias(b));
+			char *tmp = g_strdup_printf(_("%s logged out."), alias);
 			gaim_conversation_write(c, NULL, tmp,
 									GAIM_MESSAGE_SYSTEM, time(NULL));
 			g_free(tmp);
 		} else if (awayqueue && find_queue_total_by_name(b->name)) {
 			struct queued_message *qm = g_new0(struct queued_message, 1);
 			g_snprintf(qm->name, sizeof(qm->name), "%s", b->name);
-			qm->message = g_strdup_printf(_("%s logged out."),
-										  gaim_get_buddy_alias(b));
+			qm->message = g_strdup_printf(_("%s logged out."), alias);
 			qm->account = gc->account;
 			qm->tm = time(NULL);
 			qm->flags = GAIM_MESSAGE_SYSTEM;
@@ -1273,8 +1269,7 @@
 		   gaim_prefs_get_bool("/core/logging/log_signon_signoff")) {
 			GaimAccount *account = gaim_connection_get_account(gc);
 			GaimLog *log = gaim_account_get_log(account);
-			char *tmp = g_strdup_printf(_("%s signed off"),
-										gaim_get_buddy_alias(b));
+			char *tmp = g_strdup_printf(_("%s signed off"), alias);
 
 			gaim_log_write(log, GAIM_MESSAGE_SYSTEM, gaim_get_buddy_alias(b),
 						   current_time, tmp);
@@ -1314,6 +1309,7 @@
 		gaim_blist_update_buddy_evil(b, evil);
 		gaim_blist_update_buddy_status(b, type);
 	}
+	g_free(alias);
 }