# HG changeset patch
# User Ethan Blanton <elb@pidgin.im>
# Date 1177467809 0
# Node ID 7d0d3a74629977b55bbbb044fd72ff4905c7b69f
# Parent  4d2201900a35f6d0c4ce281efbf7a179eb639afa# Parent  8e163086a1716f331970b931a058646cf791a660
merge of '0ad153fbef57439d42601681df47200b190f5306'
     and '7bc42f0640ea8a9dce96dfc69f883523273e253d'

diff -r 8e163086a171 -r 7d0d3a746299 pidgin/gtkthemes.c
--- a/pidgin/gtkthemes.c	Wed Apr 25 01:51:01 2007 +0000
+++ b/pidgin/gtkthemes.c	Wed Apr 25 02:23:29 2007 +0000
@@ -200,6 +200,10 @@
 					i++;
 
 			}
+
+			/* Reverse the Smiley list since it was built in reverse order for efficiency reasons */
+			list->smileys = g_slist_reverse(list->smileys);
+
 			if (!have_used_sfile)
 				g_free(sfile);
 		}
diff -r 8e163086a171 -r 7d0d3a746299 pidgin/pixmaps/toolbar/Makefile.am
--- a/pidgin/pixmaps/toolbar/Makefile.am	Wed Apr 25 01:51:01 2007 +0000
+++ b/pidgin/pixmaps/toolbar/Makefile.am	Wed Apr 25 02:23:29 2007 +0000
@@ -1,1 +1,6 @@
 SUBDIRS = 16 22
+
+EXTRA_DIST = \
+	Makefile.mingw \
+	16/Makefile.mingw \
+	22/Makefile.mingw
diff -r 8e163086a171 -r 7d0d3a746299 pidgin/pixmaps/tray/Makefile.am
--- a/pidgin/pixmaps/tray/Makefile.am	Wed Apr 25 01:51:01 2007 +0000
+++ b/pidgin/pixmaps/tray/Makefile.am	Wed Apr 25 02:23:29 2007 +0000
@@ -2,5 +2,6 @@
 
 EXTRA_DIST = \
 	Makefile.mingw \
+	16/Makefile.mingw \
 	22/Makefile.mingw