3 files changed, 9 insertions, 7 deletions
diff --git a/pidgin/Makefile.mingw b/pidgin/Makefile.mingw
index 6b97241586..57777c75f1 100644
--- a/pidgin/Makefile.mingw
+++ b/pidgin/Makefile.mingw
@@ -89,11 +89,11 @@ PIDGIN_C_SRC =	\
 			gtkroomlist.c \
 			gtksavedstatuses.c \
 			gtkscrollbook.c \
-			gtksmiley.c \
+			gtksmiley-manager.c \
+			gtksmiley-theme.c \
 			gtksound.c \
 			gtkstatus-icon-theme.c \
 			gtkstatusbox.c \
-			gtkthemes.c \
 			gtkutils.c \
 			gtkwebview.c \
 			gtkwebviewtoolbar.c \
@@ -104,7 +104,6 @@ PIDGIN_C_SRC =	\
 			pidgin.c \
 			pidginstock.c \
 			pidgintooltip.c \
-			smileyparser.c \
 			win32/gtkwin32dep.c \
 			win32/untar.c \
 			win32/wspell.c
diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c
index dfc42c1768..a9dbc47248 100644
--- a/pidgin/gtkconv.c
+++ b/pidgin/gtkconv.c
@@ -6633,6 +6633,11 @@ pidgin_conv_write_smiley(GString *out, PurpleSmiley *smiley,
 {
 	gchar *escaped_shortcut;
 	const gchar *path = purple_smiley_get_path(smiley);
+	const gchar *path_prefix = "";
+
+#ifdef _WIN32
+	path_prefix = "file:///";
+#endif
 
 	escaped_shortcut = g_markup_escape_text(
 		purple_smiley_get_shortcut(smiley), -1);
@@ -6640,8 +6645,8 @@ pidgin_conv_write_smiley(GString *out, PurpleSmiley *smiley,
 	if (purple_smiley_is_ready(smiley) && path) {
 		g_string_append_printf(out,
 			"<img class=\"emoticon\" alt=\"%s\" title=\"%s\" "
-			"src=\"%s\" />", escaped_shortcut,
-			escaped_shortcut, path);
+			"src=\"%s%s\" />", escaped_shortcut,
+			escaped_shortcut, path_prefix, path);
 	} else if (purple_smiley_is_ready(smiley) && !path) {
 		PurpleStoredImage *img = purple_smiley_get_image(smiley);
 		int imgid = purple_imgstore_add_with_id(img);
diff --git a/pidgin/plugins/perl/common/Pidgin.xs b/pidgin/plugins/perl/common/Pidgin.xs
index 0b8d4785f1..95ff451d74 100644
--- a/pidgin/plugins/perl/common/Pidgin.xs
+++ b/pidgin/plugins/perl/common/Pidgin.xs
@@ -28,7 +28,6 @@ PIDGIN_PERL_BOOT_PROTO(Session);
 #endif
 PIDGIN_PERL_BOOT_PROTO(Sound);
 PIDGIN_PERL_BOOT_PROTO(StatusBox);
-PIDGIN_PERL_BOOT_PROTO(Themes);
 PIDGIN_PERL_BOOT_PROTO(Utils);
 PIDGIN_PERL_BOOT_PROTO(Xfer);
 
@@ -57,6 +56,5 @@ BOOT:
 #endif
 	PIDGIN_PERL_BOOT(Sound);
 	PIDGIN_PERL_BOOT(StatusBox);
-	PIDGIN_PERL_BOOT(Themes);
 	PIDGIN_PERL_BOOT(Utils);
 	PIDGIN_PERL_BOOT(Xfer);