merge of '57a841ca24508a2bcf49b446c5dac2f71974740e' next.minor

Tue, 02 Dec 2008 19:24:57 +0000

author
Sadrul Habib Chowdhury <sadrul@pidgin.im>
date
Tue, 02 Dec 2008 19:24:57 +0000
branch
next.minor
changeset 25016
4d64d77e87c8
parent 25010
57a841ca2450 (diff)
parent 25015
b748dd8a5633 (current diff)
child 25017
139df1ee9854

merge of '57a841ca24508a2bcf49b446c5dac2f71974740e'
and 'b748dd8a5633ad7fb41b9d74ee2c55e02a9b84ec'

--- a/libpurple/Makefile.mingw	Tue Dec 02 18:47:38 2008 +0000
+++ b/libpurple/Makefile.mingw	Tue Dec 02 19:24:57 2008 +0000
@@ -67,10 +67,15 @@
 			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 \
--- a/libpurple/sound-theme-loader.c	Tue Dec 02 18:47:38 2008 +0000
+++ b/libpurple/sound-theme-loader.c	Tue Dec 02 19:24:57 2008 +0000
@@ -21,6 +21,7 @@
  *
  */
 
+#include "internal.h"
 #include "sound-theme-loader.h"
 #include "sound-theme.h"
 #include "util.h"
--- a/libpurple/sound-theme.c	Tue Dec 02 18:47:38 2008 +0000
+++ b/libpurple/sound-theme.c	Tue Dec 02 19:24:57 2008 +0000
@@ -21,6 +21,7 @@
  *
  */
 
+#include "internal.h"
 #include "sound-theme.h"
 
 #define PURPLE_SOUND_THEME_GET_PRIVATE(Gobject) \
--- a/libpurple/win32/targets.mak	Tue Dec 02 18:47:38 2008 +0000
+++ b/libpurple/win32/targets.mak	Tue Dec 02 19:24:57 2008 +0000
@@ -14,8 +14,8 @@
 $(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
--- a/pidgin/Makefile.mingw	Tue Dec 02 18:47:38 2008 +0000
+++ b/pidgin/Makefile.mingw	Tue Dec 02 19:24:57 2008 +0000
@@ -56,6 +56,8 @@
 PIDGIN_C_SRC =	\
 			gtkaccount.c \
 			gtkblist.c \
+			gtkblist-theme.c \
+			gtkblist-theme-loader.c \
 			gtkcertmgr.c \
 			gtkcellrendererexpander.c \
 			gtkcellrendererprogress.c \
@@ -68,6 +70,8 @@
 			gtkeventloop.c \
 			gtkexpander.c \
 			gtkft.c \
+			gtkicon-theme.c \
+			gtkicon-theme-loader.c \
 			gtkidle.c \
 			gtkimhtml.c \
 			gtkimhtmltoolbar.c \
@@ -88,6 +92,7 @@
 			gtksound.c \
 			gtksourceiter.c \
 			gtksourceundomanager.c \
+			gtkstatus-icon-theme.c \
 			gtkstatusbox.c \
 			gtkthemes.c \
 			gtkutils.c \

mercurial