# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1037728496 0
# Node ID f118d61fb89af1656c46cf0ae64166c75cea9cfb
# Parent  e0f868943deef273192ecfc955280caa533e6c85
[gaim-migrate @ 4176]
smaller close button for tabs and aliases are now used in the away message queue, both thanks to deryni

committer: Tailor Script <tailor@pidgin.im>

diff -r e0f868943dee -r f118d61fb89a .todo
--- a/.todo	Tue Nov 19 17:38:11 2002 +0000
+++ b/.todo	Tue Nov 19 17:54:56 2002 +0000
@@ -1,4 +1,4 @@
-<!-- Automagically generated by the ToDo program on Mon Nov 18 17:20:28 2002 -->
+<!-- Automagically generated by the ToDo program on Mon Nov 18 22:07:48 2002 -->
 <todo version="0.1.14">
     <note priority="high" time="1036029816">
         UI stuff
@@ -131,9 +131,6 @@
                 when a new tab is created
             </note>
         </note>
-        <note priority="medium" time="1037657393">
-            alias not used in away message queue
-        </note>
         <note priority="low" time="1035995742">
             buddy ticker stays around when you sign off - showing the buddies who were online
         </note>
@@ -581,6 +578,9 @@
         <note priority="high" time="1036041787">
             no list of people on /join
         </note>
+        <note priority="high" time="1037675268">
+            remember /ignore list in privacy section
+        </note>
         <note priority="medium" time="1036041658">
             Error 421, unknown command when going away. sometimes. (has to do with html in away messages?)
         </note>
diff -r e0f868943dee -r f118d61fb89a src/buddy_chat.c
--- a/src/buddy_chat.c	Tue Nov 19 17:38:11 2002 +0000
+++ b/src/buddy_chat.c	Tue Nov 19 17:54:56 2002 +0000
@@ -1250,6 +1250,7 @@
 
 		tabby = gtk_hbox_new(FALSE, 0);
 		b->close = gtk_button_new();
+		gtk_widget_set_size_request(GTK_WIDGET(b->close), 16, 16);
 		gtk_container_add(GTK_CONTAINER(b->close), gtk_image_new_from_stock(GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU));
 		gtk_button_set_relief(GTK_BUTTON(b->close), GTK_RELIEF_NONE);
 		b->tab_label = gtk_label_new(b->name);
diff -r e0f868943dee -r f118d61fb89a src/conversation.c
--- a/src/conversation.c	Tue Nov 19 17:38:11 2002 +0000
+++ b/src/conversation.c	Tue Nov 19 17:54:56 2002 +0000
@@ -2800,6 +2800,7 @@
 /*		gtk_notebook_insert_page(GTK_NOTEBOOK(convo_notebook), cont, gtk_label_new(c->name),*/
 		tabby = gtk_hbox_new(FALSE, 0);
 		c->close = gtk_button_new();
+		gtk_widget_set_size_request(GTK_WIDGET(c->close), 16, 16);
 		gtk_container_add(GTK_CONTAINER(c->close), gtk_image_new_from_stock(GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU));
 		gtk_button_set_relief(GTK_BUTTON(c->close), GTK_RELIEF_NONE);
 		c->tab_label = gtk_label_new(c->name);
diff -r e0f868943dee -r f118d61fb89a src/server.c
--- a/src/server.c	Tue Nov 19 17:38:11 2002 +0000
+++ b/src/server.c	Tue Nov 19 17:54:56 2002 +0000
@@ -643,9 +643,15 @@
 			 * something to store the message, and add it to our queue. Then we update
 			 * the away dialog to indicate that we've queued something. */
 			struct queued_message *qm;
+			struct buddy *b;
 
 			qm = g_new0(struct queued_message, 1);
-			g_snprintf(qm->name, sizeof(qm->name), "%s", name);
+			if (OPT_IM_ALIAS_TAB) {
+				b = find_buddy(gc, name);
+				g_snprintf(qm->name, sizeof(qm->name), "%s", b ? b->show : name);
+			}
+			else
+				g_snprintf(qm->name, sizeof(qm->name), "%s", name);
 			qm->message = g_memdup(message, len == -1 ? strlen(message) + 1 : len);
 			qm->gc = gc;
 			qm->tm = mtime;