pidgin: 6a5f9415: Fix all the remaining files for which in...

darkrain42 at pidgin.im darkrain42 at pidgin.im
Mon Dec 7 23:21:17 EST 2009


-----------------------------------------------------------------
Revision: 6a5f94151ae9c9afbba73e905edb55cd64f6b3ea
Ancestor: e8ba4281669ae86859fd4e29f5d8ea0286af3903
Author: darkrain42 at pidgin.im
Date: 2009-12-08T04:18:32
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/6a5f94151ae9c9afbba73e905edb55cd64f6b3ea

Modified files:
        finch/finch.c finch/gntaccount.c finch/gntblist.c
        finch/gntcertmgr.c finch/gntconn.c finch/gntconv.c
        finch/gntdebug.c finch/gntft.c finch/gntlog.c
        finch/gntmedia.c finch/gntnotify.c finch/gntplugin.c
        finch/gntpounce.c finch/libgnt/gntutils.c
        finch/libgnt/wms/s.c libpurple/protocols/gg/lib/common.c
        libpurple/protocols/gg/lib/dcc.c
        libpurple/protocols/gg/lib/events.c
        libpurple/protocols/gg/lib/http.c
        libpurple/protocols/gg/lib/libgadu.c
        libpurple/protocols/gg/lib/pubdir.c
        libpurple/protocols/gg/lib/pubdir50.c
        libpurple/protocols/mxit/actions.c
        libpurple/protocols/mxit/chunk.c
        libpurple/protocols/mxit/cipher.c
        libpurple/protocols/mxit/filexfer.c
        libpurple/protocols/mxit/formcmds.c
        libpurple/protocols/mxit/http.c
        libpurple/protocols/mxit/login.c
        libpurple/protocols/mxit/markup.c
        libpurple/protocols/mxit/multimx.c
        libpurple/protocols/mxit/mxit.c
        libpurple/protocols/mxit/profile.c
        libpurple/protocols/mxit/protocol.c
        libpurple/protocols/mxit/roster.c
        libpurple/protocols/mxit/splashscreen.c
        libpurple/protocols/oscar/clientlogin.c
        libpurple/protocols/oscar/family_auth.c
        libpurple/protocols/oscar/oscarcommon.h
        libpurple/protocols/yahoo/ycht.c

ChangeLog: 

Fix all the remaining files for which internal.h doesn't end up being the first include.

This should resolve the warnings on Solaris as reported by aab.  Closes #10523.

-------------- next part --------------
============================================================
--- finch/finch.c	3f5e5d11263dc80afd01f2afce8b8ce60535a21b
+++ finch/finch.c	f893f4128c27bed8fc01703b91abd41e78bfd51d
@@ -19,8 +19,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
+#include <internal.h>
 #include "finch.h"
-#include <internal.h>
 
 #include "account.h"
 #include "conversation.h"
============================================================
--- finch/gntaccount.c	c6b4156930c182ef1211e0a87f79559ef0844b94
+++ finch/gntaccount.c	afd939b0b11d6aa01dce2f4ec8a02b9362d284b3
@@ -23,6 +23,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
+#include <internal.h>
+
 #include <gnt.h>
 #include <gntbox.h>
 #include <gntbutton.h>
@@ -36,7 +38,6 @@
 #include <gntwindow.h>
 
 #include "finch.h"
-#include <internal.h>
 
 #include <account.h>
 #include <accountopt.h>
============================================================
--- finch/gntblist.c	db1b1fbee651cea0f3e4ef5c5cd5370cf4f2882e
+++ finch/gntblist.c	4e066847490916f1e54e19797e3344f67716dfd1
@@ -23,8 +23,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
+#include <internal.h>
 #include "finch.h"
-#include <internal.h>
 
 #include <account.h>
 #include <blist.h>
============================================================
--- finch/gntcertmgr.c	8bff35c5e765f032ab4217905ed803cdf457e67e
+++ finch/gntcertmgr.c	35915dc5c39a8dbc3fda9f1a5f46346e8b46546d
@@ -25,8 +25,8 @@
  *
  */
 
+#include <internal.h>
 #include "finch.h"
-#include <internal.h>
 
 #include "certificate.h"
 #include "debug.h"
============================================================
--- finch/gntconn.c	f52afca39efc4664fff4c4dfbd5959ea580c4f32
+++ finch/gntconn.c	a14e5f5d478a6f61b28294aea688f28491bfc052
@@ -23,8 +23,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
+#include <internal.h>
 #include "finch.h"
-#include <internal.h>
 
 #include "account.h"
 #include "core.h"
============================================================
--- finch/gntconv.c	b7cc42c8d7b78b543fd59154f6b7e421faa14632
+++ finch/gntconv.c	04d8ea547ffa99a7123645d116c5099df0423684
@@ -23,10 +23,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
-#include <string.h>
 
-#include "finch.h"
 #include <internal.h>
+#include "finch.h"
 
 #include <cmds.h>
 #include <core.h>
============================================================
--- finch/gntdebug.c	54c4d32f48b2dd05df186f8e39756229fc1ffa57
+++ finch/gntdebug.c	bf0c49257c1c4547e631862bdd482dee37bb54e8
@@ -23,6 +23,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
+
+#include <internal.h>
+
 #include <gnt.h>
 #include <gntbox.h>
 #include <gntbutton.h>
@@ -35,7 +38,6 @@
 
 #include "gntdebug.h"
 #include "finch.h"
-#include <internal.h>
 #include "notify.h"
 #include "util.h"
 
============================================================
--- finch/gntft.c	04e2834f319cbf6c67d628696f0aacbf329912dd
+++ finch/gntft.c	cc09909ffa63044a00c93bac8fe03b9b92e3f0f6
@@ -23,8 +23,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
+#include <internal.h>
 #include "finch.h"
-#include <internal.h>
 
 #include <gnt.h>
 #include <gntbox.h>
============================================================
--- finch/gntlog.c	9ca932b4f8c3640a76539ed84cc3f08e5ad2f6a6
+++ finch/gntlog.c	aaa0c27889f1c7cba351913d53056e2e1b9aa76f
@@ -23,8 +23,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
+#include <internal.h>
 #include "finch.h"
-#include <internal.h>
 
 #include <gnt.h>
 #include <gntbox.h>
============================================================
--- finch/gntmedia.c	822203c01975f915e5b51f4c01a9d4c54af619b5
+++ finch/gntmedia.c	2eaeee3397742fd5cad2f0940034bee7bcb192e8
@@ -24,8 +24,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
+#include <internal.h>
 #include "finch.h"
-#include <internal.h>
 #include "gntconv.h"
 #include "gntmedia.h"
 
============================================================
--- finch/gntnotify.c	0900df9b537579c3bc05bbb5d15e5a249102ef1c
+++ finch/gntnotify.c	5ec567ec485c751a5e7cefd19e8acd4b7bef5ee5
@@ -23,6 +23,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
+#include <internal.h>
+
 #include <gnt.h>
 #include <gntbox.h>
 #include <gntbutton.h>
@@ -32,7 +34,6 @@
 #include <gntwindow.h>
 
 #include "finch.h"
-#include <internal.h>
 
 #include <util.h>
 
============================================================
--- finch/gntplugin.c	ee71059d39fb4588033976591d8a468e1bed8c56
+++ finch/gntplugin.c	6b29d35025ddfed3a08125ef13ecf4f8712bb7a2
@@ -23,6 +23,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
+#include <internal.h>
+
 #include <gnt.h>
 #include <gntbox.h>
 #include <gntbutton.h>
@@ -32,7 +34,6 @@
 #include <gntutils.h>
 
 #include "finch.h"
-#include <internal.h>
 
 #include "debug.h"
 #include "notify.h"
============================================================
--- finch/gntpounce.c	b0f2e19529439b4ef2a556a2da9b41eefbf0f1a5
+++ finch/gntpounce.c	bcdf342f1cb557dddf6d355d9c0672cdabc616b8
@@ -24,6 +24,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
+#include <internal.h>
+
 #include <gnt.h>
 #include <gntbox.h>
 #include <gntbutton.h>
@@ -36,7 +38,6 @@
 #include <gntutils.h>
 
 #include "finch.h"
-#include <internal.h>
 
 #include "account.h"
 #include "conversation.h"
============================================================
--- finch/libgnt/gntutils.c	5d66e3f194d3432ca8d4e4814bfb243e2291ca53
+++ finch/libgnt/gntutils.c	1e82c66ec9e26d6fa1b9d8bc5b045226895f7fa9
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
+#include "config.h"
+
 #include "gntinternal.h"
 #undef GNT_LOG_DOMAIN
 #define GNT_LOG_DOMAIN "Utils"
@@ -35,8 +37,6 @@
 #include "gntutils.h"
 #include "gntwindow.h"
 
-#include "config.h"
-
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
@@ -46,8 +46,6 @@
 #include <libxml/tree.h>
 #endif
 
-#include "config.h"
-
 void gnt_util_get_text_bound(const char *text, int *width, int *height)
 {
 	const char *s = text, *last;
============================================================
--- finch/libgnt/wms/s.c	667904c592fd5b19ccc4ead46fd91004f4ac671d
+++ finch/libgnt/wms/s.c	23596424cdd5d32c0300df1782778f704a92d320
@@ -1,8 +1,8 @@
+#include "internal.h"
+
 #include <string.h>
 #include <sys/types.h>
 
-#include "internal.h"
-
 #include "gnt.h"
 #include "gntbox.h"
 #include "gntmenu.h"
============================================================
--- libpurple/protocols/gg/lib/common.c	4b48b94f4b8769acf4e34201e0c2694d281783fb
+++ libpurple/protocols/gg/lib/common.c	855c2847a27d4059ecaadb0ead0a982ac965ebc8
@@ -19,6 +19,8 @@
  *  USA.
  */
 
+#include "libgadu.h"
+
 #ifndef _WIN32
 #include <sys/types.h>
 #include <sys/ioctl.h>
@@ -41,8 +43,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "libgadu.h"
-
 FILE *gg_debug_file = NULL;
 
 #ifndef GG_DEBUG_DISABLE
============================================================
--- libpurple/protocols/gg/lib/dcc.c	0e1eb1d45b3fb600db038d787fa2baf798adc6fd
+++ libpurple/protocols/gg/lib/dcc.c	867fe790e6f9058a85e11133ccf815b2c159cf1f
@@ -19,6 +19,8 @@
  *  USA.
  */
 
+#include "libgadu.h"
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #ifndef _WIN32
@@ -41,8 +43,6 @@
 #include <unistd.h>
 
 #include "compat.h"
-#include "libgadu.h"
-
 #ifndef GG_DEBUG_DISABLE
 /*
  * gg_dcc_debug_data() // funkcja wewn?zna
============================================================
--- libpurple/protocols/gg/lib/events.c	c67c8bfde77d3245124d709267257c77443041e2
+++ libpurple/protocols/gg/lib/events.c	fb7019f802ba39ab09e97c57282607ffd02580de
@@ -20,6 +20,8 @@
  *  USA.
  */
 
+#include "libgadu.h"
+
 #include <sys/types.h>
 #ifndef _WIN32
 #include <sys/wait.h>
@@ -46,7 +48,6 @@
 #endif
 
 #include "compat.h"
-#include "libgadu.h"
 
 /*
  * gg_event_free()
============================================================
--- libpurple/protocols/gg/lib/http.c	e0a5d681bbb9efc9e83185fd0fcd0e8db0b6b52e
+++ libpurple/protocols/gg/lib/http.c	a7960315a3525e78bc4ad6a8f8b4b2b1e39ff9cb
@@ -18,6 +18,8 @@
  *  USA.
  */
 
+#include "libgadu.h"
+
 #include <sys/types.h>
 #ifndef _WIN32
 #include <sys/wait.h>
@@ -43,7 +45,6 @@
 #include <unistd.h>
 
 #include "compat.h"
-#include "libgadu.h"
 
 /*
  * gg_http_connect() // funkcja pomocnicza
============================================================
--- libpurple/protocols/gg/lib/libgadu.c	06b4658a78b391f3baa4114f1d9468a17b0e683c
+++ libpurple/protocols/gg/lib/libgadu.c	df490de7213ffd531c7033135c3e396d72315d1c
@@ -21,6 +21,8 @@
  *  USA.
  */
 
+#include "libgadu.h"
+
 #include <sys/types.h>
 #ifndef _WIN32
 #include <sys/wait.h>
@@ -57,7 +59,6 @@
 #endif
 
 #include "compat.h"
-#include "libgadu.h"
 
 int gg_debug_level = 0;
 void (*gg_debug_handler)(int level, const char *format, va_list ap) = NULL;
============================================================
--- libpurple/protocols/gg/lib/pubdir.c	91f95ad9487d951ac152d8f2876a67fa91bb47a3
+++ libpurple/protocols/gg/lib/pubdir.c	4dbeb06586d39247a8d3e81a992d65339d574a8d
@@ -19,6 +19,8 @@
  *  USA.
  */
 
+#include "libgadu.h"
+
 #include <ctype.h>
 #include <errno.h>
 #include <stdarg.h>
@@ -27,8 +29,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "libgadu.h"
-
 /*
  * gg_register3()
  *
============================================================
--- libpurple/protocols/gg/lib/pubdir50.c	8330d13a274cc8a458a66aac9cf347fb25fb0a99
+++ libpurple/protocols/gg/lib/pubdir50.c	88881a94e1fe2f108bc6959201f33a8661d55bee
@@ -18,13 +18,13 @@
  *  USA.
  */
 
+#include "libgadu.h"
+
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
-#include "libgadu.h"
-
 /*
  * gg_pubdir50_new()
  *
============================================================
--- libpurple/protocols/mxit/actions.c	6f6d60b3ed2ba96cc9dcc4c419ad01a20c35db4e
+++ libpurple/protocols/mxit/actions.c	6332889a2cf0a76ab7a806f7a779a66873a9d614
@@ -23,11 +23,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include	<stdio.h>
-#include	<stdlib.h>
-#include	<string.h>
-#include	<time.h>
-
+#include    "internal.h"
 #include	"purple.h"
 
 #include	"protocol.h"
============================================================
--- libpurple/protocols/mxit/chunk.c	64c5798193c2d2d0e03799c80e7a733d9d8eff22
+++ libpurple/protocols/mxit/chunk.c	263371e7f9761c36bd7257bdd29eb1c65163236e
@@ -23,10 +23,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include	<stdio.h>
-#include	<unistd.h>
-#include	<string.h>
-
+#include    "internal.h"
 #include	"purple.h"
 #include	"protocol.h"
 #include	"mxit.h"
============================================================
--- libpurple/protocols/mxit/cipher.c	4a696938e0f8d1b67d9a6ad2db6734764de5907b
+++ libpurple/protocols/mxit/cipher.c	8a25e2dc92f45444edd1d4e1696e5124ce97c878
@@ -23,10 +23,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include	<stdio.h>
-#include	<unistd.h>
-#include	<string.h>
-
+#include    "internal.h"
 #include	"purple.h"
 
 #include	"mxit.h"
============================================================
--- libpurple/protocols/mxit/filexfer.c	d957a1413b10ac9ac88e12ff4be23d54a3283256
+++ libpurple/protocols/mxit/filexfer.c	50e87d30c7fb89e91dc5cb5cd7df57457a9cf26b
@@ -23,10 +23,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include	<stdio.h>
-#include	<unistd.h>
-#include	<string.h>
-
+#include    "internal.h"
 #include	"purple.h"
 #include	"protocol.h"
 #include	"mxit.h"
============================================================
--- libpurple/protocols/mxit/formcmds.c	c5de50260923ea015663f162300d9fbc597028bd
+++ libpurple/protocols/mxit/formcmds.c	86cdc2d094cf5f40289cd7d1b6f03886e38f6f03
@@ -23,8 +23,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include <string.h>
-#include <glib.h>
+
+#include "internal.h"
 #include <glib/gprintf.h>
 
 #include "purple.h"
============================================================
--- libpurple/protocols/mxit/http.c	a5cdf0966cc63bb4026418388886e8d6177f7169
+++ libpurple/protocols/mxit/http.c	72cffec0b64f47965ba9a2e2817e0d39e8745507
@@ -23,11 +23,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include	<stdio.h>
-#include	<unistd.h>
-#include	<string.h>
-#include	<errno.h>
-
+#include    "internal.h"
 #include	"purple.h"
 
 #include	"mxit.h"
============================================================
--- libpurple/protocols/mxit/login.c	a7c99dd316470900f1411bb561dfc4a9d2cb15b8
+++ libpurple/protocols/mxit/login.c	86e2b5cc24641af1b7c1b23966cacf7ecd7fb244
@@ -23,9 +23,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include	<stdio.h>
-#include	<string.h>
-
+#include    "internal.h"
 #include	"purple.h"
 
 #include	"protocol.h"
============================================================
--- libpurple/protocols/mxit/markup.c	cdcd3e3f6f00f21a463eee8a67e11b17e01bd706
+++ libpurple/protocols/mxit/markup.c	4a1308c1a56f8300203a78cbb2af6ece367479b5
@@ -23,10 +23,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include	<stdio.h>
-#include	<unistd.h>
-#include	<string.h>
-
+#include    "internal.h"
 #include	"purple.h"
 
 #include	"protocol.h"
============================================================
--- libpurple/protocols/mxit/multimx.c	dc8d63a9236f142c5a5f9f284a9b02d75aaefa47
+++ libpurple/protocols/mxit/multimx.c	973c1273866ca16588734287e191d6f9d563497b
@@ -23,9 +23,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include <string.h>
-#include <errno.h>
-
+#include "internal.h"
 #include "purple.h"
 #include "prpl.h"
 
============================================================
--- libpurple/protocols/mxit/mxit.c	c416cfc4a0be9ea91d5b55e9bb12483082f2bdf6
+++ libpurple/protocols/mxit/mxit.c	b8a2aadcdb394ae3c1616ef07ddeba1e7aedbc64
@@ -23,10 +23,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include	<glib.h>
-#include	<stdio.h>
-#include	<string.h>
-
+#include    "internal.h"
 #include	"purple.h"
 #include	"notify.h"
 #include	"plugin.h"
============================================================
--- libpurple/protocols/mxit/profile.c	c8a3f15edb8643f2b24c653264561599347d587d
+++ libpurple/protocols/mxit/profile.c	bff65d9cb9f81b6f352b785a047810311a5960b0
@@ -23,9 +23,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include	<ctype.h>
-#include	<string.h>
-
+#include    "internal.h"
 #include	"purple.h"
 
 #include	"mxit.h"
============================================================
--- libpurple/protocols/mxit/protocol.c	db1083453d8cf0da0b4884e8ff8a7713da386e4e
+++ libpurple/protocols/mxit/protocol.c	3c52bd53fae254ff177fa58e9d3edd6d63e2ab72
@@ -23,11 +23,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include	<stdio.h>
-#include	<unistd.h>
-#include	<string.h>
-#include	<errno.h>
-
+#include    "internal.h"
 #include	"purple.h"
 
 #include	"protocol.h"
============================================================
--- libpurple/protocols/mxit/roster.c	944fcba604bbc56d6850ad765c12f19dfd59f79b
+++ libpurple/protocols/mxit/roster.c	ec97361cac5d5caa5406dfe0693f938bfc260619
@@ -23,10 +23,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include	<stdio.h>
-#include	<unistd.h>
-#include	<string.h>
-
+#include    "internal.h"
 #include	"purple.h"
 
 #include	"protocol.h"
============================================================
--- libpurple/protocols/mxit/splashscreen.c	e00c1ab491455573789096af7ad3ea82342ff70a
+++ libpurple/protocols/mxit/splashscreen.c	d93c89a17b4e662336d36e901e659a17e7df8c58
@@ -23,6 +23,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
+#include "internal.h"
 #include <glib/gstdio.h>
 
 #include "purple.h"
============================================================
--- libpurple/protocols/oscar/clientlogin.c	1d8bca9378294cb3346ce5483ed4902c2260bb42
+++ libpurple/protocols/oscar/clientlogin.c	14d26f541e61784257be952a66b141fbfef7ab8a
@@ -36,12 +36,12 @@
  * http://dev.aol.com/authentication_for_clients
  */
 
-#include "cipher.h"
-#include "core.h"
-
 #include "oscar.h"
 #include "oscarcommon.h"
 
+#include "cipher.h"
+#include "core.h"
+
 #define URL_CLIENT_LOGIN "https://api.screenname.aol.com/auth/clientLogin"
 #define URL_START_OSCAR_SESSION "http://api.oscar.aol.com/aim/startOSCARSession"
 
============================================================
--- libpurple/protocols/oscar/family_auth.c	ee2722953d178b5e54ab4e7271043459a5cb6f60
+++ libpurple/protocols/oscar/family_auth.c	3d95778ca33eb660976647f71ea79ee9f5ae918b
@@ -26,12 +26,12 @@
  *
  */
 
+#include "oscar.h"
+
 #include <ctype.h>
 
 #include "cipher.h"
 
-#include "oscar.h"
-
 /* #define USE_XOR_FOR_ICQ */
 
 #ifdef USE_XOR_FOR_ICQ
============================================================
--- libpurple/protocols/oscar/oscarcommon.h	f3a16312b92c3f6acb9e422fc326df1bbadf2c32
+++ libpurple/protocols/oscar/oscarcommon.h	3eb0b79f906422f8431ebf3d28b8161de4611ac8
@@ -24,8 +24,9 @@
  * and libicq.c
  */
 
-#include "accountopt.h"
 #include "internal.h"
+
+#include "accountopt.h"
 #include "prpl.h"
 #include "version.h"
 #include "notify.h"
============================================================
--- libpurple/protocols/yahoo/ycht.c	5517b316b0b6bedb886d3d28f64b419eca17ff2c
+++ libpurple/protocols/yahoo/ycht.c	7164ce55fa88ac59c33a5f4229163014cfafe412
@@ -25,8 +25,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include <string.h>
-
 #include "internal.h"
 #include "prpl.h"
 #include "notify.h"


More information about the Commits mailing list