diff options
40 files changed, 59 insertions, 89 deletions
diff --git a/finch/finch.c b/finch/finch.c index 49a88ecef6..d6c9017763 100644 --- a/finch/finch.c +++ b/finch/finch.c @@ -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 "finch.h" #include <internal.h> +#include "finch.h" #include "account.h" #include "conversation.h" diff --git a/finch/gntaccount.c b/finch/gntaccount.c index ff72c310a8..4f230850c0 100644 --- a/finch/gntaccount.c +++ b/finch/gntaccount.c @@ -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> diff --git a/finch/gntblist.c b/finch/gntblist.c index d02b26b13c..53b331c0df 100644 --- a/finch/gntblist.c +++ b/finch/gntblist.c @@ -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 "finch.h" #include <internal.h> +#include "finch.h" #include <account.h> #include <blist.h> diff --git a/finch/gntcertmgr.c b/finch/gntcertmgr.c index e123823815..6c7b6b6488 100644 --- a/finch/gntcertmgr.c +++ b/finch/gntcertmgr.c @@ -25,8 +25,8 @@ * */ -#include "finch.h" #include <internal.h> +#include "finch.h" #include "certificate.h" #include "debug.h" diff --git a/finch/gntconn.c b/finch/gntconn.c index d66b9a284b..28e0b9f30c 100644 --- a/finch/gntconn.c +++ b/finch/gntconn.c @@ -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 "finch.h" #include <internal.h> +#include "finch.h" #include "account.h" #include "core.h" diff --git a/finch/gntconv.c b/finch/gntconv.c index 254bcc3fe2..3fa9c6baa0 100644 --- a/finch/gntconv.c +++ b/finch/gntconv.c @@ -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> diff --git a/finch/gntdebug.c b/finch/gntdebug.c index 44bb5d42c2..a9c38306ad 100644 --- a/finch/gntdebug.c +++ b/finch/gntdebug.c @@ -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" diff --git a/finch/gntft.c b/finch/gntft.c index 222bddc267..b54714520f 100644 --- a/finch/gntft.c +++ b/finch/gntft.c @@ -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 "finch.h" #include <internal.h> +#include "finch.h" #include <gnt.h> #include <gntbox.h> diff --git a/finch/gntlog.c b/finch/gntlog.c index f938655097..d8d98a3d5b 100644 --- a/finch/gntlog.c +++ b/finch/gntlog.c @@ -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 "finch.h" #include <internal.h> +#include "finch.h" #include <gnt.h> #include <gntbox.h> diff --git a/finch/gntmedia.c b/finch/gntmedia.c index adc51372ec..c300511780 100644 --- a/finch/gntmedia.c +++ b/finch/gntmedia.c @@ -24,8 +24,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#include "finch.h" #include <internal.h> +#include "finch.h" #include "gntconv.h" #include "gntmedia.h" diff --git a/finch/gntnotify.c b/finch/gntnotify.c index f5e0151cd5..63887114c1 100644 --- a/finch/gntnotify.c +++ b/finch/gntnotify.c @@ -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> diff --git a/finch/gntplugin.c b/finch/gntplugin.c index 94b153e704..332584ba27 100644 --- a/finch/gntplugin.c +++ b/finch/gntplugin.c @@ -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" diff --git a/finch/gntpounce.c b/finch/gntpounce.c index 449d525323..53a8eaf17d 100644 --- a/finch/gntpounce.c +++ b/finch/gntpounce.c @@ -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" diff --git a/finch/libgnt/gntutils.c b/finch/libgnt/gntutils.c index 171e2c04fb..fcfab85b6a 100644 --- a/finch/libgnt/gntutils.c +++ b/finch/libgnt/gntutils.c @@ -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; diff --git a/finch/libgnt/wms/s.c b/finch/libgnt/wms/s.c index 3813fc4346..b995d1aa67 100644 --- a/finch/libgnt/wms/s.c +++ b/finch/libgnt/wms/s.c @@ -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" diff --git a/libpurple/protocols/gg/lib/common.c b/libpurple/protocols/gg/lib/common.c index fef32e21e4..9d2b49494f 100644 --- a/libpurple/protocols/gg/lib/common.c +++ b/libpurple/protocols/gg/lib/common.c @@ -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 diff --git a/libpurple/protocols/gg/lib/dcc.c b/libpurple/protocols/gg/lib/dcc.c index f84d24d4ad..418bdbcaad 100644 --- a/libpurple/protocols/gg/lib/dcc.c +++ b/libpurple/protocols/gg/lib/dcc.c @@ -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ętrzna diff --git a/libpurple/protocols/gg/lib/events.c b/libpurple/protocols/gg/lib/events.c index 9b754c4819..2a347c11cf 100644 --- a/libpurple/protocols/gg/lib/events.c +++ b/libpurple/protocols/gg/lib/events.c @@ -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() diff --git a/libpurple/protocols/gg/lib/http.c b/libpurple/protocols/gg/lib/http.c index 25dd17f3eb..39fa3ff25b 100644 --- a/libpurple/protocols/gg/lib/http.c +++ b/libpurple/protocols/gg/lib/http.c @@ -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 diff --git a/libpurple/protocols/gg/lib/libgadu.c b/libpurple/protocols/gg/lib/libgadu.c index b9634e2511..fe85738205 100644 --- a/libpurple/protocols/gg/lib/libgadu.c +++ b/libpurple/protocols/gg/lib/libgadu.c @@ -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; diff --git a/libpurple/protocols/gg/lib/pubdir.c b/libpurple/protocols/gg/lib/pubdir.c index 976642d2d8..fe11d251fc 100644 --- a/libpurple/protocols/gg/lib/pubdir.c +++ b/libpurple/protocols/gg/lib/pubdir.c @@ -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() * diff --git a/libpurple/protocols/gg/lib/pubdir50.c b/libpurple/protocols/gg/lib/pubdir50.c index 9a7ba6762c..3e73133388 100644 --- a/libpurple/protocols/gg/lib/pubdir50.c +++ b/libpurple/protocols/gg/lib/pubdir50.c @@ -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() * diff --git a/libpurple/protocols/mxit/actions.c b/libpurple/protocols/mxit/actions.c index 85dbef0521..a67dcd8a24 100644 --- a/libpurple/protocols/mxit/actions.c +++ b/libpurple/protocols/mxit/actions.c @@ -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" diff --git a/libpurple/protocols/mxit/chunk.c b/libpurple/protocols/mxit/chunk.c index e480d5be72..9b9652666f 100644 --- a/libpurple/protocols/mxit/chunk.c +++ b/libpurple/protocols/mxit/chunk.c @@ -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" diff --git a/libpurple/protocols/mxit/cipher.c b/libpurple/protocols/mxit/cipher.c index 46d4b6a337..efe0cf3277 100644 --- a/libpurple/protocols/mxit/cipher.c +++ b/libpurple/protocols/mxit/cipher.c @@ -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" diff --git a/libpurple/protocols/mxit/filexfer.c b/libpurple/protocols/mxit/filexfer.c index a9254ff7fd..bc053fa752 100644 --- a/libpurple/protocols/mxit/filexfer.c +++ b/libpurple/protocols/mxit/filexfer.c @@ -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" diff --git a/libpurple/protocols/mxit/formcmds.c b/libpurple/protocols/mxit/formcmds.c index 3dcaef23d0..7948f4bd5b 100644 --- a/libpurple/protocols/mxit/formcmds.c +++ b/libpurple/protocols/mxit/formcmds.c @@ -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" diff --git a/libpurple/protocols/mxit/http.c b/libpurple/protocols/mxit/http.c index ee9682149c..2ec53cb7d5 100644 --- a/libpurple/protocols/mxit/http.c +++ b/libpurple/protocols/mxit/http.c @@ -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" diff --git a/libpurple/protocols/mxit/login.c b/libpurple/protocols/mxit/login.c index 6d071e972a..9df02bb28b 100644 --- a/libpurple/protocols/mxit/login.c +++ b/libpurple/protocols/mxit/login.c @@ -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" diff --git a/libpurple/protocols/mxit/markup.c b/libpurple/protocols/mxit/markup.c index 6037082796..5fd8eacd2e 100644 --- a/libpurple/protocols/mxit/markup.c +++ b/libpurple/protocols/mxit/markup.c @@ -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" diff --git a/libpurple/protocols/mxit/multimx.c b/libpurple/protocols/mxit/multimx.c index 0499dad574..851f8b7512 100644 --- a/libpurple/protocols/mxit/multimx.c +++ b/libpurple/protocols/mxit/multimx.c @@ -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" diff --git a/libpurple/protocols/mxit/mxit.c b/libpurple/protocols/mxit/mxit.c index dfd83ba492..45b442752c 100644 --- a/libpurple/protocols/mxit/mxit.c +++ b/libpurple/protocols/mxit/mxit.c @@ -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" diff --git a/libpurple/protocols/mxit/profile.c b/libpurple/protocols/mxit/profile.c index 321a394a4f..6c19173a6c 100644 --- a/libpurple/protocols/mxit/profile.c +++ b/libpurple/protocols/mxit/profile.c @@ -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" diff --git a/libpurple/protocols/mxit/protocol.c b/libpurple/protocols/mxit/protocol.c index 5a938deeec..850d29e05b 100644 --- a/libpurple/protocols/mxit/protocol.c +++ b/libpurple/protocols/mxit/protocol.c @@ -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" diff --git a/libpurple/protocols/mxit/roster.c b/libpurple/protocols/mxit/roster.c index 1e208c6277..cf0b6d5965 100644 --- a/libpurple/protocols/mxit/roster.c +++ b/libpurple/protocols/mxit/roster.c @@ -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" diff --git a/libpurple/protocols/mxit/splashscreen.c b/libpurple/protocols/mxit/splashscreen.c index 16bb1554ec..a78dd3e7d6 100644 --- a/libpurple/protocols/mxit/splashscreen.c +++ b/libpurple/protocols/mxit/splashscreen.c @@ -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" diff --git a/libpurple/protocols/oscar/clientlogin.c b/libpurple/protocols/oscar/clientlogin.c index d64af6211f..3ae41bc212 100644 --- a/libpurple/protocols/oscar/clientlogin.c +++ b/libpurple/protocols/oscar/clientlogin.c @@ -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" diff --git a/libpurple/protocols/oscar/family_auth.c b/libpurple/protocols/oscar/family_auth.c index 88e8630688..db7a1a0920 100644 --- a/libpurple/protocols/oscar/family_auth.c +++ b/libpurple/protocols/oscar/family_auth.c @@ -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 diff --git a/libpurple/protocols/oscar/oscarcommon.h b/libpurple/protocols/oscar/oscarcommon.h index dd4220cc0e..a4467e7ef3 100644 --- a/libpurple/protocols/oscar/oscarcommon.h +++ b/libpurple/protocols/oscar/oscarcommon.h @@ -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" diff --git a/libpurple/protocols/yahoo/ycht.c b/libpurple/protocols/yahoo/ycht.c index 0668e6dab9..5a05e1869d 100644 --- a/libpurple/protocols/yahoo/ycht.c +++ b/libpurple/protocols/yahoo/ycht.c @@ -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" |