# HG changeset patch
# User Rob Flynn <gaim@robflynn.com>
# Date 1036314261 0
# Node ID 94852b7cc81f4cc7ecfb6ef9f582cbc324c7bffd
# Parent  058bc42a46a521054d2b504d41b028e64952bb17
[gaim-migrate @ 4037]
blah

committer: Tailor Script <tailor@pidgin.im>

diff -r 058bc42a46a5 -r 94852b7cc81f pixmaps/Makefile.am
--- a/pixmaps/Makefile.am	Sun Nov 03 08:56:25 2002 +0000
+++ b/pixmaps/Makefile.am	Sun Nov 03 09:04:21 2002 +0000
@@ -44,7 +44,6 @@
 		logo.png		\
 		logo.xpm			\
 		logout_icon.xpm			\
-		logout_menu.xpm			\
 		luke03.xpm			\
 		moneymouth.xpm			\
 		mrt.xpm				\
diff -r 058bc42a46a5 -r 94852b7cc81f pixmaps/logout_menu.xpm
--- a/pixmaps/logout_menu.xpm	Sun Nov 03 08:56:25 2002 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/* XPM */
-static char * logout_menu_xpm[] = {
-/* width height num_colors chars_per_pixel */
-"18 18 15 1",
-/* colors */
-" 	c #cccccc",
-".	c #999999",
-"X	c None",
-"o	c black",
-"O	c #000066",
-"+	c #996666",
-"@	c white",
-"#	c #000099",
-"$	c #666699",
-"%	c #ffff99",
-"&	c #6666cc",
-"*	c #336699",
-"=	c #333366",
-"-	c #333399",
-";	c #333333",
-/* pixels */
-"XXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXX",
-"XXX .XoooooooooXXX",
-"XXXXXXo       OXXX",
-"XXXo.Xo ++@++@#XXX",
-"XXXXX$o.+%@+%@OXXX",
-"XXXXX&o +%@+%@#XXX",
-"XXX .*o @@@@@@OXXX",
-"XXX=X-ooo+@++@#XXX",
-"XXXXX=o +.@+%@#XXX",
-"XXXX.;o +%@+%@OXXX",
-"XXXoXXo +%@+%@#XXX",
-"XXXXXXo @@@@@@OXXX",
-"XXX .*#O#O#O#O#XXX",
-"XXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXX"};
diff -r 058bc42a46a5 -r 94852b7cc81f src/buddy.c
--- a/src/buddy.c	Sun Nov 03 08:56:25 2002 +0000
+++ b/src/buddy.c	Sun Nov 03 09:04:21 2002 +0000
@@ -60,7 +60,6 @@
 #include "pixmaps/gnome_add.xpm"
 #include "pixmaps/gnome_remove.xpm"
 #include "pixmaps/group.xpm"
-#include "pixmaps/logout_menu.xpm"
 
 #include "pixmaps/arrow_down.xpm"
 #include "pixmaps/arrow_right.xpm"
diff -r 058bc42a46a5 -r 94852b7cc81f src/conversation.c
--- a/src/conversation.c	Sun Nov 03 08:56:25 2002 +0000
+++ b/src/conversation.c	Sun Nov 03 09:04:21 2002 +0000
@@ -2628,7 +2628,6 @@
 		int offs = ((convo_options & OPT_CONVO_COMBINE) &&
 			    (im_options & OPT_IM_ONE_WINDOW) && c->is_chat) ?
 			g_list_length(conversations) : 0;
-		GList *ws = (c->is_chat ? chats : conversations);
 		GtkWidget *label = c->tab_label;
 		style = gtk_style_new();
 		if (!GTK_WIDGET_REALIZED(label))
diff -r 058bc42a46a5 -r 94852b7cc81f src/multi.c
--- a/src/multi.c	Sun Nov 03 08:56:25 2002 +0000
+++ b/src/multi.c	Sun Nov 03 09:04:21 2002 +0000
@@ -1237,7 +1237,7 @@
 
 	sg = gtk_size_group_new(GTK_SIZE_GROUP_BOTH);
 
-	button = gtk_button_new_from_stock(GTK_STOCK_OK);
+	button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
 	gtk_size_group_add_widget(sg, button);
 	gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
 	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(acctedit_close), W);