Mercurial > pidgin

changeset 16362:7d0d3a746299

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '0ad153fbef57439d42601681df47200b190f5306' and '7bc42f0640ea8a9dce96dfc69f883523273e253d'
author Ethan Blanton <elb@pidgin.im>
date Wed, 25 Apr 2007 02:23:29 +0000
parents 4d2201900a35 (diff) 8e163086a171 (current diff)
children f4c72a722741
files
diffstat 3 files changed, 10 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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);
 		}
--- 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
--- 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