/soc/2013/ankitkv/gobjectification: 4a7f5f97d1ec: Make sure inte...

[Ankit Vani]

Changeset: 4a7f5f97d1ec42a98c01bed5972373ba807b9d82
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-09-03 02:22 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/4a7f5f97d1ec

Description:

Make sure internal.h is included first

diffstat:

 libpurple/protocols/bonjour/bonjour.h   |  2 +-
 libpurple/protocols/myspace/myspace.c   |  2 +-
 libpurple/protocols/novell/novell.c     |  4 ++--
 libpurple/protocols/null/nullprotocol.c |  4 ++--
 libpurple/protocols/oscar/libaim.c      |  3 ++-
 libpurple/protocols/oscar/libicq.c      |  3 ++-
 6 files changed, 10 insertions(+), 8 deletions(-)

diffs (103 lines):

diff --git a/libpurple/protocols/bonjour/bonjour.h b/libpurple/protocols/bonjour/bonjour.h
--- a/libpurple/protocols/bonjour/bonjour.h
+++ b/libpurple/protocols/bonjour/bonjour.h
@@ -26,10 +26,10 @@
 #ifndef _BONJOUR_H_
 #define _BONJOUR_H_
 
+#include "internal.h"
 #include "protocol.h"
 
 #include "mdns_common.h"
-#include "internal.h"
 #include "jabber.h"
 
 #define BONJOUR_GROUP_NAME _("Bonjour")
diff --git a/libpurple/protocols/myspace/myspace.c b/libpurple/protocols/myspace/myspace.c
--- a/libpurple/protocols/myspace/myspace.c
+++ b/libpurple/protocols/myspace/myspace.c
@@ -32,8 +32,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
+#include "myspace.h"
 #include "plugins.h"
-#include "myspace.h"
 
 static PurpleProtocol *my_protocol = NULL;
 
diff --git a/libpurple/protocols/novell/novell.c b/libpurple/protocols/novell/novell.c
--- a/libpurple/protocols/novell/novell.c
+++ b/libpurple/protocols/novell/novell.c
@@ -18,15 +18,15 @@
  *
  */
 
-#include "novell.h"
-
 #include "internal.h"
+
 #include "accountopt.h"
 #include "debug.h"
 #include "plugins.h"
 #include "server.h"
 #include "nmuser.h"
 #include "notify.h"
+#include "novell.h"
 #include "util.h"
 #include "sslconn.h"
 #include "request.h"
diff --git a/libpurple/protocols/null/nullprotocol.c b/libpurple/protocols/null/nullprotocol.c
--- a/libpurple/protocols/null/nullprotocol.c
+++ b/libpurple/protocols/null/nullprotocol.c
@@ -46,14 +46,14 @@
 
 #include <glib.h>
 
-#include "nullprotocol.h"
-
 /* If you're using this as the basis of a protocol that will be distributed
  * separately from libpurple, remove the internal.h include below and replace
  * it with code to include your own config.h or similar.  If you're going to
  * provide for translation, you'll also need to setup the gettext macros. */
 #include "internal.h"
 
+#include "nullprotocol.h"
+
 #include "account.h"
 #include "accountopt.h"
 #include "buddylist.h"
diff --git a/libpurple/protocols/oscar/libaim.c b/libpurple/protocols/oscar/libaim.c
--- a/libpurple/protocols/oscar/libaim.c
+++ b/libpurple/protocols/oscar/libaim.c
@@ -24,11 +24,12 @@
  * which contains all the shared implementation code with libicq
  */
 
+#include "libaim.h"
+
 #include "core.h"
 #include "plugins.h"
 #include "signals.h"
 
-#include "libaim.h"
 #include "oscarcommon.h"
 
 static PurpleProtocol *my_protocol = NULL;
diff --git a/libpurple/protocols/oscar/libicq.c b/libpurple/protocols/oscar/libicq.c
--- a/libpurple/protocols/oscar/libicq.c
+++ b/libpurple/protocols/oscar/libicq.c
@@ -24,11 +24,12 @@
  * which contains all the shared implementation code with libaim
  */
 
+#include "libicq.h"
+
 #include "core.h"
 #include "plugins.h"
 #include "signals.h"
 
-#include "libicq.h"
 #include "oscarcommon.h"
 
 static PurpleProtocol *my_protocol = NULL;