Mercurial > pidgin.yaz
changeset 26648:8c3b1a059ecc
merge of '8952794c1397b9cba4b98accf0639bb5499387d4'
and 'a0102873e8bacb2e83f697a4f7b7ba500ea806bd'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Sun, 12 Apr 2009 23:57:27 +0000 |
| parents | 75b473f216f2 (diff) b6534ef99dc8 (current diff) |
| children | d00a8111e479 608493e51182 925a5a7605b6 89bbb4360df2 c0ab14a1e43a e57315a062cb |
| files | |
| diffstat | 3 files changed, 9 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/Makefile.mingw Sun Apr 12 23:56:20 2009 +0000 +++ b/libpurple/Makefile.mingw Sun Apr 12 23:57:27 2009 +0000 @@ -35,6 +35,7 @@ buddyicon.c \ certificate.c \ cipher.c \ + circbuffer.c \ cmds.c \ connection.c \ conversation.c \ @@ -44,10 +45,11 @@ dnssrv.c \ eventloop.c \ ft.c \ - circbuffer.c \ idle.c \ imgstore.c \ log.c \ + media.c \ + mediamanager.c \ mime.c \ nat-pmp.c \ network.c \ @@ -66,22 +68,22 @@ server.c \ signals.c \ smiley.c \ - sound.c \ + sound-theme-loader.c \ sound-theme.c \ - sound-theme-loader.c \ + sound.c \ sslconn.c \ status.c \ stringref.c \ stun.c \ - theme.c \ theme-loader.c \ theme-manager.c \ + theme.c \ upnp.c \ util.c \ value.c \ version.c \ + whiteboard.c \ xmlnode.c \ - whiteboard.c \ win32/giowin32.c \ win32/libc_interface.c \ win32/win32dep.c
--- a/libpurple/media.c Sun Apr 12 23:56:20 2009 +0000 +++ b/libpurple/media.c Sun Apr 12 23:57:27 2009 +0000 @@ -29,7 +29,6 @@ #include "internal.h" #include "account.h" -#include "marshallers.h" #include "media.h" #include "mediamanager.h" #include "network.h" @@ -37,6 +36,7 @@ #include "debug.h" #ifdef USE_GSTREAMER +#include "marshallers.h" #include "media-gst.h" #endif
--- a/libpurple/mediamanager.c Sun Apr 12 23:56:20 2009 +0000 +++ b/libpurple/mediamanager.c Sun Apr 12 23:57:27 2009 +0000 @@ -28,11 +28,11 @@ #include "account.h" #include "debug.h" -#include "marshallers.h" #include "media.h" #include "mediamanager.h" #ifdef USE_GSTREAMER +#include "marshallers.h" #include "media-gst.h" #endif