Mercurial > pidgin
changeset 25869:7524f9a084ff
merge of 'abbc5b388482e59667d5f7950b41fc554d9332c5'
and 'ae1747d0fffb12e2729f1ed66aff8083309ec96b'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Tue, 02 Dec 2008 19:24:57 +0000 |
| parents | d5852f7208fa (diff) ba083e5f633b (current diff) |
| children | d9da15c9e2a1 |
| files | |
| diffstat | 5 files changed, 14 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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 \