Mercurial > pidgin.yaz

changeset 15378:bd4e20083dc7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '42e8f970b2c3c10865314b8c4fadf67460d83470' and 'e1be623f6382c7e6b2c6ccc8bb939108d0d5e0e5'
author Nathan Walp <nwalp@pidgin.im>
date Sun, 21 Jan 2007 22:58:02 +0000
parents fbc67534d122 (current diff) 0e17470b47c2 (diff)
children b2a8c5eca30a 959b753fc926
files libpurple/win32/libgaimrc.rc.in pidgin/win32/gaimrc.rc.in pidgin/win32/gtkgaimrc.rc.in pidgin/win32/win_gaim.c
diffstat 48 files changed, 752 insertions(+), 753 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.mingw	Sun Jan 21 22:56:28 2007 +0000
+++ b/Makefile.mingw	Sun Jan 21 22:58:02 2007 +0000
@@ -6,7 +6,7 @@
 #
 
 GAIM_TOP := .
-include $(GAIM_TOP)/libgaim/win32/global.mak
+include $(GAIM_TOP)/libpurple/win32/global.mak
 
 # Generate a X.X.X.X version for the installer file versioning header
 # The last digit will be 99 for a final release, 0 for dev or unknown, or the beta number
--- a/libpurple/Makefile.mingw	Sun Jan 21 22:56:28 2007 +0000
+++ b/libpurple/Makefile.mingw	Sun Jan 21 22:58:02 2007 +0000
@@ -5,9 +5,9 @@
 #
 
 GAIM_TOP := ..
-include $(GAIM_TOP)/libgaim/win32/global.mak
+include $(GAIM_TOP)/libpurple/win32/global.mak
 
-TARGET = libgaim
+TARGET = libpurple
 NEEDED_DLLS = $(LIBXML2_TOP)/bin/libxml2.dll
 
 ##
@@ -77,7 +77,7 @@
 			win32/libc_interface.c \
 			win32/win32dep.c
 
-RC_SRC = win32/libgaimrc.rc
+RC_SRC = win32/libpurplerc.rc
 
 OBJECTS = $(C_SRC:%.c=%.o) $(RC_SRC:%.rc=%.o)
 
@@ -112,7 +112,7 @@
 	$(MAKE) -C $(GAIM_PROTOS_TOP) -f $(GAIM_WIN32_MAKEFILE) install
 	$(MAKE) -C $(GAIM_LIB_PLUGINS_TOP) -f $(GAIM_WIN32_MAKEFILE) install
 
-./win32/libgaimrc.rc: ./win32/libgaimrc.rc.in $(GAIM_TOP)/VERSION
+./win32/libpurplerc.rc: ./win32/libpurplerc.rc.in $(GAIM_TOP)/VERSION
 	sed -e 's/@GAIM_VERSION@/$(GAIM_VERSION)/g' \
 	    $@.in > $@
 
--- a/libpurple/plugins/Makefile.mingw	Sun Jan 21 22:56:28 2007 +0000
+++ b/libpurple/plugins/Makefile.mingw	Sun Jan 21 22:58:02 2007 +0000
@@ -5,7 +5,7 @@
 #
 
 GAIM_TOP := ../..
-include $(GAIM_TOP)/libgaim/win32/global.mak
+include $(GAIM_TOP)/libpurple/win32/global.mak
 
 PERL_PLUGIN := ./perl
 TCL_PLUGIN := ./tcl
@@ -37,7 +37,7 @@
 			-lgmodule-2.0 \
 			-lintl \
 			-lws2_32 \
-			-lgaim
+			-lpurple
 
 ##
 ## TARGET DEFINITIONS
--- a/libpurple/plugins/perl/Makefile.mingw	Sun Jan 21 22:56:28 2007 +0000
+++ b/libpurple/plugins/perl/Makefile.mingw	Sun Jan 21 22:58:02 2007 +0000
@@ -5,7 +5,7 @@
 #
 
 GAIM_TOP := ../../..
-include $(GAIM_TOP)/libgaim/win32/global.mak
+include $(GAIM_TOP)/libpurple/win32/global.mak
 
 TARGET = perl
 
@@ -46,7 +46,7 @@
 			-lgobject-2.0 \
 			-lws2_32 \
 			-lintl \
-			-lgaim \
+			-lpurple \
 			-lperl58
 
 include $(GAIM_COMMON_RULES)
--- a/libpurple/plugins/perl/common/Makefile.mingw	Sun Jan 21 22:56:28 2007 +0000
+++ b/libpurple/plugins/perl/common/Makefile.mingw	Sun Jan 21 22:58:02 2007 +0000
@@ -5,7 +5,7 @@
 #
 
 GAIM_TOP := ../../../..
-include $(GAIM_TOP)/libgaim/win32/global.mak
+include $(GAIM_TOP)/libpurple/win32/global.mak
 
 TARGET = Gaim
 AUTOSPLIT = lib/auto/Gaim/autosplit.ix
@@ -77,7 +77,7 @@
 ##
 LIBS =			-lperl58 \
 			-lperl \
-			-lgaim \
+			-lpurple \
 			-lglib-2.0
 
 include $(GAIM_COMMON_RULES)
--- a/libpurple/plugins/perl/common/module.h	Sun Jan 21 22:56:28 2007 +0000
+++ b/libpurple/plugins/perl/common/module.h	Sun Jan 21 22:58:02 2007 +0000
@@ -56,7 +56,7 @@
 #include "status.h"
 #include "stringref.h"
 /* Ewww. perl has it's own util.h which is in the include path :( */
-#include "libgaim/util.h"
+#include "libpurple/util.h"
 #include "value.h"
 #include "xmlnode.h"
 
--- a/libpurple/plugins/ssl/Makefile.mingw	Sun Jan 21 22:56:28 2007 +0000
+++ b/libpurple/plugins/ssl/Makefile.mingw	Sun Jan 21 22:58:02 2007 +0000
@@ -5,7 +5,7 @@
 #
 
 GAIM_TOP := ../../..
-include $(GAIM_TOP)/libgaim/win32/global.mak
+include $(GAIM_TOP)/libpurple/win32/global.mak
 
 ##
 ## VARIABLE DEFINITIONS
@@ -56,7 +56,7 @@
 			-lglib-2.0 \
 			-lws2_32 \
 			-lintl \
-			-lgaim \
+			-lpurple \
 			-lnss3 \
 			-lnspr4 \
 			-lssl3
--- a/libpurple/plugins/tcl/Makefile.mingw	Sun Jan 21 22:56:28 2007 +0000
+++ b/libpurple/plugins/tcl/Makefile.mingw	Sun Jan 21 22:58:02 2007 +0000
@@ -5,7 +5,7 @@
 #
 
 GAIM_TOP := ../../..
-include $(GAIM_TOP)/libgaim/win32/global.mak
+include $(GAIM_TOP)/libpurple/win32/global.mak
 
 TARGET = tcl
 TCL_INC_DIR := $(TCL_LIB_TOP)/include
@@ -46,7 +46,7 @@
 			-lglib-2.0 \
 			-lws2_32 \
 			-lintl \
-			-lgaim \
+			-lpurple \
 			-ltclstub84 \
 			-ltkstub84
 
--- a/libpurple/protocols/Makefile.mingw	Sun Jan 21 22:56:28 2007 +0000
+++ b/libpurple/protocols/Makefile.mingw	Sun Jan 21 22:58:02 2007 +0000
@@ -6,7 +6,7 @@
 #
 
 GAIM_TOP := ../..
-include $(GAIM_TOP)/libgaim/win32/global.mak
+include $(GAIM_TOP)/libpurple/win32/global.mak
 
 SUBDIRS = gg irc jabber msn novell oscar qq sametime silc simple yahoo
 
--- a/libpurple/protocols/bonjour/Makefile.mingw	Sun Jan 21 22:56:28 2007 +0000
+++ b/libpurple/protocols/bonjour/Makefile.mingw	Sun Jan 21 22:58:02 2007 +0000
@@ -5,7 +5,7 @@
 #
 
 GAIM_TOP := ../../..
-include $(GAIM_TOP)/libgaim/win32/global.mak
+include $(GAIM_TOP)/libpurple/win32/global.mak
 
 TARGET = libbonjour
 NEEDED_DLLS = $(HOWL_TOP)/bin/libhowl-1.dll
@@ -55,7 +55,7 @@
 			-lws2_32 \
 			-lintl \
 			-lhowl \
-			-lgaim
+			-lpurple
 
 include $(GAIM_COMMON_RULES)
 
--- a/libpurple/protocols/gg/Makefile.mingw	Sun Jan 21 22:56:28 2007 +0000
+++ b/libpurple/protocols/gg/Makefile.mingw	Sun Jan 21 22:58:02 2007 +0000
@@ -5,7 +5,7 @@
 #
 
 GAIM_TOP := ../../..
-include $(GAIM_TOP)/libgaim/win32/global.mak
+include $(GAIM_TOP)/libpurple/win32/global.mak
 
 TARGET = libgg
 CFLAGS += -include win32dep.h
@@ -61,7 +61,7 @@
 LIBS =	\
 			-lglib-2.0 \
 			-lintl \
-			-lgaim \
+			-lpurple \
 			-lws2_32
 
 include $(GAIM_COMMON_RULES)
--- a/libpurple/protocols/irc/Makefile.mingw	Sun Jan 21 22:56:28 2007 +0000
+++ b/libpurple/protocols/irc/Makefile.mingw	Sun Jan 21 22:58:02 2007 +0000
@@ -5,7 +5,7 @@
 #
 
 GAIM_TOP := ../../..
-include $(GAIM_TOP)/libgaim/win32/global.mak
+include $(GAIM_TOP)/libpurple/win32/global.mak
 
 TARGET = libirc
 TYPE = PLUGIN
@@ -52,7 +52,7 @@
 			-lglib-2.0 \
 			-lws2_32 \
 			-lintl \
-			-lgaim
+			-lpurple
 
 include $(GAIM_COMMON_RULES)
 
--- a/libpurple/protocols/jabber/Makefile.mingw	Sun Jan 21 22:56:28 2007 +0000
+++ b/libpurple/protocols/jabber/Makefile.mingw	Sun Jan 21 22:58:02 2007 +0000
@@ -5,7 +5,7 @@
 #
 
 GAIM_TOP := ../../..
-include $(GAIM_TOP)/libgaim/win32/global.mak
+include $(GAIM_TOP)/libpurple/win32/global.mak
 
 TARGET = libjabber
 TYPE = PLUGIN
@@ -67,7 +67,7 @@
 			-lxml2 \
 			-lws2_32 \
 			-lintl \
-			-lgaim
+			-lpurple
 
 include $(GAIM_COMMON_RULES)
 
--- a/libpurple/protocols/msn/Makefile.mingw	Sun Jan 21 22:56:28 2007 +0000
+++ b/libpurple/protocols/msn/Makefile.mingw	Sun Jan 21 22:58:02 2007 +0000
@@ -5,7 +5,7 @@
 #
 
 GAIM_TOP := ../../..
-include $(GAIM_TOP)/libgaim/win32/global.mak
+include $(GAIM_TOP)/libpurple/win32/global.mak
 
 TARGET = libmsn
 TYPE = PLUGIN
@@ -76,7 +76,7 @@
 			-lglib-2.0 \
 			-lintl \
 			-lws2_32 \
-			-lgaim
+			-lpurple
 
 include $(GAIM_COMMON_RULES)
 
--- a/libpurple/protocols/novell/Makefile.mingw	Sun Jan 21 22:56:28 2007 +0000
+++ b/libpurple/protocols/novell/Makefile.mingw	Sun Jan 21 22:58:02 2007 +0000
@@ -5,7 +5,7 @@
 #
 
 GAIM_TOP := ../../..
-include $(GAIM_TOP)/libgaim/win32/global.mak
+include $(GAIM_TOP)/libpurple/win32/global.mak
 
 TARGET = libnovell
 TYPE = PLUGIN
@@ -59,7 +59,7 @@
 			-lglib-2.0 \
 			-lws2_32 \
 			-lintl \
-			-lgaim
+			-lpurple
 
 include $(GAIM_COMMON_RULES)
 
--- a/libpurple/protocols/oscar/Makefile.mingw	Sun Jan 21 22:56:28 2007 +0000
+++ b/libpurple/protocols/oscar/Makefile.mingw	Sun Jan 21 22:58:02 2007 +0000
@@ -5,7 +5,7 @@
 #
 
 GAIM_TOP := ../../..
-include $(GAIM_TOP)/libgaim/win32/global.mak
+include $(GAIM_TOP)/libpurple/win32/global.mak
 
 TARGET = liboscar
 AIM_TARGET = libaim
@@ -91,7 +91,7 @@
 			-lglib-2.0 \
 			-lintl \
 			-lws2_32 \
-			-lgaim
+			-lpurple
 
 include $(GAIM_COMMON_RULES)
 
--- a/libpurple/protocols/qq/Makefile.mingw	Sun Jan 21 22:56:28 2007 +0000
+++ b/libpurple/protocols/qq/Makefile.mingw	Sun Jan 21 22:58:02 2007 +0000
@@ -5,7 +5,7 @@
 #
 
 GAIM_TOP := ../../..
-include $(GAIM_TOP)/libgaim/win32/global.mak
+include $(GAIM_TOP)/libpurple/win32/global.mak
 
 TARGET = libqq
 TYPE = PLUGIN
@@ -82,7 +82,7 @@
 	-lglib-2.0 \
 	-lws2_32 \
 	-lintl \
-	-lgaim
+	-lpurple
 
 include $(GAIM_COMMON_RULES)
 
--- a/libpurple/protocols/sametime/Makefile.mingw	Sun Jan 21 22:56:28 2007 +0000
+++ b/libpurple/protocols/sametime/Makefile.mingw	Sun Jan 21 22:58:02 2007 +0000
@@ -5,7 +5,7 @@
 #
 
 GAIM_TOP := ../../..
-include $(GAIM_TOP)/libgaim/win32/global.mak
+include $(GAIM_TOP)/libpurple/win32/global.mak
 
 TARGET = libsametime
 NEEDED_DLLS = $(MEANWHILE_TOP)/bin/libmeanwhile-1.dll
@@ -52,7 +52,7 @@
 		-lintl \
 		-lws2_32 \
 		-lmeanwhile \
-		-lgaim \
+		-lpurple
 
 include $(GAIM_COMMON_RULES)
 
--- a/libpurple/protocols/silc/Makefile.mingw	Sun Jan 21 22:56:28 2007 +0000
+++ b/libpurple/protocols/silc/Makefile.mingw	Sun Jan 21 22:58:02 2007 +0000
@@ -5,7 +5,7 @@
 #
 
 GAIM_TOP := ../../..
-include $(GAIM_TOP)/libgaim/win32/global.mak
+include $(GAIM_TOP)/libpurple/win32/global.mak
 
 TARGET = libsilc
 NEEDED_DLLS =		$(SILC_TOOLKIT)/lib/silc.dll \
@@ -59,7 +59,7 @@
 			-lglib-2.0 \
 			-lws2_32 \
 			-lintl \
-			-lgaim \
+			-lpurple \
 			-lsilc \
 			-lsilcclient
 
--- a/libpurple/protocols/simple/Makefile.mingw	Sun Jan 21 22:56:28 2007 +0000
+++ b/libpurple/protocols/simple/Makefile.mingw	Sun Jan 21 22:58:02 2007 +0000
@@ -5,7 +5,7 @@
 #
 
 GAIM_TOP := ../../..
-include $(GAIM_TOP)/libgaim/win32/global.mak
+include $(GAIM_TOP)/libpurple/win32/global.mak
 
 TARGET = libsimple
 TYPE = PLUGIN
@@ -49,7 +49,7 @@
 			-lglib-2.0 \
 			-lws2_32 \
 			-lintl \
-			-lgaim
+			-lpurple
 
 include $(GAIM_COMMON_RULES)
 
--- a/libpurple/protocols/toc/Makefile.mingw	Sun Jan 21 22:56:28 2007 +0000
+++ b/libpurple/protocols/toc/Makefile.mingw	Sun Jan 21 22:58:02 2007 +0000
@@ -5,7 +5,7 @@
 #
 
 GAIM_TOP := ../../..
-include $(GAIM_TOP)/libgaim/win32/global.mak
+include $(GAIM_TOP)/libpurple/win32/global.mak
 
 TARGET = libtoc
 TYPE = PLUGIN
@@ -48,7 +48,7 @@
 			-lglib-2.0 \
 			-lws2_32 \
 			-lintl \
-			-lgaim
+			-lpurple
 
 include $(GAIM_COMMON_RULES)
 
--- a/libpurple/protocols/yahoo/Makefile.mingw	Sun Jan 21 22:56:28 2007 +0000
+++ b/libpurple/protocols/yahoo/Makefile.mingw	Sun Jan 21 22:58:02 2007 +0000
@@ -5,7 +5,7 @@
 #
 
 GAIM_TOP := ../../..
-include $(GAIM_TOP)/libgaim/win32/global.mak
+include $(GAIM_TOP)/libpurple/win32/global.mak
 
 TARGET = libyahoo
 TYPE = PLUGIN
@@ -59,7 +59,7 @@
 			-lglib-2.0 \
 			-lws2_32 \
 			-lintl \
-			-lgaim
+			-lpurple
 
 include $(GAIM_COMMON_RULES)
 
--- a/libpurple/protocols/zephyr/Makefile.mingw	Sun Jan 21 22:56:28 2007 +0000
+++ b/libpurple/protocols/zephyr/Makefile.mingw	Sun Jan 21 22:58:02 2007 +0000
@@ -5,7 +5,7 @@
 #
 
 GAIM_TOP := ../../..
-include $(GAIM_TOP)/libgaim/win32/global.mak
+include $(GAIM_TOP)/libpurple/win32/global.mak
 
 TARGET = libzephyr
 KRB4_TOP := $(WIN32_DEV_TOP)/kfw-2.6.3-final.fixed
@@ -116,7 +116,7 @@
 			-lglib-2.0 \
 			-lws2_32 \
 			-lintl \
-			-lgaim
+			-lpurple
 
 ifeq ($(USE_KRB4),true)
   LIBS+= -lkrbv4w32
--- a/libpurple/win32/global.mak	Sun Jan 21 22:56:28 2007 +0000
+++ b/libpurple/win32/global.mak	Sun Jan 21 22:58:02 2007 +0000
@@ -27,10 +27,10 @@
 GAIM_INSTALL_PO_DIR := $(GAIM_INSTALL_DIR)/locale
 
 # Important (enough) locations in our source code
-GAIM_LIB_TOP := $(GAIM_TOP)/libgaim
+GAIM_LIB_TOP := $(GAIM_TOP)/libpurple
 GAIM_LIB_PLUGINS_TOP := $(GAIM_LIB_TOP)/plugins
 GAIM_LIB_PERL_TOP := $(GAIM_LIB_PLUGINS_TOP)/perl
-GAIM_GTK_TOP := $(GAIM_TOP)/gtk
+GAIM_GTK_TOP := $(GAIM_TOP)/pidgin
 GAIM_GTK_IDLETRACK_TOP := $(GAIM_GTK_TOP)/win32/IdleTracker
 GAIM_GTK_PIXMAPS_TOP := $(GAIM_GTK_TOP)/pixmaps
 GAIM_GTK_PLUGINS_TOP := $(GAIM_GTK_TOP)/plugins
@@ -41,9 +41,9 @@
 # Locations of important (in-tree) build targets
 GAIM_CONFIG_H := $(GAIM_TOP)/config.h
 GAIM_IDLETRACK_DLL := $(GAIM_GTK_IDLETRACK_TOP)/idletrack.dll
-GAIM_LIBGAIM_DLL := $(GAIM_LIB_TOP)/libgaim.dll
+GAIM_LIBGAIM_DLL := $(GAIM_LIB_TOP)/libpurple.dll
 GAIM_LIBGAIM_PERL_DLL := $(GAIM_LIB_PERL_TOP)/perl.dll
-GAIM_GTKGAIM_DLL := $(GAIM_GTK_TOP)/gtkgaim.dll
+GAIM_GTKGAIM_DLL := $(GAIM_GTK_TOP)/pidgin.dll
 GAIM_EXE := $(GAIM_GTK_TOP)/gaim.exe
 GAIM_PORTABLE_EXE := $(GAIM_GTK_TOP)/gaim-portable.exe
 
--- a/libpurple/win32/libgaimrc.rc.in	Sun Jan 21 22:56:28 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-#include <winver.h>
-#include "version.h"
-
-VS_VERSION_INFO VERSIONINFO
-  FILEVERSION GAIM_MAJOR_VERSION,GAIM_MINOR_VERSION,GAIM_MICRO_VERSION,0
-  PRODUCTVERSION GAIM_MAJOR_VERSION,GAIM_MINOR_VERSION,GAIM_MICRO_VERSION,0
-  FILEFLAGSMASK 0
-  FILEFLAGS 0
-  FILEOS VOS__WINDOWS32
-  FILETYPE VFT_DLL
-  FILESUBTYPE VFT2_UNKNOWN
-  BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-      BLOCK "040904B0"
-      BEGIN
-        VALUE "CompanyName", "The Gaim developer community"
-        VALUE "FileDescription", "Libgaim Library"
-        VALUE "FileVersion", "@GAIM_VERSION@"
-        VALUE "InternalName", "libgaim"
-        VALUE "LegalCopyright", "Copyright (C) 1998-2006 The Gaim developer community (See the COPYRIGHT file in the source distribution)."
-        VALUE "OriginalFilename", "libgaim.dll"
-        VALUE "ProductName", "Gaim"
-        VALUE "ProductVersion", "@GAIM_VERSION@"
-      END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-      VALUE "Translation", 0x409, 1200
-    END
-  END
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libpurple/win32/libpurplerc.rc.in	Sun Jan 21 22:58:02 2007 +0000
@@ -0,0 +1,32 @@
+#include <winver.h>
+#include "version.h"
+
+VS_VERSION_INFO VERSIONINFO
+  FILEVERSION GAIM_MAJOR_VERSION,GAIM_MINOR_VERSION,GAIM_MICRO_VERSION,0
+  PRODUCTVERSION GAIM_MAJOR_VERSION,GAIM_MINOR_VERSION,GAIM_MICRO_VERSION,0
+  FILEFLAGSMASK 0
+  FILEFLAGS 0
+  FILEOS VOS__WINDOWS32
+  FILETYPE VFT_DLL
+  FILESUBTYPE VFT2_UNKNOWN
+  BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+      BLOCK "040904B0"
+      BEGIN
+        VALUE "CompanyName", "The Gaim developer community"
+        VALUE "FileDescription", "Libgaim Library"
+        VALUE "FileVersion", "@GAIM_VERSION@"
+        VALUE "InternalName", "libgaim"
+        VALUE "LegalCopyright", "Copyright (C) 1998-2006 The Gaim developer community (See the COPYRIGHT file in the source distribution)."
+        VALUE "OriginalFilename", "libgaim.dll"
+        VALUE "ProductName", "Gaim"
+        VALUE "ProductVersion", "@GAIM_VERSION@"
+      END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+      VALUE "Translation", 0x409, 1200
+    END
+  END
+
--- a/libpurple/win32/targets.mak	Sun Jan 21 22:56:28 2007 +0000
+++ b/libpurple/win32/targets.mak	Sun Jan 21 22:58:02 2007 +0000
@@ -9,22 +9,22 @@
 	cp $(GAIM_TOP)/config.h.mingw $(GAIM_CONFIG_H)
 
 $(GAIM_LIBGAIM_DLL) $(GAIM_LIBGAIM_DLL).a:
-	$(MAKE) -C $(GAIM_LIB_TOP) -f $(GAIM_WIN32_MAKEFILE) libgaim.dll
+	$(MAKE) -C $(GAIM_LIB_TOP) -f $(GAIM_WIN32_MAKEFILE) libpurple.dll
 
 $(GAIM_LIBGAIM_PERL_DLL) $(GAIM_LIBGAIM_PERL_DLL).a:
 	$(MAKE) -C $(GAIM_LIB_PERL_TOP) -f $(GAIM_WIN32_MAKEFILE) perl.dll
 
 $(GAIM_GTKGAIM_DLL) $(GAIM_GTKGAIM_DLL).a:
-	$(MAKE) -C $(GAIM_GTK_TOP) -f $(GAIM_WIN32_MAKEFILE) gtkgaim.dll
+	$(MAKE) -C $(GAIM_GTK_TOP) -f $(GAIM_WIN32_MAKEFILE) pidgin.dll
 
 $(GAIM_IDLETRACK_DLL) $(GAIM_IDLETRACK_DLL).a:
 	$(MAKE) -C $(GAIM_GTK_IDLETRACK_TOP) -f $(GAIM_WIN32_MAKEFILE) idletrack.dll
 
 $(GAIM_EXE):
-	$(MAKE) -C $(GAIM_GTK_TOP) -f $(GAIM_WIN32_MAKEFILE) gaim.exe
+	$(MAKE) -C $(GAIM_GTK_TOP) -f $(GAIM_WIN32_MAKEFILE) pidgin.exe
 
 $(GAIM_PORTABLE_EXE):
-	$(MAKE) -C $(GAIM_GTK_TOP) -f $(GAIM_WIN32_MAKEFILE) gaim-portable.exe
+	$(MAKE) -C $(GAIM_GTK_TOP) -f $(GAIM_WIN32_MAKEFILE) pidgin-portable.exe
 
 # Installation Directories
 $(GAIM_INSTALL_DIR):
--- a/pidgin/Makefile.mingw	Sun Jan 21 22:56:28 2007 +0000
+++ b/pidgin/Makefile.mingw	Sun Jan 21 22:58:02 2007 +0000
@@ -5,15 +5,15 @@
 #
 
 GAIM_TOP := ..
-include $(GAIM_TOP)/libgaim/win32/global.mak
+include $(GAIM_TOP)/libpurple/win32/global.mak
 
 NEEDED_DLLS = $(GTKSPELL_TOP)/gtkspell/libgtkspell.dll
 
 ##
 ## VARIABLE DEFINITIONS
 ##
-EXE_TARGET := gaim
-GTKGAIM_TARGET := gtkgaim
+EXE_TARGET := pidgin
+GTKGAIM_TARGET := pidgin
 EXE_NAME := $(EXE_TARGET).exe
 
 WINAPP := -mwindows
@@ -95,18 +95,18 @@
 			win32/untar.c \
 			win32/wspell.c
 
-GTKGAIM_RC_SRC = win32/gtkgaimrc.rc
+GTKGAIM_RC_SRC = win32/pidgin_dll_rc.rc
 GTKGAIM_OBJECTS = $(GTKGAIM_C_SRC:%.c=%.o) $(GTKGAIM_RC_SRC:%.rc=%.o)
 
-EXE_RC_SRC = win32/gaimrc.rc
-EXE_C_SRC = win32/win_gaim.c
+EXE_RC_SRC = win32/pidgin_exe_rc.rc
+EXE_C_SRC = win32/winpidgin.c
 EXE_OBJECTS = $(EXE_C_SRC:%.c=%.o) $(EXE_RC_SRC:%.rc=%.o)
 
 ##
 ## LIBRARIES
 ##
 LIBGAIM_LIBS =	\
-		-lgaim \
+		-lpurple \
 		-lglib-2.0 \
 		-lgthread-2.0 \
 		-lgobject-2.0 \
@@ -135,7 +135,7 @@
 all: $(EXE_TARGET).exe $(GTKGAIM_TARGET).dll
 	$(MAKE) -C $(GAIM_GTK_PLUGINS_TOP) -f $(GAIM_WIN32_MAKEFILE)
 
-./win32/gaimrc.rc: ./win32/gaimrc.rc.in $(GAIM_TOP)/VERSION
+./win32/pidgin_exe_rc.rc: ./win32/pidgin_exe_rc.rc.in $(GAIM_TOP)/VERSION
 	sed -e 's/@GAIM_VERSION@/$(GAIM_VERSION)/g' \
 	    -e 's/@ORIGINAL_FILENAME@/$(EXE_NAME)/' \
 	    $@.in > $@
@@ -150,7 +150,7 @@
 	$(MAKE) -C $(GAIM_GTK_SOUNDS_TOP) -f $(GAIM_WIN32_MAKEFILE) install
 	$(MAKE) -C $(GAIM_GTK_IDLETRACK_TOP) -f $(GAIM_WIN32_MAKEFILE) install
 
-./win32/gtkgaimrc.rc: ./win32/gtkgaimrc.rc.in $(GAIM_TOP)/VERSION
+./win32/pidgin_dll_rc.rc: ./win32/pidgin_dll_rc.rc.in $(GAIM_TOP)/VERSION
 	sed -e 's/@GAIM_VERSION@/$(GAIM_VERSION)/g' \
 	    $@.in > $@
 
--- a/pidgin/pixmaps/Makefile.mingw	Sun Jan 21 22:56:28 2007 +0000
+++ b/pidgin/pixmaps/Makefile.mingw	Sun Jan 21 22:58:02 2007 +0000
@@ -5,7 +5,7 @@
 #
 
 GAIM_TOP := ../..
-include $(GAIM_TOP)/libgaim/win32/global.mak
+include $(GAIM_TOP)/libpurple/win32/global.mak
 
 datadir := $(GAIM_INSTALL_DIR)
 include ./Makefile.am
--- a/pidgin/pixmaps/buddy_icons/qq/Makefile.mingw	Sun Jan 21 22:56:28 2007 +0000
+++ b/pidgin/pixmaps/buddy_icons/qq/Makefile.mingw	Sun Jan 21 22:58:02 2007 +0000
@@ -6,13 +6,13 @@
 #
 
 GAIM_TOP = ../../../..
-include $(GAIM_TOP)/libgaim/win32/global.mak
+include $(GAIM_TOP)/libpurple/win32/global.mak
 
 datadir = $(GAIM_INSTALL_DIR)
 include ./Makefile.am
 
 install:
 	if test '$(qqbuddyiconspix_DATA)'; then \
-          mkdir -p $(qqbuddyiconspixdir); \
-          cp $(qqbuddyiconspix_DATA) $(qqbuddyiconspixdir); \
-        fi;
+	  mkdir -p $(qqbuddyiconspixdir); \
+	  cp $(qqbuddyiconspix_DATA) $(qqbuddyiconspixdir); \
+	fi;
--- a/pidgin/pixmaps/smileys/default/Makefile.mingw	Sun Jan 21 22:56:28 2007 +0000
+++ b/pidgin/pixmaps/smileys/default/Makefile.mingw	Sun Jan 21 22:58:02 2007 +0000
@@ -5,7 +5,7 @@
 #
 
 GAIM_TOP := ../../../..
-include $(GAIM_TOP)/libgaim/win32/global.mak
+include $(GAIM_TOP)/libpurple/win32/global.mak
 
 datadir = $(GAIM_INSTALL_DIR)
 include ./Makefile.am
--- a/pidgin/pixmaps/smileys/none/Makefile.mingw	Sun Jan 21 22:56:28 2007 +0000
+++ b/pidgin/pixmaps/smileys/none/Makefile.mingw	Sun Jan 21 22:58:02 2007 +0000
@@ -5,7 +5,7 @@
 #
 
 GAIM_TOP := ../../../..
-include $(GAIM_TOP)/libgaim/win32/global.mak
+include $(GAIM_TOP)/libpurple/win32/global.mak
 
 datadir = $(GAIM_INSTALL_DIR)
 include ./Makefile.am
--- a/pidgin/pixmaps/status/default/Makefile.mingw	Sun Jan 21 22:56:28 2007 +0000
+++ b/pidgin/pixmaps/status/default/Makefile.mingw	Sun Jan 21 22:58:02 2007 +0000
@@ -5,7 +5,7 @@
 #
 
 GAIM_TOP = ../../../..
-include $(GAIM_TOP)/libgaim/win32/global.mak
+include $(GAIM_TOP)/libpurple/win32/global.mak
 
 datadir = $(GAIM_INSTALL_DIR)
 include ./Makefile.am
--- a/pidgin/plugins/Makefile.mingw	Sun Jan 21 22:56:28 2007 +0000
+++ b/pidgin/plugins/Makefile.mingw	Sun Jan 21 22:58:02 2007 +0000
@@ -5,7 +5,7 @@
 #
 
 GAIM_TOP := ../..
-include $(GAIM_TOP)/libgaim/win32/global.mak
+include $(GAIM_TOP)/libpurple/win32/global.mak
 
 GTKPERL_PLUGIN := ./perl
 TICKER_PLUGIN := ./ticker
@@ -48,8 +48,8 @@
 			-lpango-1.0 \
 			-lintl \
 			-lws2_32 \
-			-lgaim \
-			-lgtkgaim
+			-lpurple \
+			-lpidgin
 
 ##
 ## TARGET DEFINITIONS
--- a/pidgin/plugins/perl/Makefile.mingw	Sun Jan 21 22:56:28 2007 +0000
+++ b/pidgin/plugins/perl/Makefile.mingw	Sun Jan 21 22:58:02 2007 +0000
@@ -5,7 +5,7 @@
 #
 
 GAIM_TOP := ../../..
-include $(GAIM_TOP)/libgaim/win32/global.mak
+include $(GAIM_TOP)/libpurple/win32/global.mak
 
 ##
 ## TARGET DEFINITIONS
--- a/pidgin/plugins/perl/common/Makefile.mingw	Sun Jan 21 22:56:28 2007 +0000
+++ b/pidgin/plugins/perl/common/Makefile.mingw	Sun Jan 21 22:58:02 2007 +0000
@@ -5,7 +5,7 @@
 #
 
 GAIM_TOP := ../../../..
-include $(GAIM_TOP)/libgaim/win32/global.mak
+include $(GAIM_TOP)/libpurple/win32/global.mak
 
 TARGET = GtkUI
 EXTUTILS := C:/perl/lib/ExtUtils
@@ -73,8 +73,8 @@
 ##
 LIBS =			-lperl58 \
 			-lperl \
-			-lgaim \
-			-lgtkgaim \
+			-lpurple \
+			-lpidgin \
 			-lglib-2.0
 
 include $(GAIM_COMMON_RULES)
--- a/pidgin/plugins/ticker/Makefile.mingw	Sun Jan 21 22:56:28 2007 +0000
+++ b/pidgin/plugins/ticker/Makefile.mingw	Sun Jan 21 22:58:02 2007 +0000
@@ -5,7 +5,7 @@
 #
 
 GAIM_TOP := ../../..
-include $(GAIM_TOP)/libgaim/win32/global.mak
+include $(GAIM_TOP)/libpurple/win32/global.mak
 
 TARGET = ticker
 
@@ -44,11 +44,10 @@
 LIBS =			-lgtk-win32-2.0 \
 			-lglib-2.0 \
 			-lgdk-win32-2.0 \
-			-lgmodule-2.0 \
 			-lgobject-2.0 \
 			-lintl \
-			-lgaim \
-			-lgtkgaim
+			-lpurple \
+			-lpidgin
 
 include $(GAIM_COMMON_RULES)
 
--- a/pidgin/plugins/win32/transparency/Makefile.mingw	Sun Jan 21 22:56:28 2007 +0000
+++ b/pidgin/plugins/win32/transparency/Makefile.mingw	Sun Jan 21 22:58:02 2007 +0000
@@ -5,7 +5,7 @@
 #
 
 GAIM_TOP := ../../../..
-include $(GAIM_TOP)/libgaim/win32/global.mak
+include $(GAIM_TOP)/libpurple/win32/global.mak
 
 TARGET = win2ktrans
 DEFINES += -D_WIN32_WINNT=0x0500
@@ -47,8 +47,8 @@
 			-lgmodule-2.0 \
 			-lgobject-2.0 \
 			-lintl \
-			-lgtkgaim \
-			-lgaim
+			-lpidgin \
+			-lpurple
 
 include $(GAIM_COMMON_RULES)
 
--- a/pidgin/plugins/win32/winprefs/Makefile.mingw	Sun Jan 21 22:56:28 2007 +0000
+++ b/pidgin/plugins/win32/winprefs/Makefile.mingw	Sun Jan 21 22:58:02 2007 +0000
@@ -5,7 +5,7 @@
 #
 
 GAIM_TOP := ../../../..
-include $(GAIM_TOP)/libgaim/win32/global.mak
+include $(GAIM_TOP)/libpurple/win32/global.mak
 
 TARGET = winprefs
 DEFINES += -DWINVER=0x500
@@ -49,8 +49,8 @@
 			-lgobject-2.0 \
 			-lws2_32 \
 			-lintl \
-			-lgaim \
-			-lgtkgaim
+			-lpurple \
+			-lpidgin
 
 include $(GAIM_COMMON_RULES)
 
--- a/pidgin/sounds/Makefile.mingw	Sun Jan 21 22:56:28 2007 +0000
+++ b/pidgin/sounds/Makefile.mingw	Sun Jan 21 22:58:02 2007 +0000
@@ -5,7 +5,7 @@
 #
 
 GAIM_TOP := ../..
-include $(GAIM_TOP)/libgaim/win32/global.mak
+include $(GAIM_TOP)/libpurple/win32/global.mak
 
 datadir := $(GAIM_INSTALL_DIR)
 include ./Makefile.am
--- a/pidgin/win32/IdleTracker/Makefile.mingw	Sun Jan 21 22:56:28 2007 +0000
+++ b/pidgin/win32/IdleTracker/Makefile.mingw	Sun Jan 21 22:58:02 2007 +0000
@@ -5,7 +5,7 @@
 #
 
 GAIM_TOP := ../../..
-include $(GAIM_TOP)/libgaim/win32/global.mak
+include $(GAIM_TOP)/libpurple/win32/global.mak
 
 TARGET = idletrack
 
--- a/pidgin/win32/gaimrc.rc.in	Sun Jan 21 22:56:28 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-#include <winver.h>
-#include "resource.h"
-#include "version.h"
-
-#define PIXMAPDIR "pixmaps/"
-
-VS_VERSION_INFO VERSIONINFO
-  FILEVERSION GAIM_MAJOR_VERSION,GAIM_MINOR_VERSION,GAIM_MICRO_VERSION,0
-  PRODUCTVERSION GAIM_MAJOR_VERSION,GAIM_MINOR_VERSION,GAIM_MICRO_VERSION,0
-  FILEFLAGSMASK 0
-  FILEFLAGS 0
-  FILEOS VOS__WINDOWS32
-  FILETYPE VFT_APP
-  FILESUBTYPE VFT2_UNKNOWN
-  BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-      BLOCK "040904B0"
-      BEGIN
-        VALUE "CompanyName", "The Gaim developer community"
-        VALUE "FileDescription", "Gaim"
-        VALUE "FileVersion", "@GAIM_VERSION@"
-        VALUE "InternalName", "gaim"
-        VALUE "LegalCopyright", "Copyright (C) 1998-2006 The Gaim developer community (See the COPYRIGHT file in the source distribution)."
-        VALUE "OriginalFilename", "@ORIGINAL_FILENAME@"
-        VALUE "ProductName", "Gaim"
-        VALUE "ProductVersion", "@GAIM_VERSION@"
-      END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-      VALUE "Translation", 0x409, 1200
-    END
-  END
-
-GAIM_ICON			ICON PIXMAPDIR "gaim.ico"
-GAIM_TRAY_ICON			ICON PIXMAPDIR "gaim_16.ico"
-GAIM_OFFLINE_TRAY_ICON		ICON PIXMAPDIR "gaim_offline_16.ico"
-GAIM_AWAY_TRAY_ICON		ICON PIXMAPDIR "gaim_away_16.ico"
-GAIM_PEND_TRAY_ICON		ICON PIXMAPDIR "gaim_msgunread_16.ico"
-GAIM_AWAYPEND_TRAY_ICON 	ICON PIXMAPDIR "gaim_msgpend_16.ico"
-GAIM_BLANK_TRAY_ICON		ICON PIXMAPDIR "gaim_blank_4bit_16.ico"
-GAIM_TRAY_ICON_4BIT		ICON PIXMAPDIR "gaim_4bit_16.ico"
-GAIM_OFFLINE_TRAY_ICON_4BIT	ICON PIXMAPDIR "gaim_offline_4bit_16.ico"
-GAIM_AWAY_TRAY_ICON_4BIT	ICON PIXMAPDIR "gaim_away_4bit_16.ico"
-GAIM_PEND_TRAY_ICON_4BIT	ICON PIXMAPDIR "gaim_msgunread_4bit_16.ico"
-GAIM_AWAYPEND_TRAY_ICON_4BIT	ICON PIXMAPDIR "gaim_msgpend_4bit_16.ico"
--- a/pidgin/win32/gtkgaimrc.rc.in	Sun Jan 21 22:56:28 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-#include <winver.h>
-#include "version.h"
-
-VS_VERSION_INFO VERSIONINFO
-  FILEVERSION GAIM_MAJOR_VERSION,GAIM_MINOR_VERSION,GAIM_MICRO_VERSION,0
-  PRODUCTVERSION GAIM_MAJOR_VERSION,GAIM_MINOR_VERSION,GAIM_MICRO_VERSION,0
-  FILEFLAGSMASK 0
-  FILEFLAGS 0
-  FILEOS VOS__WINDOWS32
-  FILETYPE VFT_DLL
-  FILESUBTYPE VFT2_UNKNOWN
-  BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-      BLOCK "040904B0"
-      BEGIN
-        VALUE "CompanyName", "The Gaim developer community"
-        VALUE "FileDescription", "GTK+ Gaim Library"
-        VALUE "FileVersion", "@GAIM_VERSION@"
-        VALUE "InternalName", "gtkgaim"
-        VALUE "LegalCopyright", "Copyright (C) 1998-2006 The Gaim developer community (See the COPYRIGHT file in the source distribution)."
-        VALUE "OriginalFilename", "gtkgaim.dll"
-        VALUE "ProductName", "Gaim"
-        VALUE "ProductVersion", "@GAIM_VERSION@"
-      END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-      VALUE "Translation", 0x409, 1200
-    END
-  END
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin/win32/pidgin_dll_rc.rc.in	Sun Jan 21 22:58:02 2007 +0000
@@ -0,0 +1,32 @@
+#include <winver.h>
+#include "version.h"
+
+VS_VERSION_INFO VERSIONINFO
+  FILEVERSION GAIM_MAJOR_VERSION,GAIM_MINOR_VERSION,GAIM_MICRO_VERSION,0
+  PRODUCTVERSION GAIM_MAJOR_VERSION,GAIM_MINOR_VERSION,GAIM_MICRO_VERSION,0
+  FILEFLAGSMASK 0
+  FILEFLAGS 0
+  FILEOS VOS__WINDOWS32
+  FILETYPE VFT_DLL
+  FILESUBTYPE VFT2_UNKNOWN
+  BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+      BLOCK "040904B0"
+      BEGIN
+        VALUE "CompanyName", "The Gaim developer community"
+        VALUE "FileDescription", "GTK+ Gaim Library"
+        VALUE "FileVersion", "@GAIM_VERSION@"
+        VALUE "InternalName", "gtkgaim"
+        VALUE "LegalCopyright", "Copyright (C) 1998-2006 The Gaim developer community (See the COPYRIGHT file in the source distribution)."
+        VALUE "OriginalFilename", "gtkgaim.dll"
+        VALUE "ProductName", "Gaim"
+        VALUE "ProductVersion", "@GAIM_VERSION@"
+      END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+      VALUE "Translation", 0x409, 1200
+    END
+  END
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin/win32/pidgin_exe_rc.rc.in	Sun Jan 21 22:58:02 2007 +0000
@@ -0,0 +1,47 @@
+#include <winver.h>
+#include "resource.h"
+#include "version.h"
+
+#define PIXMAPDIR "pixmaps/"
+
+VS_VERSION_INFO VERSIONINFO
+  FILEVERSION GAIM_MAJOR_VERSION,GAIM_MINOR_VERSION,GAIM_MICRO_VERSION,0
+  PRODUCTVERSION GAIM_MAJOR_VERSION,GAIM_MINOR_VERSION,GAIM_MICRO_VERSION,0
+  FILEFLAGSMASK 0
+  FILEFLAGS 0
+  FILEOS VOS__WINDOWS32
+  FILETYPE VFT_APP
+  FILESUBTYPE VFT2_UNKNOWN
+  BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+      BLOCK "040904B0"
+      BEGIN
+        VALUE "CompanyName", "The Gaim developer community"
+        VALUE "FileDescription", "Gaim"
+        VALUE "FileVersion", "@GAIM_VERSION@"
+        VALUE "InternalName", "gaim"
+        VALUE "LegalCopyright", "Copyright (C) 1998-2006 The Gaim developer community (See the COPYRIGHT file in the source distribution)."
+        VALUE "OriginalFilename", "@ORIGINAL_FILENAME@"
+        VALUE "ProductName", "Gaim"
+        VALUE "ProductVersion", "@GAIM_VERSION@"
+      END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+      VALUE "Translation", 0x409, 1200
+    END
+  END
+
+GAIM_ICON			ICON PIXMAPDIR "gaim.ico"
+GAIM_TRAY_ICON			ICON PIXMAPDIR "gaim_16.ico"
+GAIM_OFFLINE_TRAY_ICON		ICON PIXMAPDIR "gaim_offline_16.ico"
+GAIM_AWAY_TRAY_ICON		ICON PIXMAPDIR "gaim_away_16.ico"
+GAIM_PEND_TRAY_ICON		ICON PIXMAPDIR "gaim_msgunread_16.ico"
+GAIM_AWAYPEND_TRAY_ICON 	ICON PIXMAPDIR "gaim_msgpend_16.ico"
+GAIM_BLANK_TRAY_ICON		ICON PIXMAPDIR "gaim_blank_4bit_16.ico"
+GAIM_TRAY_ICON_4BIT		ICON PIXMAPDIR "gaim_4bit_16.ico"
+GAIM_OFFLINE_TRAY_ICON_4BIT	ICON PIXMAPDIR "gaim_offline_4bit_16.ico"
+GAIM_AWAY_TRAY_ICON_4BIT	ICON PIXMAPDIR "gaim_away_4bit_16.ico"
+GAIM_PEND_TRAY_ICON_4BIT	ICON PIXMAPDIR "gaim_msgunread_4bit_16.ico"
+GAIM_AWAYPEND_TRAY_ICON_4BIT	ICON PIXMAPDIR "gaim_msgpend_4bit_16.ico"
--- a/pidgin/win32/win_gaim.c	Sun Jan 21 22:56:28 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,552 +0,0 @@
-/*
- *  win_gaim.c
- *
- *  Date: June, 2002
- *  Description: Entry point for win32 gaim, and various win32 dependant
- *  routines.
- *
- * Gaim is the legal property of its developers, whose names are too numerous
- * to list here.  Please refer to the COPYRIGHT file distributed with this
- * source distribution.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- */
-
-/* This is for ATTACH_PARENT_PROCESS */
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x501
-#endif
-#include <windows.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-
-/* These will hopefully be in the win32api next time it is updated - at which point, we'll remove them */
-#ifndef LANG_PERSIAN
-#define LANG_PERSIAN 0x29
-#endif
-#ifndef LANG_BOSNIAN
-#define SUBLANG_BOSNIAN_BOSNIA_HERZEGOVINA_LATIN	0x05
-#define SUBLANG_BOSNIAN_BOSNIA_HERZEGOVINA_CYRILLIC	0x08
-#endif
-#ifndef SUBLANG_CROATIAN_BOSNIA_HERZEGOVINA_LATIN
-#define SUBLANG_CROATIAN_BOSNIA_HERZEGOVINA_LATIN	0x04
-#endif
-#ifndef LANG_XHOSA
-#define LANG_XHOSA 0x34
-#endif
-
-
-typedef int (CALLBACK* LPFNGAIMMAIN)(HINSTANCE, int, char**);
-typedef void (CALLBACK* LPFNSETDLLDIRECTORY)(LPCTSTR);
-typedef BOOL (CALLBACK* LPFNATTACHCONSOLE)(DWORD);
-
-/*
- *  PROTOTYPES
- */
-static LPFNGAIMMAIN gaim_main = NULL;
-static LPFNSETDLLDIRECTORY MySetDllDirectory = NULL;
-
-static const char *get_win32_error_message(DWORD err) {
-	static char err_msg[512];
-
-	FormatMessage(
-		FORMAT_MESSAGE_FROM_SYSTEM,
-		NULL, err,
-		MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-		(LPTSTR) &err_msg, sizeof(err_msg), NULL);
-
-	return err_msg;
-}
-
-static BOOL read_reg_string(HKEY key, char* sub_key, char* val_name, LPBYTE data, LPDWORD data_len) {
-	HKEY hkey;
-	BOOL ret = FALSE;
-	LONG retv;
-
-	if (ERROR_SUCCESS == (retv = RegOpenKeyEx(key, sub_key, 0,
-					KEY_QUERY_VALUE, &hkey))) {
-		if (ERROR_SUCCESS == (retv = RegQueryValueEx(hkey, val_name,
-						NULL, NULL, data, data_len)))
-			ret = TRUE;
-		else {
-			const char *err_msg = get_win32_error_message(retv);
-
-			printf("Could not read reg key '%s' subkey '%s' value: '%s'.\nMessage: (%ld) %s\n",
-					((key == HKEY_LOCAL_MACHINE) ? "HKLM" :
-					 (key == HKEY_CURRENT_USER) ? "HKCU" :
-					 "???"),
-					sub_key, val_name, retv, err_msg);
-		}
-		RegCloseKey(hkey);
-	}
-	else {
-		TCHAR szBuf[80];
-
-		FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, retv, 0,
-				(LPTSTR) &szBuf, sizeof(szBuf), NULL);
-		printf("Could not open reg subkey: %s\nError: (%ld) %s\n",
-				sub_key, retv, szBuf);
-	}
-
-	return ret;
-}
-
-static void dll_prep() {
-	char path[MAX_PATH + 1];
-	HMODULE hmod;
-	HKEY hkey;
-#ifdef PORTABLE
-	/* We assume that GTK+ is installed under \\path\to\Gaim\..\GTK
-	 * First we find \\path\to
-	 */
-	if (GetModuleFileName(NULL, path, MAX_PATH) != 0) {
-		char *tmp = path;
-		char *prev = NULL;
-		char *prev2 = NULL;
-
-		while ((tmp = strchr(tmp, '\\'))) {
-			prev2 = prev;
-			prev = tmp;
-			tmp++;
-		}
-
-		if (prev2) {
-			prev2[0] = '\0';
-		}
-	} else {
-		printf("Unable to determine current executable path. \n"
-			"This will prevent the settings dir from being set.\n"
-			"Assuming GTK+ is in the PATH.\n");
-	}
-
-	if (path) {
-		/* Set up the settings dir base to be \\path\to
-		 * The actual settings dir will be \\path\to\.gaim */
-		char settingsdir[strlen(path) + strlen("GAIMHOME=") + 1];
-		char aspelldir[strlen(path) + strlen("GAIM_ASPELL_DIR=\\Aspell\\bin") + 1];
-
-		snprintf(settingsdir, sizeof(settingsdir), "GAIMHOME=%s", path);
-		printf("Setting settings dir: %s\n", settingsdir);
-		putenv(settingsdir);
-
-		snprintf(aspelldir, sizeof(aspelldir), "GAIM_ASPELL_DIR=%s\\Aspell\\bin", path);
-		printf("%s", aspelldir);
-		putenv(aspelldir);
-
-		/* set the GTK+ path to be \\path\to\GTK\bin */
-		strcat(path, "\\GTK\\bin");
-	} else
-		return;
-#else /* PORTABLE */
-	char gtkpath[MAX_PATH + 1];
-	DWORD plen;
-
-	plen = sizeof(gtkpath);
-	hkey = HKEY_CURRENT_USER;
-	if (!read_reg_string(hkey, "SOFTWARE\\GTK\\2.0", "Path",
-			(LPBYTE) &gtkpath, &plen)) {
-		hkey = HKEY_LOCAL_MACHINE;
-		if (!read_reg_string(hkey, "SOFTWARE\\GTK\\2.0", "Path",
-				(LPBYTE) &gtkpath, &plen)) {
-			printf("GTK+ Path Registry Key not found. "
-				"Assuming GTK+ is in the PATH.\n");
-			return;
-		}
-	}
-
-	/* this value is replaced during a successful RegQueryValueEx() */
-	plen = sizeof(path);
-	/* Determine GTK+ dll path .. */
-	if (!read_reg_string(hkey, "SOFTWARE\\GTK\\2.0", "DllPath",
-				(LPBYTE) &path, &plen)) {
-		strcpy(path, gtkpath);
-		strcat(path, "\\bin");
-	}
-#endif
-	printf("GTK+ path found: %s\n", path);
-
-	if ((hmod = GetModuleHandle("kernel32.dll"))) {
-		MySetDllDirectory = (LPFNSETDLLDIRECTORY) GetProcAddress(
-			hmod, "SetDllDirectoryA");
-		if (!MySetDllDirectory)
-			printf("SetDllDirectory not supported\n");
-	} else
-		printf("Error getting kernel32.dll module handle\n");
-
-	/* For Windows XP SP1+ / Server 2003 we use SetDllDirectory to avoid dll hell */
-	if (MySetDllDirectory) {
-		printf("Using SetDllDirectory\n");
-		MySetDllDirectory(path);
-	}
-
-	/* For the rest, we set the current directory and make sure
-	 * SafeDllSearch is set to 0 where needed. */
-	else {
-		OSVERSIONINFO osinfo;
-
-		printf("Setting current directory to GTK+ dll directory\n");
-		SetCurrentDirectory(path);
-		/* For Windows 2000 (SP3+) / WinXP (No SP):
-		 * If SafeDllSearchMode is set to 1, Windows system directories are
-		 * searched for dlls before the current directory. Therefore we set it
-		 * to 0.
-		 */
-		osinfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-		GetVersionEx(&osinfo);
-		if ((osinfo.dwMajorVersion == 5 &&
-			osinfo.dwMinorVersion == 0 &&
-			strcmp(osinfo.szCSDVersion, "Service Pack 3") >= 0) ||
-			(osinfo.dwMajorVersion == 5 &&
-			osinfo.dwMinorVersion == 1 &&
-			strcmp(osinfo.szCSDVersion, "") >= 0)
-		) {
-			DWORD regval = 1;
-			DWORD reglen = sizeof(DWORD);
-
-			printf("Using Win2k (SP3+) / WinXP (No SP)... Checking SafeDllSearch\n");
-			read_reg_string(HKEY_LOCAL_MACHINE,
-				"System\\CurrentControlSet\\Control\\Session Manager",
-				"SafeDllSearchMode",
-				(LPBYTE) &regval,
-				&reglen);
-
-			if (regval != 0) {
-				printf("Trying to set SafeDllSearchMode to 0\n");
-				regval = 0;
-				if (RegOpenKeyEx(HKEY_LOCAL_MACHINE,
-					"System\\CurrentControlSet\\Control\\Session Manager",
-					0,  KEY_SET_VALUE, &hkey
-				) == ERROR_SUCCESS) {
-					if (RegSetValueEx(hkey,
-						"SafeDllSearchMode", 0,
-						REG_DWORD, (LPBYTE) &regval,
-						sizeof(DWORD)
-					) != ERROR_SUCCESS)
-						printf("Error writing SafeDllSearchMode. Error: %u\n",
-						(UINT) GetLastError());
-					RegCloseKey(hkey);
-				} else
-					printf("Error opening Session Manager key for writing. Error: %u\n",
-						(UINT) GetLastError());
-			} else
-				printf("SafeDllSearchMode is set to 0\n");
-		}/*end else*/
-	}
-}
-
-static char* wgaim_lcid_to_posix(LCID lcid) {
-	char *posix = NULL;
-	int lang_id = PRIMARYLANGID(lcid);
-	int sub_id = SUBLANGID(lcid);
-
-	switch (lang_id) {
-		case LANG_ARABIC: posix = "ar"; break;
-		case LANG_AZERI: posix = "az"; break;
-		case LANG_BENGALI: posix = "bn"; break;
-		case LANG_BULGARIAN: posix = "bg"; break;
-		case LANG_CATALAN: posix = "ca"; break;
-		case LANG_CHINESE:
-			switch (sub_id) {
-				case SUBLANG_CHINESE_SIMPLIFIED:
-					posix = "zh_CN"; break;
-				case SUBLANG_CHINESE_TRADITIONAL:
-					posix = "zh_TW"; break;
-				default:
-					posix = "zh"; break;
-			}
-			break;
-		case LANG_CZECH: posix = "cs"; break;
-		case LANG_DANISH: posix = "da"; break;
-		case LANG_ESTONIAN: posix = "et"; break;
-		case LANG_PERSIAN: posix = "fa"; break;
-		case LANG_GERMAN: posix = "de"; break;
-		case LANG_GREEK: posix = "el"; break;
-		case LANG_ENGLISH:
-			switch (sub_id) {
-				case SUBLANG_ENGLISH_UK:
-					posix = "en_GB"; break;
-				case SUBLANG_ENGLISH_AUS:
-					posix = "en_AU"; break;
-				case SUBLANG_ENGLISH_CAN:
-					posix = "en_CA"; break;
-				default:
-					posix = "en"; break;
-			}
-			break;
-		case LANG_SPANISH: posix = "es"; break;
-		case LANG_BASQUE: posix = "eu"; break;
-		case LANG_FINNISH: posix = "fi"; break;
-		case LANG_FRENCH: posix = "fr"; break;
-		case LANG_GALICIAN: posix = "gl"; break;
-		case LANG_GUJARATI: posix = "gu"; break;
-		case LANG_HEBREW: posix = "he"; break;
-		case LANG_HINDI: posix = "hi"; break;
-		case LANG_HUNGARIAN: posix = "hu"; break;
-		case LANG_ICELANDIC: break;
-		case LANG_ITALIAN: posix = "it"; break;
-		case LANG_JAPANESE: posix = "ja"; break;
-		case LANG_GEORGIAN: posix = "ka"; break;
-		case LANG_KOREAN: posix = "ko"; break;
-		case LANG_LITHUANIAN: posix = "lt"; break;
-		case LANG_MACEDONIAN: posix = "mk"; break;
-		case LANG_DUTCH: posix = "nl"; break;
-		case LANG_NEPALI: posix = "ne"; break;
-		case LANG_NORWEGIAN:
-			switch (sub_id) {
-				case SUBLANG_NORWEGIAN_BOKMAL:
-					posix = "nb"; break;
-				case SUBLANG_NORWEGIAN_NYNORSK:
-					posix = "nn"; break;
-			}
-			break;
-		case LANG_PUNJABI: posix = "pa"; break;
-		case LANG_POLISH: posix = "pl"; break;
-		case LANG_PORTUGUESE:
-			switch (sub_id) {
-				case SUBLANG_PORTUGUESE_BRAZILIAN:
-					posix = "pt_BR"; break;
-				default:
-				posix = "pt"; break;
-			}
-			break;
-		case LANG_ROMANIAN: posix = "ro"; break;
-		case LANG_RUSSIAN: posix = "ru"; break;
-		/* LANG_CROATIAN == LANG_SERBIAN == LANG_BOSNIAN */
-		case LANG_SERBIAN:
-			switch (sub_id) {
-				case SUBLANG_SERBIAN_LATIN:
-					posix = "sr@Latn"; break;
-				case SUBLANG_SERBIAN_CYRILLIC:
-					posix = "sr"; break;
-				case SUBLANG_BOSNIAN_BOSNIA_HERZEGOVINA_CYRILLIC:
-				case SUBLANG_BOSNIAN_BOSNIA_HERZEGOVINA_LATIN:
-					posix = "bs"; break;
-				case SUBLANG_CROATIAN_BOSNIA_HERZEGOVINA_LATIN:
-					posix = "hr"; break;
-			}
-			break;
-		case LANG_SLOVAK: posix = "sk"; break;
-		case LANG_SLOVENIAN: posix = "sl"; break;
-		case LANG_ALBANIAN: posix = "sq"; break;
-		case LANG_SWEDISH: posix = "sv"; break;
-		case LANG_TAMIL: posix = "ta"; break;
-		case LANG_TELUGU: posix = "te"; break;
-		case LANG_THAI: posix = "th"; break;
-		case LANG_TURKISH: posix = "tr"; break;
-		case LANG_UKRAINIAN: posix = "uk"; break;
-		case LANG_VIETNAMESE: posix = "vi"; break;
-		case LANG_XHOSA: posix = "xh"; break;
-		case LANG_URDU: break;
-		case LANG_INDONESIAN: break;
-		case LANG_BELARUSIAN: break;
-		case LANG_LATVIAN: break;
-		case LANG_ARMENIAN: break;
-		case LANG_AFRIKAANS: break;
-		case LANG_FAEROESE: break;
-		case LANG_MALAY: break;
-		case LANG_KAZAK: break;
-		case LANG_KYRGYZ: break;
-		case LANG_SWAHILI: break;
-		case LANG_UZBEK: break;
-		case LANG_TATAR: break;
-		case LANG_ORIYA: break;
-		case LANG_KANNADA: break;
-		case LANG_MALAYALAM: break;
-		case LANG_ASSAMESE: break;
-		case LANG_MARATHI: break;
-		case LANG_SANSKRIT: break;
-		case LANG_MONGOLIAN: break;
-		case LANG_KONKANI: break;
-		case LANG_MANIPURI: break;
-		case LANG_SINDHI: break;
-		case LANG_SYRIAC: break;
-		case LANG_KASHMIRI: break;
-		case LANG_DIVEHI: break;
-	}
-
-	/* Deal with exceptions */
-	if (posix == NULL) {
-		switch (lcid) {
-			case 0x0455: posix = "my_MM"; break; /* Myanmar (Burmese) */
-			case 9999: posix = "ku"; break; /* Kurdish (from NSIS) */
-		}
-	}
-
-	return posix;
-}
-
-/* Determine and set Gaim locale as follows (in order of priority):
-   - Check GAIMLANG env var
-   - Check NSIS Installer Language reg value
-   - Use default user locale
-*/
-static const char *wgaim_get_locale() {
-	const char *locale = NULL;
-	LCID lcid;
-#ifndef PORTABLE
-	char data[10];
-	DWORD datalen = 10;
-#endif
-
-	/* Check if user set GAIMLANG env var */
-	if ((locale = getenv("GAIMLANG")))
-		return locale;
-
-#ifndef PORTABLE
-	if (read_reg_string(HKEY_CURRENT_USER, "SOFTWARE\\gaim",
-			"Installer Language", (LPBYTE) &data, &datalen)) {
-		if ((locale = wgaim_lcid_to_posix(atoi(data))))
-			return locale;
-	}
-#endif
-
-	lcid = GetUserDefaultLCID();
-	if ((locale = wgaim_lcid_to_posix(lcid)))
-		return locale;
-
-	return "en";
-}
-
-static void wgaim_set_locale() {
-	const char *locale = NULL;
-	char envstr[25];
-
-	locale = wgaim_get_locale();
-
-	snprintf(envstr, 25, "LANG=%s", locale);
-	printf("Setting locale: %s\n", envstr);
-	putenv(envstr);
-}
-
-#define WM_FOCUS_REQUEST (WM_APP + 13)
-
-static BOOL wgaim_set_running() {
-	HANDLE h;
-
-	if ((h = CreateMutex(NULL, FALSE, "gaim_is_running"))) {
-		if (GetLastError() == ERROR_ALREADY_EXISTS) {
-			HWND msg_win;
-
-			if((msg_win = FindWindow(TEXT("WingaimMsgWinCls"), NULL)))
-				if(SendMessage(msg_win, WM_FOCUS_REQUEST, (WPARAM) NULL, (LPARAM) NULL))
-					return FALSE;
-
-			/* If we get here, the focus request wasn't successful */
-
-			MessageBox(NULL,
-				"An instance of Gaim is already running",
-				NULL, MB_OK | MB_TOPMOST);
-
-			return FALSE;
-		}
-	}
-	return TRUE;
-}
-
-
-#ifdef __GNUC__
-#  ifndef _stdcall
-#    define _stdcall  __attribute__((stdcall))
-#  endif
-#endif
-
-int _stdcall
-WinMain (struct HINSTANCE__ *hInstance, struct HINSTANCE__ *hPrevInstance,
-		char *lpszCmdLine, int nCmdShow) {
-	char errbuf[512];
-	char gaimdir[MAX_PATH];
-	HMODULE hmod;
-
-	/* If debug or help or version flag used, create console for output */
-	if (strstr(lpszCmdLine, "-d") || strstr(lpszCmdLine, "-h") || strstr(lpszCmdLine, "-v")) {
-		/* If stdout hasn't been redirected to a file, alloc a console
-		 *  (_istty() doesn't work for stuff using the GUI subsystem) */
-		if (_fileno(stdout) == -1) {
-			LPFNATTACHCONSOLE MyAttachConsole = NULL;
-			if ((hmod = GetModuleHandle("kernel32.dll"))) {
-				MyAttachConsole =
-					(LPFNATTACHCONSOLE)
-					GetProcAddress(hmod, "AttachConsole");
-			}
-			if ((MyAttachConsole && MyAttachConsole(ATTACH_PARENT_PROCESS))
-					|| AllocConsole()) {
-				freopen("CONOUT$", "w", stdout);
-				freopen("CONOUT$", "w", stderr);
-			}
-		}
-	}
-
-	/* Load exception handler if we have it */
-	if (GetModuleFileName(NULL, gaimdir, MAX_PATH) != 0) {
-		char *tmp = gaimdir;
-		char *prev = NULL;
-
-		while ((tmp = strchr(tmp, '\\'))) {
-			prev = tmp;
-			tmp++;
-		}
-
-		if (prev) {
-			prev[0] = '\0';
-			strcat(gaimdir, "\\exchndl.dll");
-			if (LoadLibrary(gaimdir))
-				printf("Loaded exchndl.dll\n");
-		}
-	} else {
-		DWORD dw = GetLastError();
-		const char *err_msg = get_win32_error_message(dw);
-		snprintf(errbuf, 512,
-			"Error getting module filename.\nError: (%u) %s",
-			(UINT) dw, err_msg);
-		printf("%s", errbuf);
-		MessageBox(NULL, errbuf, NULL, MB_OK | MB_TOPMOST);
-	}
-
-#ifndef PORTABLE
-	if (!getenv("GAIM_NO_DLL_CHECK"))
-#endif
-		dll_prep();
-
-	wgaim_set_locale();
-	/* If help or version flag used, do not check Mutex */
-	if (!strstr(lpszCmdLine, "-h") && !strstr(lpszCmdLine, "-v"))
-		if (!getenv("GAIM_MULTI_INST") && !wgaim_set_running())
-			return 0;
-
-	/* Now we are ready for Gaim .. */
-	if ((hmod = LoadLibrary("gtkgaim.dll"))) {
-		gaim_main = (LPFNGAIMMAIN) GetProcAddress(hmod, "gaim_main");
-	}
-
-	if (!gaim_main) {
-		DWORD dw = GetLastError();
-		BOOL mod_not_found = (dw == ERROR_MOD_NOT_FOUND || dw == ERROR_DLL_NOT_FOUND);
-		const char *err_msg = get_win32_error_message(dw);
-
-		snprintf(errbuf, 512, "Error loading gtkgaim.dll.\nError: (%u) %s%s%s",
-			(UINT) dw, err_msg,
-			mod_not_found ? "\n" : "",
-			mod_not_found ? "This probably means that GTK+ can't be found." : "");
-		printf("%s", errbuf);
-		MessageBox(NULL, errbuf, TEXT("Error"), MB_OK | MB_TOPMOST);
-
-		return 0;
-	}
-
-	return gaim_main (hInstance, __argc, __argv);
-}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin/win32/winpidgin.c	Sun Jan 21 22:58:02 2007 +0000
@@ -0,0 +1,552 @@
+/*
+ *  winpidgin.c
+ *
+ *  Date: June, 2002
+ *  Description: Entry point for win32 pidgin, and various win32 dependant
+ *  routines.
+ *
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+/* This is for ATTACH_PARENT_PROCESS */
+#ifndef _WIN32_WINNT
+#define _WIN32_WINNT 0x501
+#endif
+#include <windows.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+
+/* These will hopefully be in the win32api next time it is updated - at which point, we'll remove them */
+#ifndef LANG_PERSIAN
+#define LANG_PERSIAN 0x29
+#endif
+#ifndef LANG_BOSNIAN
+#define SUBLANG_BOSNIAN_BOSNIA_HERZEGOVINA_LATIN	0x05
+#define SUBLANG_BOSNIAN_BOSNIA_HERZEGOVINA_CYRILLIC	0x08
+#endif
+#ifndef SUBLANG_CROATIAN_BOSNIA_HERZEGOVINA_LATIN
+#define SUBLANG_CROATIAN_BOSNIA_HERZEGOVINA_LATIN	0x04
+#endif
+#ifndef LANG_XHOSA
+#define LANG_XHOSA 0x34
+#endif
+
+
+typedef int (CALLBACK* LPFNGAIMMAIN)(HINSTANCE, int, char**);
+typedef void (CALLBACK* LPFNSETDLLDIRECTORY)(LPCTSTR);
+typedef BOOL (CALLBACK* LPFNATTACHCONSOLE)(DWORD);
+
+/*
+ *  PROTOTYPES
+ */
+static LPFNGAIMMAIN gaim_main = NULL;
+static LPFNSETDLLDIRECTORY MySetDllDirectory = NULL;
+
+static const char *get_win32_error_message(DWORD err) {
+	static char err_msg[512];
+
+	FormatMessage(
+		FORMAT_MESSAGE_FROM_SYSTEM,
+		NULL, err,
+		MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+		(LPTSTR) &err_msg, sizeof(err_msg), NULL);
+
+	return err_msg;
+}
+
+static BOOL read_reg_string(HKEY key, char* sub_key, char* val_name, LPBYTE data, LPDWORD data_len) {
+	HKEY hkey;
+	BOOL ret = FALSE;
+	LONG retv;
+
+	if (ERROR_SUCCESS == (retv = RegOpenKeyEx(key, sub_key, 0,
+					KEY_QUERY_VALUE, &hkey))) {
+		if (ERROR_SUCCESS == (retv = RegQueryValueEx(hkey, val_name,
+						NULL, NULL, data, data_len)))
+			ret = TRUE;
+		else {
+			const char *err_msg = get_win32_error_message(retv);
+
+			printf("Could not read reg key '%s' subkey '%s' value: '%s'.\nMessage: (%ld) %s\n",
+					((key == HKEY_LOCAL_MACHINE) ? "HKLM" :
+					 (key == HKEY_CURRENT_USER) ? "HKCU" :
+					 "???"),
+					sub_key, val_name, retv, err_msg);
+		}
+		RegCloseKey(hkey);
+	}
+	else {
+		TCHAR szBuf[80];
+
+		FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, retv, 0,
+				(LPTSTR) &szBuf, sizeof(szBuf), NULL);
+		printf("Could not open reg subkey: %s\nError: (%ld) %s\n",
+				sub_key, retv, szBuf);
+	}
+
+	return ret;
+}
+
+static void dll_prep() {
+	char path[MAX_PATH + 1];
+	HMODULE hmod;
+	HKEY hkey;
+#ifdef PORTABLE
+	/* We assume that GTK+ is installed under \\path\to\Gaim\..\GTK
+	 * First we find \\path\to
+	 */
+	if (GetModuleFileName(NULL, path, MAX_PATH) != 0) {
+		char *tmp = path;
+		char *prev = NULL;
+		char *prev2 = NULL;
+
+		while ((tmp = strchr(tmp, '\\'))) {
+			prev2 = prev;
+			prev = tmp;
+			tmp++;
+		}
+
+		if (prev2) {
+			prev2[0] = '\0';
+		}
+	} else {
+		printf("Unable to determine current executable path. \n"
+			"This will prevent the settings dir from being set.\n"
+			"Assuming GTK+ is in the PATH.\n");
+	}
+
+	if (path) {
+		/* Set up the settings dir base to be \\path\to
+		 * The actual settings dir will be \\path\to\.gaim */
+		char settingsdir[strlen(path) + strlen("GAIMHOME=") + 1];
+		char aspelldir[strlen(path) + strlen("GAIM_ASPELL_DIR=\\Aspell\\bin") + 1];
+
+		snprintf(settingsdir, sizeof(settingsdir), "GAIMHOME=%s", path);
+		printf("Setting settings dir: %s\n", settingsdir);
+		putenv(settingsdir);
+
+		snprintf(aspelldir, sizeof(aspelldir), "GAIM_ASPELL_DIR=%s\\Aspell\\bin", path);
+		printf("%s", aspelldir);
+		putenv(aspelldir);
+
+		/* set the GTK+ path to be \\path\to\GTK\bin */
+		strcat(path, "\\GTK\\bin");
+	} else
+		return;
+#else /* PORTABLE */
+	char gtkpath[MAX_PATH + 1];
+	DWORD plen;
+
+	plen = sizeof(gtkpath);
+	hkey = HKEY_CURRENT_USER;
+	if (!read_reg_string(hkey, "SOFTWARE\\GTK\\2.0", "Path",
+			(LPBYTE) &gtkpath, &plen)) {
+		hkey = HKEY_LOCAL_MACHINE;
+		if (!read_reg_string(hkey, "SOFTWARE\\GTK\\2.0", "Path",
+				(LPBYTE) &gtkpath, &plen)) {
+			printf("GTK+ Path Registry Key not found. "
+				"Assuming GTK+ is in the PATH.\n");
+			return;
+		}
+	}
+
+	/* this value is replaced during a successful RegQueryValueEx() */
+	plen = sizeof(path);
+	/* Determine GTK+ dll path .. */
+	if (!read_reg_string(hkey, "SOFTWARE\\GTK\\2.0", "DllPath",
+				(LPBYTE) &path, &plen)) {
+		strcpy(path, gtkpath);
+		strcat(path, "\\bin");
+	}
+#endif
+	printf("GTK+ path found: %s\n", path);
+
+	if ((hmod = GetModuleHandle("kernel32.dll"))) {
+		MySetDllDirectory = (LPFNSETDLLDIRECTORY) GetProcAddress(
+			hmod, "SetDllDirectoryA");
+		if (!MySetDllDirectory)
+			printf("SetDllDirectory not supported\n");
+	} else
+		printf("Error getting kernel32.dll module handle\n");
+
+	/* For Windows XP SP1+ / Server 2003 we use SetDllDirectory to avoid dll hell */
+	if (MySetDllDirectory) {
+		printf("Using SetDllDirectory\n");
+		MySetDllDirectory(path);
+	}
+
+	/* For the rest, we set the current directory and make sure
+	 * SafeDllSearch is set to 0 where needed. */
+	else {
+		OSVERSIONINFO osinfo;
+
+		printf("Setting current directory to GTK+ dll directory\n");
+		SetCurrentDirectory(path);
+		/* For Windows 2000 (SP3+) / WinXP (No SP):
+		 * If SafeDllSearchMode is set to 1, Windows system directories are
+		 * searched for dlls before the current directory. Therefore we set it
+		 * to 0.
+		 */
+		osinfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+		GetVersionEx(&osinfo);
+		if ((osinfo.dwMajorVersion == 5 &&
+			osinfo.dwMinorVersion == 0 &&
+			strcmp(osinfo.szCSDVersion, "Service Pack 3") >= 0) ||
+			(osinfo.dwMajorVersion == 5 &&
+			osinfo.dwMinorVersion == 1 &&
+			strcmp(osinfo.szCSDVersion, "") >= 0)
+		) {
+			DWORD regval = 1;
+			DWORD reglen = sizeof(DWORD);
+
+			printf("Using Win2k (SP3+) / WinXP (No SP)... Checking SafeDllSearch\n");
+			read_reg_string(HKEY_LOCAL_MACHINE,
+				"System\\CurrentControlSet\\Control\\Session Manager",
+				"SafeDllSearchMode",
+				(LPBYTE) &regval,
+				&reglen);
+
+			if (regval != 0) {
+				printf("Trying to set SafeDllSearchMode to 0\n");
+				regval = 0;
+				if (RegOpenKeyEx(HKEY_LOCAL_MACHINE,
+					"System\\CurrentControlSet\\Control\\Session Manager",
+					0,  KEY_SET_VALUE, &hkey
+				) == ERROR_SUCCESS) {
+					if (RegSetValueEx(hkey,
+						"SafeDllSearchMode", 0,
+						REG_DWORD, (LPBYTE) &regval,
+						sizeof(DWORD)
+					) != ERROR_SUCCESS)
+						printf("Error writing SafeDllSearchMode. Error: %u\n",
+						(UINT) GetLastError());
+					RegCloseKey(hkey);
+				} else
+					printf("Error opening Session Manager key for writing. Error: %u\n",
+						(UINT) GetLastError());
+			} else
+				printf("SafeDllSearchMode is set to 0\n");
+		}/*end else*/
+	}
+}
+
+static char* wgaim_lcid_to_posix(LCID lcid) {
+	char *posix = NULL;
+	int lang_id = PRIMARYLANGID(lcid);
+	int sub_id = SUBLANGID(lcid);
+
+	switch (lang_id) {
+		case LANG_ARABIC: posix = "ar"; break;
+		case LANG_AZERI: posix = "az"; break;
+		case LANG_BENGALI: posix = "bn"; break;
+		case LANG_BULGARIAN: posix = "bg"; break;
+		case LANG_CATALAN: posix = "ca"; break;
+		case LANG_CHINESE:
+			switch (sub_id) {
+				case SUBLANG_CHINESE_SIMPLIFIED:
+					posix = "zh_CN"; break;
+				case SUBLANG_CHINESE_TRADITIONAL:
+					posix = "zh_TW"; break;
+				default:
+					posix = "zh"; break;
+			}
+			break;
+		case LANG_CZECH: posix = "cs"; break;
+		case LANG_DANISH: posix = "da"; break;
+		case LANG_ESTONIAN: posix = "et"; break;
+		case LANG_PERSIAN: posix = "fa"; break;
+		case LANG_GERMAN: posix = "de"; break;
+		case LANG_GREEK: posix = "el"; break;
+		case LANG_ENGLISH:
+			switch (sub_id) {
+				case SUBLANG_ENGLISH_UK:
+					posix = "en_GB"; break;
+				case SUBLANG_ENGLISH_AUS:
+					posix = "en_AU"; break;
+				case SUBLANG_ENGLISH_CAN:
+					posix = "en_CA"; break;
+				default:
+					posix = "en"; break;
+			}
+			break;
+		case LANG_SPANISH: posix = "es"; break;
+		case LANG_BASQUE: posix = "eu"; break;
+		case LANG_FINNISH: posix = "fi"; break;
+		case LANG_FRENCH: posix = "fr"; break;
+		case LANG_GALICIAN: posix = "gl"; break;
+		case LANG_GUJARATI: posix = "gu"; break;
+		case LANG_HEBREW: posix = "he"; break;
+		case LANG_HINDI: posix = "hi"; break;
+		case LANG_HUNGARIAN: posix = "hu"; break;
+		case LANG_ICELANDIC: break;
+		case LANG_ITALIAN: posix = "it"; break;
+		case LANG_JAPANESE: posix = "ja"; break;
+		case LANG_GEORGIAN: posix = "ka"; break;
+		case LANG_KOREAN: posix = "ko"; break;
+		case LANG_LITHUANIAN: posix = "lt"; break;
+		case LANG_MACEDONIAN: posix = "mk"; break;
+		case LANG_DUTCH: posix = "nl"; break;
+		case LANG_NEPALI: posix = "ne"; break;
+		case LANG_NORWEGIAN:
+			switch (sub_id) {
+				case SUBLANG_NORWEGIAN_BOKMAL:
+					posix = "nb"; break;
+				case SUBLANG_NORWEGIAN_NYNORSK:
+					posix = "nn"; break;
+			}
+			break;
+		case LANG_PUNJABI: posix = "pa"; break;
+		case LANG_POLISH: posix = "pl"; break;
+		case LANG_PORTUGUESE:
+			switch (sub_id) {
+				case SUBLANG_PORTUGUESE_BRAZILIAN:
+					posix = "pt_BR"; break;
+				default:
+				posix = "pt"; break;
+			}
+			break;
+		case LANG_ROMANIAN: posix = "ro"; break;
+		case LANG_RUSSIAN: posix = "ru"; break;
+		/* LANG_CROATIAN == LANG_SERBIAN == LANG_BOSNIAN */
+		case LANG_SERBIAN:
+			switch (sub_id) {
+				case SUBLANG_SERBIAN_LATIN:
+					posix = "sr@Latn"; break;
+				case SUBLANG_SERBIAN_CYRILLIC:
+					posix = "sr"; break;
+				case SUBLANG_BOSNIAN_BOSNIA_HERZEGOVINA_CYRILLIC:
+				case SUBLANG_BOSNIAN_BOSNIA_HERZEGOVINA_LATIN:
+					posix = "bs"; break;
+				case SUBLANG_CROATIAN_BOSNIA_HERZEGOVINA_LATIN:
+					posix = "hr"; break;
+			}
+			break;
+		case LANG_SLOVAK: posix = "sk"; break;
+		case LANG_SLOVENIAN: posix = "sl"; break;
+		case LANG_ALBANIAN: posix = "sq"; break;
+		case LANG_SWEDISH: posix = "sv"; break;
+		case LANG_TAMIL: posix = "ta"; break;
+		case LANG_TELUGU: posix = "te"; break;
+		case LANG_THAI: posix = "th"; break;
+		case LANG_TURKISH: posix = "tr"; break;
+		case LANG_UKRAINIAN: posix = "uk"; break;
+		case LANG_VIETNAMESE: posix = "vi"; break;
+		case LANG_XHOSA: posix = "xh"; break;
+		case LANG_URDU: break;
+		case LANG_INDONESIAN: break;
+		case LANG_BELARUSIAN: break;
+		case LANG_LATVIAN: break;
+		case LANG_ARMENIAN: break;
+		case LANG_AFRIKAANS: break;
+		case LANG_FAEROESE: break;
+		case LANG_MALAY: break;
+		case LANG_KAZAK: break;
+		case LANG_KYRGYZ: break;
+		case LANG_SWAHILI: break;
+		case LANG_UZBEK: break;
+		case LANG_TATAR: break;
+		case LANG_ORIYA: break;
+		case LANG_KANNADA: break;
+		case LANG_MALAYALAM: break;
+		case LANG_ASSAMESE: break;
+		case LANG_MARATHI: break;
+		case LANG_SANSKRIT: break;
+		case LANG_MONGOLIAN: break;
+		case LANG_KONKANI: break;
+		case LANG_MANIPURI: break;
+		case LANG_SINDHI: break;
+		case LANG_SYRIAC: break;
+		case LANG_KASHMIRI: break;
+		case LANG_DIVEHI: break;
+	}
+
+	/* Deal with exceptions */
+	if (posix == NULL) {
+		switch (lcid) {
+			case 0x0455: posix = "my_MM"; break; /* Myanmar (Burmese) */
+			case 9999: posix = "ku"; break; /* Kurdish (from NSIS) */
+		}
+	}
+
+	return posix;
+}
+
+/* Determine and set Gaim locale as follows (in order of priority):
+   - Check GAIMLANG env var
+   - Check NSIS Installer Language reg value
+   - Use default user locale
+*/
+static const char *wgaim_get_locale() {
+	const char *locale = NULL;
+	LCID lcid;
+#ifndef PORTABLE
+	char data[10];
+	DWORD datalen = 10;
+#endif
+
+	/* Check if user set GAIMLANG env var */
+	if ((locale = getenv("GAIMLANG")))
+		return locale;
+
+#ifndef PORTABLE
+	if (read_reg_string(HKEY_CURRENT_USER, "SOFTWARE\\gaim",
+			"Installer Language", (LPBYTE) &data, &datalen)) {
+		if ((locale = wgaim_lcid_to_posix(atoi(data))))
+			return locale;
+	}
+#endif
+
+	lcid = GetUserDefaultLCID();
+	if ((locale = wgaim_lcid_to_posix(lcid)))
+		return locale;
+
+	return "en";
+}
+
+static void wgaim_set_locale() {
+	const char *locale = NULL;
+	char envstr[25];
+
+	locale = wgaim_get_locale();
+
+	snprintf(envstr, 25, "LANG=%s", locale);
+	printf("Setting locale: %s\n", envstr);
+	putenv(envstr);
+}
+
+#define WM_FOCUS_REQUEST (WM_APP + 13)
+
+static BOOL wgaim_set_running() {
+	HANDLE h;
+
+	if ((h = CreateMutex(NULL, FALSE, "gaim_is_running"))) {
+		if (GetLastError() == ERROR_ALREADY_EXISTS) {
+			HWND msg_win;
+
+			if((msg_win = FindWindow(TEXT("WingaimMsgWinCls"), NULL)))
+				if(SendMessage(msg_win, WM_FOCUS_REQUEST, (WPARAM) NULL, (LPARAM) NULL))
+					return FALSE;
+
+			/* If we get here, the focus request wasn't successful */
+
+			MessageBox(NULL,
+				"An instance of Gaim is already running",
+				NULL, MB_OK | MB_TOPMOST);
+
+			return FALSE;
+		}
+	}
+	return TRUE;
+}
+
+
+#ifdef __GNUC__
+#  ifndef _stdcall
+#    define _stdcall  __attribute__((stdcall))
+#  endif
+#endif
+
+int _stdcall
+WinMain (struct HINSTANCE__ *hInstance, struct HINSTANCE__ *hPrevInstance,
+		char *lpszCmdLine, int nCmdShow) {
+	char errbuf[512];
+	char gaimdir[MAX_PATH];
+	HMODULE hmod;
+
+	/* If debug or help or version flag used, create console for output */
+	if (strstr(lpszCmdLine, "-d") || strstr(lpszCmdLine, "-h") || strstr(lpszCmdLine, "-v")) {
+		/* If stdout hasn't been redirected to a file, alloc a console
+		 *  (_istty() doesn't work for stuff using the GUI subsystem) */
+		if (_fileno(stdout) == -1) {
+			LPFNATTACHCONSOLE MyAttachConsole = NULL;
+			if ((hmod = GetModuleHandle("kernel32.dll"))) {
+				MyAttachConsole =
+					(LPFNATTACHCONSOLE)
+					GetProcAddress(hmod, "AttachConsole");
+			}
+			if ((MyAttachConsole && MyAttachConsole(ATTACH_PARENT_PROCESS))
+					|| AllocConsole()) {
+				freopen("CONOUT$", "w", stdout);
+				freopen("CONOUT$", "w", stderr);
+			}
+		}
+	}
+
+	/* Load exception handler if we have it */
+	if (GetModuleFileName(NULL, gaimdir, MAX_PATH) != 0) {
+		char *tmp = gaimdir;
+		char *prev = NULL;
+
+		while ((tmp = strchr(tmp, '\\'))) {
+			prev = tmp;
+			tmp++;
+		}
+
+		if (prev) {
+			prev[0] = '\0';
+			strcat(gaimdir, "\\exchndl.dll");
+			if (LoadLibrary(gaimdir))
+				printf("Loaded exchndl.dll\n");
+		}
+	} else {
+		DWORD dw = GetLastError();
+		const char *err_msg = get_win32_error_message(dw);
+		snprintf(errbuf, 512,
+			"Error getting module filename.\nError: (%u) %s",
+			(UINT) dw, err_msg);
+		printf("%s", errbuf);
+		MessageBox(NULL, errbuf, NULL, MB_OK | MB_TOPMOST);
+	}
+
+#ifndef PORTABLE
+	if (!getenv("GAIM_NO_DLL_CHECK"))
+#endif
+		dll_prep();
+
+	wgaim_set_locale();
+	/* If help or version flag used, do not check Mutex */
+	if (!strstr(lpszCmdLine, "-h") && !strstr(lpszCmdLine, "-v"))
+		if (!getenv("GAIM_MULTI_INST") && !wgaim_set_running())
+			return 0;
+
+	/* Now we are ready for Gaim .. */
+	if ((hmod = LoadLibrary("pidgin.dll"))) {
+		gaim_main = (LPFNGAIMMAIN) GetProcAddress(hmod, "gaim_main");
+	}
+
+	if (!gaim_main) {
+		DWORD dw = GetLastError();
+		BOOL mod_not_found = (dw == ERROR_MOD_NOT_FOUND || dw == ERROR_DLL_NOT_FOUND);
+		const char *err_msg = get_win32_error_message(dw);
+
+		snprintf(errbuf, 512, "Error loading pidgin.dll.\nError: (%u) %s%s%s",
+			(UINT) dw, err_msg,
+			mod_not_found ? "\n" : "",
+			mod_not_found ? "This probably means that GTK+ can't be found." : "");
+		printf("%s", errbuf);
+		MessageBox(NULL, errbuf, TEXT("Error"), MB_OK | MB_TOPMOST);
+
+		return 0;
+	}
+
+	return gaim_main (hInstance, __argc, __argv);
+}
--- a/po/Makefile.mingw	Sun Jan 21 22:56:28 2007 +0000
+++ b/po/Makefile.mingw	Sun Jan 21 22:58:02 2007 +0000
@@ -4,7 +4,7 @@
 #
 
 GAIM_TOP := ..
-include $(GAIM_TOP)/libgaim/win32/global.mak
+include $(GAIM_TOP)/libpurple/win32/global.mak
 
 PACKAGE = gaim