Mercurial > pidgin3 / changeset

--- a/libpurple/Makefile.mingw	Sat Apr 05 23:13:04 2014 +0200
+++ b/libpurple/Makefile.mingw	Sat Apr 05 23:16:27 2014 +0200
@@ -102,6 +102,7 @@
 			media/enum-types.c \
 			mediamanager.c \
 			media.c \
+			memorypool.c \
 			mime.c \
 			nat-pmp.c \
 			network.c \
@@ -122,6 +123,11 @@
 			server.c \
 			signals.c \
 			smiley.c \
+			smiley-custom.c \
+			smiley-list.c \
+			smiley-parser.c \
+			smiley-remote.c \
+			smiley-theme.c \
 			sound-theme-loader.c \
 			sound-theme.c \
 			sound.c \
@@ -132,6 +138,7 @@
 			theme-loader.c \
 			theme-manager.c \
 			theme.c \
+			trie.c \
 			upnp.c \
 			util.c \
 			version.c \

--- a/libpurple/plugins/perl/common/Purple.xs	Sat Apr 05 23:13:04 2014 +0200
+++ b/libpurple/plugins/perl/common/Purple.xs	Sat Apr 05 23:16:27 2014 +0200
@@ -31,7 +31,6 @@
 PURPLE_PERL_BOOT_PROTO(SavedStatus);
 PURPLE_PERL_BOOT_PROTO(Serv);
 PURPLE_PERL_BOOT_PROTO(Signal);
-PURPLE_PERL_BOOT_PROTO(Smiley);
 PURPLE_PERL_BOOT_PROTO(Sound);
 PURPLE_PERL_BOOT_PROTO(Status);
 PURPLE_PERL_BOOT_PROTO(Stringref);
@@ -72,7 +71,6 @@
 	PURPLE_PERL_BOOT(SavedStatus);
 	PURPLE_PERL_BOOT(Serv);
 	PURPLE_PERL_BOOT(Signal);
-	PURPLE_PERL_BOOT(Smiley);
 	PURPLE_PERL_BOOT(Sound);
 	PURPLE_PERL_BOOT(Status);
 	PURPLE_PERL_BOOT(Stringref);

--- a/libpurple/protocols/mxit/Makefile.mingw	Sat Apr 05 23:13:04 2014 +0200
+++ b/libpurple/protocols/mxit/Makefile.mingw	Sat Apr 05 23:16:27 2014 +0200
@@ -38,9 +38,8 @@
 ##  SOURCES, OBJECTS
 ##
 C_SRC =			actions.c \
-			aes.c \
 			chunk.c \
-			cipher.c \
+			cipher-mxit.c \
 			filexfer.c \
 			formcmds.c \
 			login.c \

--- a/pidgin/Makefile.mingw	Sat Apr 05 23:13:04 2014 +0200
+++ b/pidgin/Makefile.mingw	Sat Apr 05 23:16:27 2014 +0200
@@ -89,11 +89,11 @@
 			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 \
 			pidginstock.c \
 			pidgintooltip.c \
-			smileyparser.c \
 			win32/gtkwin32dep.c \
 			win32/untar.c \
 			win32/wspell.c

--- a/pidgin/gtkconv.c	Sat Apr 05 23:13:04 2014 +0200
+++ b/pidgin/gtkconv.c	Sat Apr 05 23:16:27 2014 +0200
@@ -6633,6 +6633,11 @@
 {
 	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 @@
 	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);

--- a/pidgin/plugins/perl/common/Pidgin.xs	Sat Apr 05 23:13:04 2014 +0200
+++ b/pidgin/plugins/perl/common/Pidgin.xs	Sat Apr 05 23:16:27 2014 +0200
@@ -28,7 +28,6 @@
 #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 @@
 #endif
 	PIDGIN_PERL_BOOT(Sound);
 	PIDGIN_PERL_BOOT(StatusBox);
-	PIDGIN_PERL_BOOT(Themes);
 	PIDGIN_PERL_BOOT(Utils);
 	PIDGIN_PERL_BOOT(Xfer);