/pidgin/main: e8edfd4e26ae: MXit: Cleanup the #includes (no purp...
Andrew Victor
andrew.victor at mxit.com
Tue Apr 2 18:56:46 EDT 2013
Changeset: e8edfd4e26aee535d9226ec3c262a4a5b6dc9ed6
Author: Andrew Victor <andrew.victor at mxit.com>
Date: 2013-04-03 00:36 +0200
Branch: release-2.x.y
URL: https://hg.pidgin.im/pidgin/main/rev/e8edfd4e26ae
Description:
MXit: Cleanup the #includes (no purple.h) so that it atleast compiles within InstantBird.
diffstat:
libpurple/protocols/mxit/actions.c | 5 +++--
libpurple/protocols/mxit/chunk.c | 5 +++--
libpurple/protocols/mxit/cipher.c | 4 ++--
libpurple/protocols/mxit/filexfer.c | 5 +++--
libpurple/protocols/mxit/formcmds.c | 4 +---
libpurple/protocols/mxit/formcmds.h | 4 +---
libpurple/protocols/mxit/http.c | 4 ++--
libpurple/protocols/mxit/login.c | 6 ++++--
libpurple/protocols/mxit/markup.c | 4 ++--
libpurple/protocols/mxit/multimx.c | 3 +--
libpurple/protocols/mxit/mxit.c | 7 +++----
libpurple/protocols/mxit/profile.c | 3 +--
libpurple/protocols/mxit/profile.h | 2 --
libpurple/protocols/mxit/protocol.c | 5 +++--
libpurple/protocols/mxit/roster.c | 4 ++--
libpurple/protocols/mxit/splashscreen.c | 4 ++--
libpurple/protocols/mxit/voicevideo.c | 3 ++-
libpurple/protocols/mxit/voicevideo.h | 5 -----
18 files changed, 35 insertions(+), 42 deletions(-)
diffs (264 lines):
diff --git a/libpurple/protocols/mxit/actions.c b/libpurple/protocols/mxit/actions.c
--- a/libpurple/protocols/mxit/actions.c
+++ b/libpurple/protocols/mxit/actions.c
@@ -23,8 +23,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
-#include "internal.h"
-#include "purple.h"
+#include "internal.h"
+#include "debug.h"
+#include "request.h"
#include "protocol.h"
#include "mxit.h"
diff --git a/libpurple/protocols/mxit/chunk.c b/libpurple/protocols/mxit/chunk.c
--- a/libpurple/protocols/mxit/chunk.c
+++ b/libpurple/protocols/mxit/chunk.c
@@ -23,8 +23,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
-#include "internal.h"
-#include "purple.h"
+#include "internal.h"
+#include "debug.h"
+
#include "protocol.h"
#include "mxit.h"
#include "chunk.h"
diff --git a/libpurple/protocols/mxit/cipher.c b/libpurple/protocols/mxit/cipher.c
--- a/libpurple/protocols/mxit/cipher.c
+++ b/libpurple/protocols/mxit/cipher.c
@@ -23,8 +23,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
-#include "internal.h"
-#include "purple.h"
+#include "internal.h"
+#include "debug.h"
#include "mxit.h"
#include "cipher.h"
diff --git a/libpurple/protocols/mxit/filexfer.c b/libpurple/protocols/mxit/filexfer.c
--- a/libpurple/protocols/mxit/filexfer.c
+++ b/libpurple/protocols/mxit/filexfer.c
@@ -23,8 +23,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
-#include "internal.h"
-#include "purple.h"
+#include "internal.h"
+#include "debug.h"
+
#include "protocol.h"
#include "mxit.h"
#include "chunk.h"
diff --git a/libpurple/protocols/mxit/formcmds.c b/libpurple/protocols/mxit/formcmds.c
--- a/libpurple/protocols/mxit/formcmds.c
+++ b/libpurple/protocols/mxit/formcmds.c
@@ -25,9 +25,7 @@
#include "internal.h"
-#include <glib.h>
-
-#include "purple.h"
+#include "debug.h"
#include "protocol.h"
#include "mxit.h"
diff --git a/libpurple/protocols/mxit/formcmds.h b/libpurple/protocols/mxit/formcmds.h
--- a/libpurple/protocols/mxit/formcmds.h
+++ b/libpurple/protocols/mxit/formcmds.h
@@ -26,10 +26,8 @@
#ifndef _MXIT_FORMCMDS_H_
#define _MXIT_FORMCMDS_H_
-#include "mxit.h"
-
+#include "protocol.h"
int mxit_parse_command(struct RXMsgData* mx, char* message);
-
#endif /* _MXIT_FORMCMDS_H_ */
diff --git a/libpurple/protocols/mxit/http.c b/libpurple/protocols/mxit/http.c
--- a/libpurple/protocols/mxit/http.c
+++ b/libpurple/protocols/mxit/http.c
@@ -23,8 +23,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
-#include "internal.h"
-#include "purple.h"
+#include "internal.h"
+#include "debug.h"
#include "mxit.h"
#include "protocol.h"
diff --git a/libpurple/protocols/mxit/login.c b/libpurple/protocols/mxit/login.c
--- a/libpurple/protocols/mxit/login.c
+++ b/libpurple/protocols/mxit/login.c
@@ -23,8 +23,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
-#include "internal.h"
-#include "purple.h"
+#include "internal.h"
+#include "debug.h"
+#include "request.h"
+#include "version.h"
#include "protocol.h"
#include "mxit.h"
diff --git a/libpurple/protocols/mxit/markup.c b/libpurple/protocols/mxit/markup.c
--- a/libpurple/protocols/mxit/markup.c
+++ b/libpurple/protocols/mxit/markup.c
@@ -23,8 +23,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
-#include "internal.h"
-#include "purple.h"
+#include "internal.h"
+#include "debug.h"
#include "protocol.h"
#include "mxit.h"
diff --git a/libpurple/protocols/mxit/multimx.c b/libpurple/protocols/mxit/multimx.c
--- a/libpurple/protocols/mxit/multimx.c
+++ b/libpurple/protocols/mxit/multimx.c
@@ -24,8 +24,7 @@
*/
#include "internal.h"
-#include "purple.h"
-#include "prpl.h"
+#include "debug.h"
#include "protocol.h"
#include "mxit.h"
diff --git a/libpurple/protocols/mxit/mxit.c b/libpurple/protocols/mxit/mxit.c
--- a/libpurple/protocols/mxit/mxit.c
+++ b/libpurple/protocols/mxit/mxit.c
@@ -23,10 +23,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
-#include "internal.h"
-#include "purple.h"
-#include "notify.h"
-#include "plugin.h"
+#include "internal.h"
+#include "debug.h"
+#include "accountopt.h"
#include "version.h"
#include "mxit.h"
diff --git a/libpurple/protocols/mxit/profile.c b/libpurple/protocols/mxit/profile.c
--- a/libpurple/protocols/mxit/profile.c
+++ b/libpurple/protocols/mxit/profile.c
@@ -26,8 +26,7 @@
#define _XOPEN_SOURCE
#include <time.h>
-#include "internal.h"
-#include "purple.h"
+#include "internal.h"
#include "mxit.h"
#include "profile.h"
diff --git a/libpurple/protocols/mxit/profile.h b/libpurple/protocols/mxit/profile.h
--- a/libpurple/protocols/mxit/profile.h
+++ b/libpurple/protocols/mxit/profile.h
@@ -26,8 +26,6 @@
#ifndef _MXIT_PROFILE_H_
#define _MXIT_PROFILE_H_
-#include <glib.h>
-
/* MXit relationship status types */
#define MXIT_RELATIONSHIP_UNKNOWN 0
diff --git a/libpurple/protocols/mxit/protocol.c b/libpurple/protocols/mxit/protocol.c
--- a/libpurple/protocols/mxit/protocol.c
+++ b/libpurple/protocols/mxit/protocol.c
@@ -23,8 +23,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
-#include "internal.h"
-#include "purple.h"
+#include "internal.h"
+#include "debug.h"
+#include "version.h"
#include "protocol.h"
#include "mxit.h"
diff --git a/libpurple/protocols/mxit/roster.c b/libpurple/protocols/mxit/roster.c
--- a/libpurple/protocols/mxit/roster.c
+++ b/libpurple/protocols/mxit/roster.c
@@ -23,8 +23,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
-#include "internal.h"
-#include "purple.h"
+#include "internal.h"
+#include "debug.h"
#include "protocol.h"
#include "mxit.h"
diff --git a/libpurple/protocols/mxit/splashscreen.c b/libpurple/protocols/mxit/splashscreen.c
--- a/libpurple/protocols/mxit/splashscreen.c
+++ b/libpurple/protocols/mxit/splashscreen.c
@@ -24,9 +24,9 @@
*/
#include "internal.h"
-
-#include "purple.h"
+#include "debug.h"
#include "imgstore.h"
+#include "request.h"
#include "protocol.h"
#include "mxit.h"
diff --git a/libpurple/protocols/mxit/voicevideo.c b/libpurple/protocols/mxit/voicevideo.c
--- a/libpurple/protocols/mxit/voicevideo.c
+++ b/libpurple/protocols/mxit/voicevideo.c
@@ -23,7 +23,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
-#include "purple.h"
+#include "internal.h"
+
#include "mxit.h"
#include "roster.h"
#include "voicevideo.h"
diff --git a/libpurple/protocols/mxit/voicevideo.h b/libpurple/protocols/mxit/voicevideo.h
--- a/libpurple/protocols/mxit/voicevideo.h
+++ b/libpurple/protocols/mxit/voicevideo.h
@@ -26,16 +26,11 @@
#ifndef _MXIT_VOICEVICEO_H_
#define _MXIT_VOICEVIDEO_H_
-#include "media.h"
-
-
#undef MXIT_DEV_VV
-
gboolean mxit_audio_enabled(void);
gboolean mxit_video_enabled(void);
PurpleMediaCaps mxit_media_caps(PurpleAccount* account, const char* who);
gboolean mxit_media_initiate(PurpleAccount* account, const char* who, PurpleMediaSessionType type);
-
#endif /* _MXIT_VOICEVIDEO_H_ */
More information about the Commits
mailing list