Mercurial > pidgin.yaz
diff libpurple/dbus-server.c @ 30224:b0f1698c52f8
propagate from branch 'im.pidgin.pidgin' (head fd01d69465dca1c23c811963e2545236c2749d55)
to branch 'im.pidgin.cpw.malu.ft_thumbnails' (head a565e5aaa067913f555e96099205782f530ce9a7)
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Sun, 29 Nov 2009 19:06:30 +0000 |
parents | 5306a71c4eb2 |
children | 5819bf02659e |
line wrap: on
line diff
--- a/libpurple/dbus-server.c Tue Nov 03 18:27:07 2009 +0000 +++ b/libpurple/dbus-server.c Sun Nov 29 19:06:30 2009 +0000 @@ -25,14 +25,16 @@ #define DBUS_API_SUBJECT_TO_CHANGE #endif +/* Allow the code below to see deprecated functions, so we can continue to + * export them via DBus. */ +#undef PURPLE_DISABLE_DEPRECATED + +#include "internal.h" + #include <stdio.h> #include <stdlib.h> #include <string.h> -/* Allow the code below to see deprecated functions, so we can continue to - * export them via DBus. */ -#undef PURPLE_DISABLE_DEPRECATED - #include "account.h" #include "blist.h" #include "conversation.h" @@ -42,7 +44,6 @@ #include "dbus-bindings.h" #include "debug.h" #include "core.h" -#include "internal.h" #include "savedstatuses.h" #include "smiley.h" #include "util.h"