# HG changeset patch
# User Herman Bloggs <hermanator12002@yahoo.com>
# Date 1055876029 0
# Node ID b3c412884a2278b1aa6ad0de8f3c5d96969ecb37
# Parent  865f235ffaf0da26159159ff94f073f276b09e16
[gaim-migrate @ 6344]
win32 adjustments for header re-org

committer: Tailor Script <tailor@pidgin.im>

diff -r 865f235ffaf0 -r b3c412884a22 plugins/iconaway.c
--- a/plugins/iconaway.c	Tue Jun 17 07:37:35 2003 +0000
+++ b/plugins/iconaway.c	Tue Jun 17 18:53:49 2003 +0000
@@ -7,10 +7,9 @@
 
 #define ICONAWAY_PLUGIN_ID "gtk-iconaway"
 
-G_MODULE_IMPORT GtkWidget *imaway;
-/*G_MODULE_IMPORT GtkWidget *blist;*/
-/* XXX G_MODULE_IMPORT GtkWidget *all_chats; */
-/*G_MODULE_IMPORT GtkWidget *all_convos;*/
+#ifdef _WIN32
+__declspec(dllimport) GtkWidget *imaway;
+#endif
 
 #ifdef USE_APPLET
 extern void applet_destroy_buddy();
diff -r 865f235ffaf0 -r b3c412884a22 plugins/perl/perl.c
--- a/plugins/perl/perl.c	Tue Jun 17 07:37:35 2003 +0000
+++ b/plugins/perl/perl.c	Tue Jun 17 18:53:49 2003 +0000
@@ -77,6 +77,9 @@
 # undef pipe
 #endif
 
+#ifdef _WIN32
+#define _WIN32DEP_H_
+#endif
 #include "internal.h"
 
 #include "debug.h"
diff -r 865f235ffaf0 -r b3c412884a22 plugins/win32/transparency/win2ktrans.c
--- a/plugins/win32/transparency/win2ktrans.c	Tue Jun 17 07:37:35 2003 +0000
+++ b/plugins/win32/transparency/win2ktrans.c	Tue Jun 17 18:53:49 2003 +0000
@@ -21,12 +21,15 @@
  *
  */
 #include <gdk/gdkwin32.h>
-#include <gmodule.h>
-#include "gaim.h"
+#include "internal.h"
+
+#include "prefs.h"
+#include "debug.h"
+
+#include "gtkconv.h"
 #include "gtkplugin.h"
 #include "gtkblist.h"
-#include "prefs.h"
-#include "win32dep.h"
+#include "gtkutils.h"
 
 /*
  *  MACROS & DEFINES
diff -r 865f235ffaf0 -r b3c412884a22 plugins/win32/winprefs/winprefs.c
--- a/plugins/win32/winprefs/winprefs.c	Tue Jun 17 07:37:35 2003 +0000
+++ b/plugins/win32/winprefs/winprefs.c	Tue Jun 17 18:53:49 2003 +0000
@@ -21,10 +21,14 @@
 #include <windows.h>
 #include <winreg.h>
 #include <winerror.h>
-#include "gaim.h"
+
+#include "internal.h"
+
+#include "prefs.h"
+#include "debug.h"
+
 #include "gtkplugin.h"
-#include "prefs.h"
-#include "win32dep.h"
+#include "gtkutils.h"
 
 /*
  *  MACROS & DEFINES
diff -r 865f235ffaf0 -r b3c412884a22 src/internal.h
--- a/src/internal.h	Tue Jun 17 07:37:35 2003 +0000
+++ b/src/internal.h	Tue Jun 17 18:53:49 2003 +0000
@@ -54,7 +54,9 @@
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/types.h>
+#ifndef _WIN32
 #include <sys/wait.h>
+#endif
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -79,14 +81,7 @@
 # endif
 #endif
 
-#ifdef _WIN32
-# include <gdk/gdkwin32.h>
-# include <winsock.h>
-# include "win32dep.h"
-# include <direct.h>
-# include <winsock.h>
-# include <io.h>
-#else
+#ifndef _WIN32
 # include <arpa/inet.h>
 # include <netinet/in.h>
 # include <sys/socket.h>
@@ -111,6 +106,11 @@
 #include <gtk/gtk.h>
 #include <glib.h>
 
+#ifdef _WIN32
+#include "win32dep.h"
+#endif
+
+
 #define WEBSITE "http://gaim.sourceforge.net/"
 
 #endif /* _GAIM_INTERNAL_H_ */
diff -r 865f235ffaf0 -r b3c412884a22 src/protocols/msn/ft.c
--- a/src/protocols/msn/ft.c	Tue Jun 17 07:37:35 2003 +0000
+++ b/src/protocols/msn/ft.c	Tue Jun 17 18:53:49 2003 +0000
@@ -24,10 +24,9 @@
 
 #ifdef _WIN32
 #include "win32dep.h"
+__declspec(dllimport) GList *connections;
 #endif
 
-G_MODULE_IMPORT GSList *connections;
-
 static struct gaim_xfer *
 find_xfer_by_cookie(GaimConnection *gc, unsigned long cookie)
 {
diff -r 865f235ffaf0 -r b3c412884a22 src/server.c
--- a/src/server.c	Tue Jun 17 07:37:35 2003 +0000
+++ b/src/server.c	Tue Jun 17 18:53:49 2003 +0000
@@ -118,7 +118,7 @@
 		prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl);
 
 		if (prpl_info->close)
-			prpl_info->close(gc);
+			(prpl_info->close)(gc);
 	}
 
 	prpl = gc->prpl;