# HG changeset patch
# User Christian Hammond <chipx86@chipx86.com>
# Date 1078800652 0
# Node ID f5b0e1a4b0c75a581f0c427c2da1eae44feea166
# Parent  18e94f589649651820c15d686f5002c554d033ec
[gaim-migrate @ 9143]
Aliases are now shown alongside the screen name in the message queue
window. Patch by Kevin Stange.

committer: Tailor Script <tailor@pidgin.im>

diff -r 18e94f589649 -r f5b0e1a4b0c7 ChangeLog
--- a/ChangeLog	Mon Mar 08 20:13:17 2004 +0000
+++ b/ChangeLog	Tue Mar 09 02:50:52 2004 +0000
@@ -41,6 +41,8 @@
 	* Deleting an account while modifying it will no longer crash gaim.
 	* Only one account preference window will now appear per account when
 	  clicking Modify.
+	* Aliases are now shown alongside the screen name in the message
+	  queue window. (Kevin Stange).
 	* TCL Plugin API changed
 	* The mobile icon on MSN users is now removed when the person disables
 	  mobile paging (Stu Tomlinson)
diff -r 18e94f589649 -r f5b0e1a4b0c7 src/away.c
--- a/src/away.c	Mon Mar 08 20:13:17 2004 +0000
+++ b/src/away.c	Tue Mar 09 02:50:52 2004 +0000
@@ -244,7 +244,7 @@
 			GTK_SHADOW_IN);
 	gtk_box_pack_start(GTK_BOX(vbox), awayqueuesw, TRUE, TRUE, 0);
 
-	awayqueuestore = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_STRING);
+	awayqueuestore = gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
 	awayqueue = gtk_tree_view_new_with_model(GTK_TREE_MODEL(awayqueuestore));
 	renderer = gtk_cell_renderer_text_new();
 
@@ -257,6 +257,10 @@
 			"text", 1,
 			NULL);
 	gtk_tree_view_append_column(GTK_TREE_VIEW(awayqueue), column);
+	column = gtk_tree_view_column_new_with_attributes(NULL, renderer,
+			"text", 2,
+			NULL);
+	gtk_tree_view_append_column(GTK_TREE_VIEW(awayqueue), column);
 
 	gtk_container_add(GTK_CONTAINER(awayqueuesw), awayqueue);
 
diff -r 18e94f589649 -r f5b0e1a4b0c7 src/server.c
--- a/src/server.c	Mon Mar 08 20:13:17 2004 +0000
+++ b/src/server.c	Tue Mar 09 02:50:52 2004 +0000
@@ -943,6 +943,8 @@
 
 			qm = g_new0(struct queued_message, 1);
 			g_snprintf(qm->name, sizeof(qm->name), "%s", name);
+			if(strcmp(alias, name) != 0)
+			    g_snprintf(qm->alias, sizeof(qm->alias), "(%s)", alias);
 			qm->message = g_strdup(message);
 			qm->account = gc->account;
 			qm->tm = mtime;
@@ -961,14 +963,15 @@
 				gtk_tree_model_get_iter_from_string(
 								GTK_TREE_MODEL(awayqueuestore), &iter, path);
 				gtk_list_store_set(awayqueuestore, &iter,
-								1, number, -1);
+								2, number, -1);
 			} else {
-				gtk_tree_model_get_iter_first(GTK_TREE_MODEL(awayqueuestore), 
+				gtk_tree_model_get_iter_first(GTK_TREE_MODEL(awayqueuestore),
 								&iter);
 				gtk_list_store_append(awayqueuestore, &iter);
 				gtk_list_store_set(awayqueuestore, &iter,
 								0, qm->name,
-								1, _("(1 message)"),
+								1, qm->alias,
+								2, _("(1 message)"),
 								-1);
 			}
 		} else {
diff -r 18e94f589649 -r f5b0e1a4b0c7 src/ui.h
--- a/src/ui.h	Mon Mar 08 20:13:17 2004 +0000
+++ b/src/ui.h	Tue Mar 09 02:50:52 2004 +0000
@@ -66,6 +66,7 @@
 
 struct queued_message {
 	char name[80];
+	char alias[80];
 	char *message;
 	time_t tm;
 	GaimAccount *account;