diff options
| author | Paul Aurich <darkrain42@pidgin.im> | 2009-04-12 23:57:27 +0000 |
|---|---|---|
| committer | Paul Aurich <darkrain42@pidgin.im> | 2009-04-12 23:57:27 +0000 |
| commit | 164a6a8bc9db99bb431965fa1484d61b01be7895 (patch) | |
| tree | 0cddedda9c362b39cc5ae70d69da7901b18c9b49 | |
| parent | e253b3b0d759ce901fb277655489ba70f65267da (diff) | |
| parent | 70dbc8b8a0d42ce65dd98b66b5962d3dc4dee5f4 (diff) | |
| download | pidgin-164a6a8bc9db99bb431965fa1484d61b01be7895.tar.gz | |
merge of '17140fe8c2f626ba7cf085cc77c63750c9596fc7'
and 'ff2c7913108e7a09f70fd761d0019ed1e285d646'
| -rw-r--r-- | libpurple/Makefile.mingw | 12 | ||||
| -rw-r--r-- | libpurple/media.c | 2 | ||||
| -rw-r--r-- | libpurple/mediamanager.c | 2 |
3 files changed, 9 insertions, 7 deletions
diff --git a/libpurple/Makefile.mingw b/libpurple/Makefile.mingw index 952048c699..8b2b550ca7 100644 --- a/libpurple/Makefile.mingw +++ b/libpurple/Makefile.mingw @@ -35,6 +35,7 @@ C_SRC = \ buddyicon.c \ certificate.c \ cipher.c \ + circbuffer.c \ cmds.c \ connection.c \ conversation.c \ @@ -44,10 +45,11 @@ C_SRC = \ 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 @@ C_SRC = \ server.c \ signals.c \ smiley.c \ - sound.c \ - sound-theme.c \ sound-theme-loader.c \ + sound-theme.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 \ - xmlnode.c \ whiteboard.c \ + xmlnode.c \ win32/giowin32.c \ win32/libc_interface.c \ win32/win32dep.c diff --git a/libpurple/media.c b/libpurple/media.c index 78eed006a8..2c2b537a2e 100644 --- a/libpurple/media.c +++ b/libpurple/media.c @@ -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 diff --git a/libpurple/mediamanager.c b/libpurple/mediamanager.c index a92a0c895d..ccd91e9483 100644 --- a/libpurple/mediamanager.c +++ b/libpurple/mediamanager.c @@ -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 |