# HG changeset patch
# User Christopher O'Brien <siege@pidgin.im>
# Date 1142090533 0
# Node ID 14fa5c3245736b434a34218975734d4e897385ab
# Parent  1b066d6f7d72e30ffc3827c705038ca5e4a9f1b2
[gaim-migrate @ 15864]
alphabetizing one, fixing an inane bug I somehow didn't notice in the other.

committer: Tailor Script <tailor@pidgin.im>

diff -r 1b066d6f7d72 -r 14fa5c324573 plugins/Makefile.mingw
--- a/plugins/Makefile.mingw	Fri Mar 10 19:04:25 2006 +0000
+++ b/plugins/Makefile.mingw	Sat Mar 11 15:22:13 2006 +0000
@@ -120,12 +120,12 @@
 	 	iconaway.dll \
 		idle.dll \
 		notify.dll \
+		psychic.dll \
 		relnot.dll \
 		spellchk.dll \
 		statenotify.dll \
 		timestamp_format.dll \
-		timestamp.dll \
-		psychic.dll
+		timestamp.dll
 
 
 ##
diff -r 1b066d6f7d72 -r 14fa5c324573 src/util.c
--- a/src/util.c	Fri Mar 10 19:04:25 2006 +0000
+++ b/src/util.c	Sat Mar 11 15:22:13 2006 +0000
@@ -3752,9 +3752,11 @@
 
 		b += 2; /* skip past the &# */
 
-		/* strtoul will handle 0x prefix as hex, but not x */
-		if(*b == 'x' || *b == 'X')
+		/* strtoul will treat 0x prefix as hex, but not just x */
+		if(*b == 'x' || *b == 'X') {
 			base = 16;
+			b++;
+		}
 
 		/* advances buf to the end of the ncr segment */
 		wc = (gunichar) strtoul(b, &buf, base);