pidgin.next.minor: abbc5b38: Fix win32 build. I haven't actually tes...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: abbc5b388482e59667d5f7950b41fc554d9332c5
Ancestor: 62bf0ee1dda63922e7b455e3609f8bad99e7282c
Author: datallah at pidgin.im
Date: 2008-12-02T01:51:55
Branch: im.pidgin.pidgin.next.minor
URL: http://d.pidgin.im/viewmtn/revision/info/abbc5b388482e59667d5f7950b41fc554d9332c5

Modified files:
        libpurple/Makefile.mingw libpurple/sound-theme-loader.c
        libpurple/sound-theme.c libpurple/win32/targets.mak
        pidgin/Makefile.mingw

ChangeLog: 

Fix win32 build.  I haven't actually tested any of the functionality, but it
compiles and runs.

-------------- next part --------------
============================================================
--- libpurple/Makefile.mingw	b2ff98bfc1a3f857f03e3b3c6f337ed251d07635
+++ libpurple/Makefile.mingw	5b6a2bb50a2701ff5b30a63bab881008de6a19ae
@@ -67,10 +67,15 @@ C_SRC =	\
 			signals.c \
 			smiley.c \
 			sound.c \
+			sound-theme.c \
+			sound-theme-loader.c \
 			sslconn.c \
 			status.c \
 			stringref.c \
 			stun.c \
+			theme.c \
+			theme-loader.c \
+			theme-manager.c \
 			upnp.c \
 			util.c \
 			value.c \
============================================================
--- libpurple/sound-theme-loader.c	f98a16e3e292de28382314953ec133dd8e078a7b
+++ libpurple/sound-theme-loader.c	f9f6fc1dfeb79622ce5edd9a35f609d33c589457
@@ -21,6 +21,7 @@
  *
  */
 
+#include "internal.h"
 #include "sound-theme-loader.h"
 #include "sound-theme.h"
 #include "util.h"
============================================================
--- libpurple/sound-theme.c	53d648af06f477d0609d2de7127fd67c696c6ca6
+++ libpurple/sound-theme.c	945089e270397f55c4b789e80198146ad6603a76
@@ -21,6 +21,7 @@
  *
  */
 
+#include "internal.h"
 #include "sound-theme.h"
 
 #define PURPLE_SOUND_THEME_GET_PRIVATE(Gobject) \
============================================================
--- libpurple/win32/targets.mak	d530ef12a30f8a3f4425e1687fea79601d3abe8c
+++ libpurple/win32/targets.mak	484bd8db9e2057374e63f6f04041969db67052e9
@@ -14,8 +14,8 @@ $(PURPLE_VERSION_H): $(PURPLE_VERSION_H)
 $(PURPLE_VERSION_H): $(PURPLE_VERSION_H).in $(PIDGIN_TREE_TOP)/configure.ac
 	awk 'BEGIN {FS="[\\(\\)\\[\\]]"} \
 	  /^m4_define..purple_major_version/ {system("sed -e s/@PURPLE_MAJOR_VERSION@/"$$5"/ $@.in > $@");} \
-	  /^m4_define..purple_minor_version/ {system("sed -e s/@PURPLE_MINOR_VERSION@/"$$5"/ $@ > $@.tmp & mv $@.tmp $@");} \
-	  /^m4_define..purple_micro_version/ {system("sed -e s/@PURPLE_MICRO_VERSION@/"$$5"/ $@ > $@.tmp & mv $@.tmp $@"); exit}' $(PIDGIN_TREE_TOP)/configure.ac
+	  /^m4_define..purple_minor_version/ {system("sed -e s/@PURPLE_MINOR_VERSION@/"$$5"/ $@ > $@.tmp && mv $@.tmp $@");} \
+	  /^m4_define..purple_micro_version/ {system("sed -e s/@PURPLE_MICRO_VERSION@/"$$5"/ $@ > $@.tmp && mv $@.tmp $@"); exit}' $(PIDGIN_TREE_TOP)/configure.ac
 
 $(PURPLE_DLL) $(PURPLE_DLL).a: $(PURPLE_VERSION_H)
 	$(MAKE) -C $(PURPLE_TOP) -f $(MINGW_MAKEFILE) libpurple.dll
============================================================
--- pidgin/Makefile.mingw	cd6e78bb6c96ba89595feeffa33c29f7f4d74c26
+++ pidgin/Makefile.mingw	159efec3e58c3db9cd5dda2274ab1876e88792be
@@ -56,6 +56,8 @@ PIDGIN_C_SRC =	\
 PIDGIN_C_SRC =	\
 			gtkaccount.c \
 			gtkblist.c \
+			gtkblist-theme.c \
+			gtkblist-theme-loader.c \
 			gtkcertmgr.c \
 			gtkcellrendererexpander.c \
 			gtkcellrendererprogress.c \
@@ -68,6 +70,8 @@ PIDGIN_C_SRC =	\
 			gtkeventloop.c \
 			gtkexpander.c \
 			gtkft.c \
+			gtkicon-theme.c \
+			gtkicon-theme-loader.c \
 			gtkidle.c \
 			gtkimhtml.c \
 			gtkimhtmltoolbar.c \
@@ -88,6 +92,7 @@ PIDGIN_C_SRC =	\
 			gtksound.c \
 			gtksourceiter.c \
 			gtksourceundomanager.c \
+			gtkstatus-icon-theme.c \
 			gtkstatusbox.c \
 			gtkthemes.c \
 			gtkutils.c \