/pidgin/main: 0f4b2e3ac978: win32: fix all warnings about improp...

[Tomasz Wasilczyk]

Changeset: 0f4b2e3ac978520474f577beb27bbe26efa7fb05
Author:	 Tomasz Wasilczyk <tomkiewicz at cpw.pidgin.im>
Date:	 2013-04-17 23:57 +0200
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/0f4b2e3ac978

Description:

win32: fix all warnings about improper winsock2.h include point

diffstat:

 pidgin/gtkconv-theme.c                   |  3 ++-
 pidgin/plugins/win32/winprefs/winprefs.c |  3 ---
 pidgin/win32/gtkwin32dep.c               |  6 +++---
 pidgin/win32/wspell.c                    |  1 -
 4 files changed, 5 insertions(+), 8 deletions(-)

diffs (67 lines):

diff --git a/pidgin/gtkconv-theme.c b/pidgin/gtkconv-theme.c
--- a/pidgin/gtkconv-theme.c
+++ b/pidgin/gtkconv-theme.c
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
+#include "internal.h"
+
 #include "gtkconv-theme.h"
 
 #include "conversation.h"
@@ -28,7 +30,6 @@
 #include "xmlnode.h"
 
 #include "pidgin.h"
-#include "internal.h"
 #include "gtkconv.h"
 #include "gtkwebview.h"
 
diff --git a/pidgin/plugins/win32/winprefs/winprefs.c b/pidgin/plugins/win32/winprefs/winprefs.c
--- a/pidgin/plugins/win32/winprefs/winprefs.c
+++ b/pidgin/plugins/win32/winprefs/winprefs.c
@@ -20,9 +20,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  */
-#include <gtk/gtk.h>
-#include <gdk/gdkwin32.h>
-
 #include "internal.h"
 
 #include "gtkwin32dep.h"
diff --git a/pidgin/win32/gtkwin32dep.c b/pidgin/win32/gtkwin32dep.c
--- a/pidgin/win32/gtkwin32dep.c
+++ b/pidgin/win32/gtkwin32dep.c
@@ -25,7 +25,9 @@
 #ifndef WINVER
 #define WINVER 0x0500 /* W2K */
 #endif
-#include <windows.h>
+
+#include "internal.h"
+
 #include <io.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -36,8 +38,6 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkwin32.h>
 
-#include "internal.h"
-
 #include "debug.h"
 #include "notify.h"
 #include "network.h"
diff --git a/pidgin/win32/wspell.c b/pidgin/win32/wspell.c
--- a/pidgin/win32/wspell.c
+++ b/pidgin/win32/wspell.c
@@ -27,7 +27,6 @@
 #include <config.h>
 #endif
 #ifdef USE_GTKSPELL
-#include <windows.h>
 #include <string.h>
 #include <stdlib.h>
 #include <glib.h>