Mercurial > pidgin.yaz

--- a/.mtn-ignore	Tue Apr 10 16:48:20 2007 +0000
+++ b/.mtn-ignore	Tue Apr 10 16:54:51 2007 +0000
@@ -22,8 +22,9 @@
 finch/libgnt/gntmarshal.c
 finch/libgnt/gntmarshal.h
 depcomp
-doc/gaim-text.1
+doc/finch.1
 doc/pidgin.1
+doc/html
 gaim.apspec
 pidgin.desktop
 gaim.service
--- a/Doxyfile.in	Tue Apr 10 16:48:20 2007 +0000
+++ b/Doxyfile.in	Tue Apr 10 16:54:51 2007 +0000
@@ -615,13 +615,13 @@
 # each generated HTML page. If it is left blank doxygen will generate a
 # standard header.

-HTML_HEADER            =
+HTML_HEADER            = doc/TracHeader.html

 # The HTML_FOOTER tag can be used to specify a personal HTML footer for
 # each generated HTML page. If it is left blank doxygen will generate a
 # standard footer.

-HTML_FOOTER            =
+HTML_FOOTER            = doc/TracFooter.html

 # The HTML_STYLESHEET tag can be used to specify a user-defined cascading
 # style sheet that is used by each HTML page. It can be used to
--- a/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -2,11 +2,11 @@
 #
 # Author: hermanator12002@yahoo.com
 # Date 9/11/02
-# Description: Top Makefile for win32 (mingw) port of Gaim
+# Description: Top Makefile for win32 (mingw) port of Pidgin and LibPurple
 #

-GAIM_TOP := .
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := .
+include $(PIDGIN_TREE_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
@@ -58,43 +58,43 @@

 .PHONY: all install installer installer_nogtk installer_debug installers clean uninstall create_release_install_dir

-all: $(GAIM_CONFIG_H)
-	$(MAKE) -C $(GAIM_LIB_TOP) -f $(GAIM_WIN32_MAKEFILE)
-	$(MAKE) -C $(GAIM_GTK_TOP) -f $(GAIM_WIN32_MAKEFILE)
-	$(MAKE) -C $(GAIM_PO_TOP) -f $(GAIM_WIN32_MAKEFILE)
+all: $(PIDGIN_CONFIG_H)
+	$(MAKE) -C $(PURPLE_TOP) -f $(MINGW_MAKEFILE)
+	$(MAKE) -C $(PIDGIN_TOP) -f $(MINGW_MAKEFILE)
+	$(MAKE) -C $(PURPLE_PO_TOP) -f $(MINGW_MAKEFILE)

-install: all $(GAIM_INSTALL_DIR)
-	$(MAKE) -C $(GAIM_LIB_TOP) -f $(GAIM_WIN32_MAKEFILE) install
-	$(MAKE) -C $(GAIM_GTK_TOP) -f $(GAIM_WIN32_MAKEFILE) install
-	$(MAKE) -C $(GAIM_PO_TOP) -f $(GAIM_WIN32_MAKEFILE) install
+install: all $(PIDGIN_INSTALL_DIR)
+	$(MAKE) -C $(PURPLE_TOP) -f $(MINGW_MAKEFILE) install
+	$(MAKE) -C $(PIDGIN_TOP) -f $(MINGW_MAKEFILE) install
+	$(MAKE) -C $(PURPLE_PO_TOP) -f $(MINGW_MAKEFILE) install

 create_release_install_dir: install
-	rm -rf $(GAIM_INSTALL_DIR).release
-	cp -R $(GAIM_INSTALL_DIR) $(GAIM_INSTALL_DIR).release
-	find $(GAIM_INSTALL_DIR).release \( -name '*.dll' -o -name '*.exe' \) \
+	rm -rf $(PIDGIN_INSTALL_DIR).release
+	cp -R $(PIDGIN_INSTALL_DIR) $(PIDGIN_INSTALL_DIR).release
+	find $(PIDGIN_INSTALL_DIR).release \( -name '*.dll' -o -name '*.exe' \) \
 	 -not \( -false $(EXTERNAL_DLLS_FIND_EXP) \) -exec $(STRIP) --strip-unneeded {} ';'

 installer: create_release_install_dir
-	$(MAKENSIS) /V3 /DPIDGIN_VERSION="$(GAIM_VERSION)" /DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" /DWITH_GTK /DPIDGIN_INSTALL_DIR="$(GAIM_INSTALL_DIR).release" /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi
+	$(MAKENSIS) /V3 /DPIDGIN_VERSION="$(PIDGIN_VERSION)" /DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" /DWITH_GTK /DPIDGIN_INSTALL_DIR="$(PIDGIN_INSTALL_DIR).release" /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi
 	mv pidgin/win32/nsis/pidgin*.exe ./

 installer_nogtk: create_release_install_dir
-	$(MAKENSIS) /V3 /DPIDGIN_VERSION="$(GAIM_VERSION)" /DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" /DPIDGIN_INSTALL_DIR="$(GAIM_INSTALL_DIR).release" /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi
+	$(MAKENSIS) /V3 /DPIDGIN_VERSION="$(PIDGIN_VERSION)" /DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" /DPIDGIN_INSTALL_DIR="$(PIDGIN_INSTALL_DIR).release" /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi
 	mv pidgin/win32/nsis/pidgin*.exe ./

 installer_debug: install
-	$(MAKENSIS) /V3 /DPIDGIN_VERSION="$(GAIM_VERSION)" /DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" /DPIDGIN_INSTALL_DIR="$(GAIM_INSTALL_DIR)" /DDEBUG /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi
+	$(MAKENSIS) /V3 /DPIDGIN_VERSION="$(PIDGIN_VERSION)" /DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" /DPIDGIN_INSTALL_DIR="$(PIDGIN_INSTALL_DIR)" /DDEBUG /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi
 	mv pidgin/win32/nsis/pidgin*.exe ./

 installers: installer installer_nogtk installer_debug

 clean:
-	$(MAKE) -C $(GAIM_PO_TOP) -f $(GAIM_WIN32_MAKEFILE) clean
-	$(MAKE) -C $(GAIM_GTK_TOP) -f $(GAIM_WIN32_MAKEFILE) clean
-	$(MAKE) -C $(GAIM_LIB_TOP) -f $(GAIM_WIN32_MAKEFILE) clean
-	rm -f $(GAIM_CONFIG_H) VERSION pidgin*.exe
+	$(MAKE) -C $(PURPLE_PO_TOP) -f $(MINGW_MAKEFILE) clean
+	$(MAKE) -C $(PIDGIN_TOP) -f $(MINGW_MAKEFILE) clean
+	$(MAKE) -C $(PURPLE_TOP) -f $(MINGW_MAKEFILE) clean
+	rm -f $(PIDGIN_CONFIG_H) VERSION pidgin*.exe

 uninstall:
-	rm -rf $(GAIM_INSTALL_PERLMOD_DIR) $(GAIM_INSTALL_PLUGINS_DIR) $(GAIM_INSTALL_PO_DIR) $(GAIM_INSTALL_DIR) $(GAIM_INSTALL_DIR).release
+	rm -rf $(PURPLE_INSTALL_PERLMOD_DIR) $(PIDGIN_INSTALL_PLUGINS_DIR) $(PURPLE_INSTALL_PO_DIR) $(PIDGIN_INSTALL_DIR) $(PIDGIN_INSTALL_DIR).release

-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
--- a/README.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/README.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -1,6 +1,6 @@
-How to build Gaim using MinGW
-=============================
+How to build Pidgin using MinGW
+===============================

 Since these instructions are constantly changing, please refer to:

-http://gaim.sourceforge.net/win32/build.php
+http://pidgin.im/win32/build.php
--- a/config.h.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/config.h.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -155,7 +155,7 @@
 /* Define to 1 if you have the `getuid' function. */
 /* #define HAVE_GETUID 1 */

-/* Gaim always has GLib, but Linphone can be built without it */
+/* Pidgin always has GLib, but Linphone can be built without it */
 /* #undef HAVE_GLIB */

 /* Define if you have GNUTLS */
@@ -638,7 +638,7 @@
 #define HAVE_LIBXML 1

 /*
- * Following are added for Win32 version of Gaim
+ * Following are added for Win32 version of Pidgin
  */
 #define HAVE_VSNPRINTF 1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/TracFooter.html	Tue Apr 10 16:54:51 2007 +0000
@@ -0,0 +1,2 @@
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/TracHeader.html	Tue Apr 10 16:54:51 2007 +0000
@@ -0,0 +1,2 @@
+
+
--- a/finch/libgnt/gntkeys.c	Tue Apr 10 16:48:20 2007 +0000
+++ b/finch/libgnt/gntkeys.c	Tue Apr 10 16:54:51 2007 +0000
@@ -230,7 +230,9 @@

 	root.flags &= ~IS_END;
 	while (*path && n->next[*path] && !(n->flags & IS_END)) {
-		if (g_utf8_find_next_char(path, NULL) - path > 1)
+		if (!g_ascii_isspace(*path) &&
+				!g_ascii_iscntrl(*path) &&
+				!g_ascii_isgraph(*path))
 			return 0;
 		n = n->next[*path++];
 		depth++;
--- a/finch/plugins/Makefile.am	Tue Apr 10 16:48:20 2007 +0000
+++ b/finch/plugins/Makefile.am	Tue Apr 10 16:54:51 2007 +0000
@@ -18,9 +18,10 @@
 gnthistory_la_SOURCES = gnthistory.c
 gntlastlog_la_SOURCES = lastlog.c

+gntclipboard_la_CFLAGS = $(X11_CFLAGS)
 gntgf_la_CFLAGS = $(X11_CFLAGS)

-gntclipboard_la_LIBADD = $(GLIB_LIBS)
+gntclipboard_la_LIBADD = $(GLIB_LIBS) $(X11_LIBS)
 gntgf_la_LIBADD       = $(GLIB_LIBS) $(X11_LIBS) $(top_builddir)/finch/libgnt/libgnt.la
 gnthistory_la_LIBADD  = $(GLIB_LIBS)
 gntlastlog_la_LIBADD  = $(GLIB_LIBS)
--- a/libpurple/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/libpurple/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -1,11 +1,11 @@
 #
 # Makefile.mingw
 #
-# Description: Makefile for win32 (mingw) version of libGaim
+# Description: Makefile for win32 (mingw) version of LibPurple
 #

-GAIM_TOP := ..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak

 TARGET = libpurple
 NEEDED_DLLS = $(LIBXML2_TOP)/bin/libxml2.dll
@@ -14,9 +14,9 @@
 ## INCLUDE PATHS
 ##
 INCLUDE_PATHS =	\
-			-I$(GAIM_LIB_TOP) \
-			-I$(GAIM_LIB_TOP)/win32 \
-			-I$(GAIM_TOP) \
+			-I$(PURPLE_TOP) \
+			-I$(PURPLE_TOP)/win32 \
+			-I$(PIDGIN_TREE_TOP) \
 			-I$(GTK_TOP)/include \
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
@@ -94,7 +94,7 @@
 		-lws2_32 \
 		-lxml2

-include $(GAIM_COMMON_RULES)
+include $(PIDGIN_COMMON_RULES)

 ##
 ## TARGET DEFINITIONS
@@ -102,22 +102,22 @@
 .PHONY: all install install_shallow clean

 all: $(TARGET).dll
-	$(MAKE) -C $(GAIM_PROTOS_TOP) -f $(GAIM_WIN32_MAKEFILE)
-	$(MAKE) -C $(GAIM_LIB_PLUGINS_TOP) -f $(GAIM_WIN32_MAKEFILE)
+	$(MAKE) -C $(PURPLE_PROTOS_TOP) -f $(MINGW_MAKEFILE)
+	$(MAKE) -C $(PURPLE_PLUGINS_TOP) -f $(MINGW_MAKEFILE)

-install_shallow: $(GAIM_INSTALL_DIR) $(TARGET).dll
-	cp $(TARGET).dll $(GAIM_INSTALL_DIR)
-	cp $(NEEDED_DLLS) $(GAIM_INSTALL_DIR)
+install_shallow: $(PURPLE_INSTALL_DIR) $(TARGET).dll
+	cp $(TARGET).dll $(PURPLE_INSTALL_DIR)
+	cp $(NEEDED_DLLS) $(PURPLE_INSTALL_DIR)

 install: install_shallow all
-	$(MAKE) -C $(GAIM_PROTOS_TOP) -f $(GAIM_WIN32_MAKEFILE) install
-	$(MAKE) -C $(GAIM_LIB_PLUGINS_TOP) -f $(GAIM_WIN32_MAKEFILE) install
+	$(MAKE) -C $(PURPLE_PROTOS_TOP) -f $(MINGW_MAKEFILE) install
+	$(MAKE) -C $(PURPLE_PLUGINS_TOP) -f $(MINGW_MAKEFILE) install

-./win32/libpurplerc.rc: ./win32/libpurplerc.rc.in $(GAIM_TOP)/VERSION
-	sed -e 's/@PURPLE_VERSION@/$(GAIM_VERSION)/g' \
+./win32/libpurplerc.rc: ./win32/libpurplerc.rc.in $(PIDGIN_TREE_TOP)/VERSION
+	sed -e 's/@PURPLE_VERSION@/$(PURPLE_VERSION)/g' \
 	    $@.in > $@

-$(OBJECTS): $(GAIM_CONFIG_H)
+$(OBJECTS): $(PURPLE_CONFIG_H)

 $(TARGET).dll $(TARGET).dll.a: $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -Wl,--out-implib,$(TARGET).dll.a -o $(TARGET).dll
@@ -128,7 +128,7 @@
 clean:
 	rm -f $(OBJECTS) $(RC_SRC)
 	rm -f $(TARGET).dll $(TARGET).dll.a
-	$(MAKE) -C $(GAIM_PROTOS_TOP) -f $(GAIM_WIN32_MAKEFILE) clean
-	$(MAKE) -C $(GAIM_LIB_PLUGINS_TOP) -f $(GAIM_WIN32_MAKEFILE) clean
+	$(MAKE) -C $(PURPLE_PROTOS_TOP) -f $(MINGW_MAKEFILE) clean
+	$(MAKE) -C $(PURPLE_PLUGINS_TOP) -f $(MINGW_MAKEFILE) clean

-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
--- a/libpurple/plugins/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/libpurple/plugins/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -1,11 +1,11 @@
 #
 # Makefile.mingw
 #
-# Description: Makefile for win32 (mingw) version of Gaim Plugins
+# Description: Makefile for win32 (mingw) version of LibPurple Plugins
 #

-GAIM_TOP := ../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak

 PERL_PLUGIN := ./perl
 TCL_PLUGIN := ./tcl
@@ -21,12 +21,12 @@
 			-I$(GTK_TOP)/include \
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
-			-I$(GAIM_TOP) \
-			-I$(GAIM_LIB_TOP) \
-			-I$(GAIM_LIB_TOP)/win32
+			-I$(PIDGIN_TREE_TOP) \
+			-I$(PURPLE_TOP) \
+			-I$(PURPLE_TOP)/win32

 LIB_PATHS =		-L$(GTK_TOP)/lib \
-			-L$(GAIM_LIB_TOP)
+			-L$(PURPLE_TOP)

 ##
 ## LIBRARIES
@@ -44,16 +44,16 @@
 ##
 .PHONY: all clean plugins install

-all: $(GAIM_LIBGAIM_DLL).a plugins
-	$(MAKE) -C $(PERL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE)
-	$(MAKE) -C $(TCL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE)
-	$(MAKE) -C $(SSL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE)
+all: $(PURPLE_DLL).a plugins
+	$(MAKE) -C $(PERL_PLUGIN) -f $(MINGW_MAKEFILE)
+	$(MAKE) -C $(TCL_PLUGIN) -f $(MINGW_MAKEFILE)
+	$(MAKE) -C $(SSL_PLUGIN) -f $(MINGW_MAKEFILE)

-install: all $(GAIM_INSTALL_PLUGINS_DIR)
-	$(MAKE) -C $(PERL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) install
-	$(MAKE) -C $(TCL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) install
-	$(MAKE) -C $(SSL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) install
-	cp *.dll $(GAIM_INSTALL_PLUGINS_DIR)
+install: all $(PURPLE_INSTALL_PLUGINS_DIR)
+	$(MAKE) -C $(PERL_PLUGIN) -f $(MINGW_MAKEFILE) install
+	$(MAKE) -C $(TCL_PLUGIN) -f $(MINGW_MAKEFILE) install
+	$(MAKE) -C $(SSL_PLUGIN) -f $(MINGW_MAKEFILE) install
+	cp *.dll $(PURPLE_INSTALL_PLUGINS_DIR)

 .c.dll:
 	$(CC) $(CFLAGS) $(DEFINES) $(INCLUDE_PATHS) -o $@.o -c $<
@@ -75,8 +75,8 @@
 ##
 clean:
 	rm -f *.o *.dll
-	$(MAKE) -C $(PERL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) clean
-	$(MAKE) -C $(TCL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) clean
-	$(MAKE) -C $(SSL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) clean
+	$(MAKE) -C $(PERL_PLUGIN) -f $(MINGW_MAKEFILE) clean
+	$(MAKE) -C $(TCL_PLUGIN) -f $(MINGW_MAKEFILE) clean
+	$(MAKE) -C $(SSL_PLUGIN) -f $(MINGW_MAKEFILE) clean

-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
--- a/libpurple/plugins/perl/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/libpurple/plugins/perl/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -4,8 +4,8 @@
 # Description: Makefile for perl plugin loader plugin.
 #

-GAIM_TOP := ../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak

 TARGET = perl

@@ -16,16 +16,16 @@
 ## INCLUDE PATHS
 ##
 INCLUDE_PATHS +=	-I. \
-			-I$(GAIM_TOP) \
-			-I$(GAIM_LIB_TOP) \
-			-I$(GAIM_LIB_TOP)/win32 \
+			-I$(PIDGIN_TREE_TOP) \
+			-I$(PURPLE_TOP) \
+			-I$(PURPLE_TOP)/win32 \
 			-I$(GTK_TOP)/include \
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
 			-I$(PERL_LIB_TOP)/CORE

 LIB_PATHS =		-L$(GTK_TOP)/lib \
-			-L$(GAIM_LIB_TOP) \
+			-L$(PURPLE_TOP) \
 			-L$(PERL_LIB_TOP)

 ##
@@ -49,7 +49,7 @@
 			-lpurple \
 			-lperl58

-include $(GAIM_COMMON_RULES)
+include $(PIDGIN_COMMON_RULES)

 ##
 ## TARGET DEFINITIONS
@@ -57,18 +57,18 @@
 .PHONY: all install clean

 all: $(TARGET).dll
-	$(MAKE) -C ./common -f $(GAIM_WIN32_MAKEFILE)
+	$(MAKE) -C ./common -f $(MINGW_MAKEFILE)

-install: all $(GAIM_INSTALL_PLUGINS_DIR)
-	cp $(TARGET).dll $(GAIM_INSTALL_PLUGINS_DIR)
-	$(MAKE) -C ./common -f $(GAIM_WIN32_MAKEFILE) install
+install: all $(PURPLE_INSTALL_PLUGINS_DIR)
+	cp $(TARGET).dll $(PURPLE_INSTALL_PLUGINS_DIR)
+	$(MAKE) -C ./common -f $(MINGW_MAKEFILE) install

-$(OBJECTS): $(GAIM_CONFIG_H)
+$(OBJECTS): $(PURPLE_CONFIG_H)

 ##
 ## BUILD DLL
 ##
-$(TARGET).dll $(TARGET).dll.a: $(GAIM_LIBGAIM_DLL).a $(OBJECTS)
+$(TARGET).dll $(TARGET).dll.a: $(PURPLE_DLL).a $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS)  -Wl,--export-all-symbols -Wl,--out-implib,$(TARGET).dll.a -o $(TARGET).dll

 ##
@@ -77,6 +77,6 @@
 clean:
 	rm -rf $(OBJECTS)
 	rm -rf $(TARGET).dll $(TARGET).dll.a
-	$(MAKE) -C ./common -f $(GAIM_WIN32_MAKEFILE) clean
+	$(MAKE) -C ./common -f $(MINGW_MAKEFILE) clean

-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
--- a/libpurple/plugins/perl/common/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/libpurple/plugins/perl/common/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -4,8 +4,8 @@
 # Description: Makefile for Purple perl module.
 #

-GAIM_TOP := ../../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak

 TARGET = Purple
 AUTOSPLIT = lib/auto/Purple/autosplit.ix
@@ -18,8 +18,8 @@
 ## INCLUDE PATHS
 ##
 INCLUDE_PATHS =		-I. \
-			-I$(GAIM_TOP) \
-			-I$(GAIM_LIB_TOP) \
+			-I$(PIDGIN_TREE_TOP) \
+			-I$(PURPLE_TOP) \
 			-I$(GTK_TOP)/include \
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
@@ -27,7 +27,7 @@

 LIB_PATHS = 		-L$(PERL_LIB_TOP) \
 			-L$(PERL_PLUGIN_TOP) \
-			-L$(GAIM_LIB_TOP) \
+			-L$(PURPLE_TOP) \
 			-L$(GTK_TOP)/lib

 ##
@@ -80,7 +80,7 @@
 			-lpurple \
 			-lglib-2.0

-include $(GAIM_COMMON_RULES)
+include $(PIDGIN_COMMON_RULES)

 %.inc:
 	cp fallback/$@ ./
@@ -93,18 +93,18 @@
 all: $(TARGET).dll $(AUTOSPLIT)

 install: all
-	rm -rf $(GAIM_INSTALL_PERLMOD_DIR)
-	cp -R lib $(GAIM_INSTALL_PERLMOD_DIR)
-	cp $(TARGET).dll $(GAIM_INSTALL_PERLMOD_DIR)
+	rm -rf $(PURPLE_INSTALL_PERLMOD_DIR)
+	cp -R lib $(PURPLE_INSTALL_PERLMOD_DIR)
+	cp $(TARGET).dll $(PURPLE_INSTALL_PERLMOD_DIR)

-$(C_FILES): $(GAIM_CONFIG_H)
+$(C_FILES): $(PURPLE_CONFIG_H)

 $(AUTOSPLIT):
 	mkdir -p ./lib/auto
 	cp Purple.pm ./lib
 	$(PERL) -MAutoSplit -e 'autosplit("lib/Purple.pm")'

-$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(GAIM_LIBGAIM_PERL_DLL).a $(FALLBACKS) $(OBJECTS)
+$(TARGET).dll: $(PURPLE_DLL).a $(PURPLE_PERL_DLL).a $(FALLBACKS) $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) -o $(TARGET).dll

 ##
@@ -114,4 +114,4 @@
 	rm -rf $(TARGET).dll $(FALLBACKS) lib
 	rm -f *.o $(C_FILES)

-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
--- a/libpurple/plugins/ssl/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/libpurple/plugins/ssl/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -4,8 +4,8 @@
 # Description: Makefile for ssl plugin.
 #

-GAIM_TOP := ../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak

 ##
 ## VARIABLE DEFINITIONS
@@ -30,14 +30,14 @@
 			-I$(GTK_TOP)/include \
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
-			-I$(GAIM_LIB_TOP) \
-			-I$(GAIM_LIB_TOP)/win32 \
-			-I$(GAIM_TOP) \
+			-I$(PURPLE_TOP) \
+			-I$(PURPLE_TOP)/win32 \
+			-I$(PIDGIN_TREE_TOP) \
 			-I$(NSS_TOP)/include \
 			-I$(NSPR_TOP)/include

 LIB_PATHS =		-L$(GTK_TOP)/lib \
-			-L$(GAIM_LIB_TOP) \
+			-L$(PURPLE_TOP) \
 			-L$(NSS_TOP)/lib \
 			-L$(NSPR_TOP)/lib

@@ -61,7 +61,7 @@
 			-lnspr4 \
 			-lssl3

-include $(GAIM_COMMON_RULES)
+include $(PIDGIN_COMMON_RULES)

 ##
 ## TARGET DEFINITIONS
@@ -70,20 +70,20 @@

 all: $(TARGET).dll $(TARGET_NSS).dll

-install: all $(GAIM_INSTALL_PLUGINS_DIR) $(GAIM_INSTALL_DIR)
-	cp $(TARGET).dll $(GAIM_INSTALL_PLUGINS_DIR)
-	cp $(TARGET_NSS).dll $(GAIM_INSTALL_PLUGINS_DIR)
-	cp $(NEEDED_DLLS) $(GAIM_INSTALL_DIR)
+install: all $(PURPLE_INSTALL_PLUGINS_DIR) $(PURPLE_INSTALL_DIR)
+	cp $(TARGET).dll $(PURPLE_INSTALL_PLUGINS_DIR)
+	cp $(TARGET_NSS).dll $(PURPLE_INSTALL_PLUGINS_DIR)
+	cp $(NEEDED_DLLS) $(PURPLE_INSTALL_DIR)

-$(OBJECTS) $(OBJECTS_NSS): $(GAIM_CONFIG_H)
+$(OBJECTS) $(OBJECTS_NSS): $(PURPLE_CONFIG_H)

 ##
 ## BUILD DLL
 ##
-$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(OBJECTS)
+$(TARGET).dll: $(PURPLE_DLL).a $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll

-$(TARGET_NSS).dll: $(GAIM_LIBGAIM_DLL) $(OBJECTS_NSS)
+$(TARGET_NSS).dll: $(PURPLE_DLL) $(OBJECTS_NSS)
 	$(CC) -shared $(OBJECTS_NSS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET_NSS).dll

 ##
@@ -92,4 +92,4 @@
 clean:
 	rm -f $(OBJECTS) $(OBJECTS_NSS) $(TARGET).dll $(TARGET_NSS).dll

-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
--- a/libpurple/plugins/tcl/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/libpurple/plugins/tcl/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -4,8 +4,8 @@
 # Description: Makefile for tcl plugin loader plugin.
 #

-GAIM_TOP := ../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak

 TARGET = tcl
 TCL_INC_DIR := $(TCL_LIB_TOP)/include
@@ -15,16 +15,16 @@
 ## INCLUDE PATHS
 ##
 INCLUDE_PATHS +=	-I. \
-			-I$(GAIM_TOP) \
-			-I$(GAIM_LIB_TOP) \
-			-I$(GAIM_LIB_TOP)/win32 \
+			-I$(PIDGIN_TREE_TOP) \
+			-I$(PURPLE_TOP) \
+			-I$(PURPLE_TOP)/win32 \
 			-I$(GTK_TOP)/include \
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
 			-I$(TCL_INC_DIR)

 LIB_PATHS +=		-L$(GTK_TOP)/lib \
-			-L$(GAIM_LIB_TOP) \
+			-L$(PURPLE_TOP) \
 			-L$(TCL_LIB_TOP)

 ##
@@ -50,7 +50,7 @@
 			-ltclstub84 \
 			-ltkstub84

-include $(GAIM_COMMON_RULES)
+include $(PIDGIN_COMMON_RULES)

 ##
 ## TARGET DEFINITIONS
@@ -59,12 +59,12 @@

 all: $(TARGET).dll

-install: all $(GAIM_INSTALL_PLUGINS_DIR)
-	cp $(TARGET).dll $(GAIM_INSTALL_PLUGINS_DIR)
+install: all $(PURPLE_INSTALL_PLUGINS_DIR)
+	cp $(TARGET).dll $(PURPLE_INSTALL_PLUGINS_DIR)

-$(OBJECTS): $(GAIM_CONFIG_H)
+$(OBJECTS): $(PURPLE_CONFIG_H)

-$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(OBJECTS)
+$(TARGET).dll: $(PURPLE_DLL).a $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll

 ##
@@ -74,4 +74,4 @@
 	rm -rf $(OBJECTS)
 	rm -rf $(TARGET).dll

-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
--- a/libpurple/protocols/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/libpurple/protocols/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -2,11 +2,11 @@
 #
 # Author: hermanator12002@yahoo.com
 # Date 9/11/02
-# Description: Top Makefile for win32 (mingw) port of Gaim
+# Description: Protocols Makefile for win32 (mingw) port of LibPurple
 #

-GAIM_TOP := ../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak

 SUBDIRS = gg irc jabber msn novell oscar qq sametime silc simple yahoo

@@ -14,16 +14,16 @@

 all:
 	for subdir in $(SUBDIRS); do \
-		$(MAKE) -C $$subdir -f $(GAIM_WIN32_MAKEFILE) || exit 1; \
+		$(MAKE) -C $$subdir -f $(MINGW_MAKEFILE) || exit 1; \
 	done;

 install: all
 	for subdir in $(SUBDIRS); do \
-		$(MAKE) -C $$subdir -f $(GAIM_WIN32_MAKEFILE) install || exit 1; \
+		$(MAKE) -C $$subdir -f $(MINGW_MAKEFILE) install || exit 1; \
 	done;

 clean:
 	for subdir in $(SUBDIRS); do \
-		$(MAKE) -C $$subdir -f $(GAIM_WIN32_MAKEFILE) clean || exit 1; \
+		$(MAKE) -C $$subdir -f $(MINGW_MAKEFILE) clean || exit 1; \
 	done;
--- a/libpurple/protocols/bonjour/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/libpurple/protocols/bonjour/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -4,8 +4,8 @@
 # Description: Makefile for win32 (mingw) version of libbonjour
 #

-GAIM_TOP := ../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak

 TARGET = libbonjour
 NEEDED_DLLS = $(HOWL_TOP)/bin/libhowl-1.dll
@@ -14,10 +14,10 @@
 # Static or Plugin...
 ifeq ($(TYPE),STATIC)
   DEFINES += -DSTATIC
-  DLL_INSTALL_DIR =	$(GAIM_INSTALL_DIR)
+  DLL_INSTALL_DIR =	$(PURPLE_INSTALL_DIR)
 else
 ifeq ($(TYPE),PLUGIN)
-  DLL_INSTALL_DIR =	$(GAIM_INSTALL_PLUGINS_DIR)
+  DLL_INSTALL_DIR =	$(PURPLE_INSTALL_PLUGINS_DIR)
 endif
 endif

@@ -29,13 +29,13 @@
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
 			-I$(HOWL_TOP)/include \
-			-I$(GAIM_LIB_TOP) \
-			-I$(GAIM_LIB_TOP)/win32 \
-			-I$(GAIM_TOP)
+			-I$(PURPLE_TOP) \
+			-I$(PURPLE_TOP)/win32 \
+			-I$(PIDGIN_TREE_TOP)

 LIB_PATHS =		-L$(GTK_TOP)/lib \
 			-L$(HOWL_TOP)/lib \
-			-L$(GAIM_LIB_TOP)
+			-L$(PURPLE_TOP)

 ##
 ##  SOURCES, OBJECTS
@@ -57,7 +57,7 @@
 			-lhowl \
 			-lpurple

-include $(GAIM_COMMON_RULES)
+include $(PIDGIN_COMMON_RULES)

 ##
 ## TARGET DEFINITIONS
@@ -68,11 +68,11 @@

 install: all $(DLL_INSTALL_DIR)
 	cp $(TARGET).dll $(DLL_INSTALL_DIR)
-	cp $(NEEDED_DLLS) $(GAIM_INSTALL_DIR)
+	cp $(NEEDED_DLLS) $(PURPLE_INSTALL_DIR)

-$(OBJECTS): $(GAIM_CONFIG_H)
+$(OBJECTS): $(PURPLE_CONFIG_H)

-$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(OBJECTS)
+$(TARGET).dll: $(PURPLE_DLL).a $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll

 ##
@@ -83,4 +83,4 @@
 	rm -f $(OBJECTS)
 	rm -f $(TARGET).dll

-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
--- a/libpurple/protocols/gg/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/libpurple/protocols/gg/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -4,8 +4,8 @@
 # Description: Makefile for win32 (mingw) version of libgg
 #

-GAIM_TOP := ../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak

 TARGET = libgg
 CFLAGS += -include win32dep.h
@@ -14,10 +14,10 @@
 # Static or Plugin...
 ifeq ($(TYPE),STATIC)
   DEFINES += -DSTATIC
-  DLL_INSTALL_DIR =	$(GAIM_INSTALL_DIR)
+  DLL_INSTALL_DIR =	$(PURPLE_INSTALL_DIR)
 else
 ifeq ($(TYPE),PLUGIN)
-  DLL_INSTALL_DIR =	$(GAIM_INSTALL_PLUGINS_DIR)
+  DLL_INSTALL_DIR =	$(PURPLE_INSTALL_PLUGINS_DIR)
 endif
 endif

@@ -29,12 +29,12 @@
 			-I$(GTK_TOP)/include \
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
-			-I$(GAIM_LIB_TOP) \
-			-I$(GAIM_LIB_TOP)/win32 \
-			-I$(GAIM_TOP)
+			-I$(PURPLE_TOP) \
+			-I$(PURPLE_TOP)/win32 \
+			-I$(PIDGIN_TREE_TOP)

 LIB_PATHS =		-L$(GTK_TOP)/lib \
-			-L$(GAIM_LIB_TOP) \
+			-L$(PURPLE_TOP) \

 ##
 ##  SOURCES, OBJECTS
@@ -64,7 +64,7 @@
 			-lpurple \
 			-lws2_32

-include $(GAIM_COMMON_RULES)
+include $(PIDGIN_COMMON_RULES)

 ##
 ## TARGET DEFINITIONS
@@ -76,9 +76,9 @@
 install: all $(DLL_INSTALL_DIR)
 	cp $(TARGET).dll $(DLL_INSTALL_DIR)

-$(OBJECTS): $(GAIM_CONFIG_H)
+$(OBJECTS): $(PURPLE_CONFIG_H)

-$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(OBJECTS)
+$(TARGET).dll: $(PURPLE_DLL).a $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll

 ##
@@ -88,4 +88,4 @@
 	rm -f $(OBJECTS)
 	rm -f $(TARGET).dll

-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
--- a/libpurple/protocols/irc/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/libpurple/protocols/irc/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -4,8 +4,8 @@
 # Description: Makefile for win32 (mingw) version of libirc
 #

-GAIM_TOP := ../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak

 TARGET = libirc
 TYPE = PLUGIN
@@ -13,10 +13,10 @@
 # Static or Plugin...
 ifeq ($(TYPE),STATIC)
   DEFINES += -DSTATIC
-  DLL_INSTALL_DIR =	$(GAIM_INSTALL_DIR)
+  DLL_INSTALL_DIR =	$(PURPLE_INSTALL_DIR)
 else
 ifeq ($(TYPE),PLUGIN)
-  DLL_INSTALL_DIR =	$(GAIM_INSTALL_PLUGINS_DIR)
+  DLL_INSTALL_DIR =	$(PURPLE_INSTALL_PLUGINS_DIR)
 endif
 endif

@@ -27,12 +27,12 @@
 			-I$(GTK_TOP)/include \
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
-			-I$(GAIM_LIB_TOP) \
-			-I$(GAIM_LIB_TOP)/win32 \
-			-I$(GAIM_TOP)
+			-I$(PURPLE_TOP) \
+			-I$(PURPLE_TOP)/win32 \
+			-I$(PIDGIN_TREE_TOP)

 LIB_PATHS =		-L$(GTK_TOP)/lib \
-			-L$(GAIM_LIB_TOP)
+			-L$(PURPLE_TOP)

 ##
 ##  SOURCES, OBJECTS
@@ -54,7 +54,7 @@
 			-lintl \
 			-lpurple

-include $(GAIM_COMMON_RULES)
+include $(PIDGIN_COMMON_RULES)

 ##
 ## TARGET DEFINITIONS
@@ -66,12 +66,12 @@
 install: all $(DLL_INSTALL_DIR)
 	cp $(TARGET).dll $(DLL_INSTALL_DIR)

-$(OBJECTS): $(GAIM_CONFIG_H)
+$(OBJECTS): $(PURPLE_CONFIG_H)

 ##
 ## BUILD DLL
 ##
-$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(OBJECTS)
+$(TARGET).dll: $(PURPLE_DLL).a $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll

 ##
@@ -82,4 +82,4 @@
 	rm -f $(OBJECTS)
 	rm -f $(TARGET).dll

-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
--- a/libpurple/protocols/jabber/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/libpurple/protocols/jabber/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -4,8 +4,8 @@
 # Description: Makefile for win32 (mingw) version of libjabber
 #

-GAIM_TOP := ../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak

 TARGET = libjabber
 TYPE = PLUGIN
@@ -13,10 +13,10 @@
 # Static or Plugin...
 ifeq ($(TYPE),STATIC)
   DEFINES += -DSTATIC
-  DLL_INSTALL_DIR =	$(GAIM_INSTALL_DIR)
+  DLL_INSTALL_DIR =	$(PURPLE_INSTALL_DIR)
 else
 ifeq ($(TYPE),PLUGIN)
-  DLL_INSTALL_DIR =	$(GAIM_INSTALL_PLUGINS_DIR)
+  DLL_INSTALL_DIR =	$(PURPLE_INSTALL_PLUGINS_DIR)
 endif
 endif

@@ -29,13 +29,13 @@
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
 			-I$(LIBXML2_TOP)/include \
-			-I$(GAIM_LIB_TOP) \
-			-I$(GAIM_LIB_TOP)/win32 \
-			-I$(GAIM_TOP)
+			-I$(PURPLE_TOP) \
+			-I$(PURPLE_TOP)/win32 \
+			-I$(PIDGIN_TREE_TOP)

 LIB_PATHS =		-L$(GTK_TOP)/lib \
 			-L$(LIBXML2_TOP)/lib \
-			-L$(GAIM_LIB_TOP)
+			-L$(PURPLE_TOP)

 ##
 ##  SOURCES, OBJECTS
@@ -69,7 +69,7 @@
 			-lintl \
 			-lpurple

-include $(GAIM_COMMON_RULES)
+include $(PIDGIN_COMMON_RULES)

 ##
 ## TARGET DEFINITIONS
@@ -81,9 +81,9 @@
 install: all $(DLL_INSTALL_DIR)
 	cp $(TARGET).dll $(DLL_INSTALL_DIR)

-$(OBJECTS): $(GAIM_CONFIG_H)
+$(OBJECTS): $(PURPLE_CONFIG_H)

-$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(OBJECTS)
+$(TARGET).dll: $(PURPLE_DLL).a $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll

 ##
@@ -93,4 +93,4 @@
 	rm -f $(OBJECTS)
 	rm -f $(TARGET).dll

-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
--- a/libpurple/protocols/msn/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/libpurple/protocols/msn/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -4,8 +4,8 @@
 # Description: Makefile for win32 (mingw) version of libmsn
 #

-GAIM_TOP := ../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak

 TARGET = libmsn
 TYPE = PLUGIN
@@ -13,10 +13,10 @@
 # Static or Plugin...
 ifeq ($(TYPE),STATIC)
   DEFINES += -DSTATIC
-  DLL_INSTALL_DIR =	$(GAIM_INSTALL_DIR)
+  DLL_INSTALL_DIR =	$(PURPLE_INSTALL_DIR)
 else
 ifeq ($(TYPE),PLUGIN)
-  DLL_INSTALL_DIR =	$(GAIM_INSTALL_PLUGINS_DIR)
+  DLL_INSTALL_DIR =	$(PURPLE_INSTALL_PLUGINS_DIR)
 endif
 endif

@@ -27,12 +27,12 @@
 			-I$(GTK_TOP)/include \
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
-			-I$(GAIM_LIB_TOP) \
-			-I$(GAIM_LIB_TOP)/win32 \
-			-I$(GAIM_TOP)
+			-I$(PURPLE_TOP) \
+			-I$(PURPLE_TOP)/win32 \
+			-I$(PIDGIN_TREE_TOP)

 LIB_PATHS =		-L$(GTK_TOP)/lib \
-			-L$(GAIM_LIB_TOP)
+			-L$(PURPLE_TOP)

 ##
 ##  SOURCES, OBJECTS
@@ -78,7 +78,7 @@
 			-lws2_32 \
 			-lpurple

-include $(GAIM_COMMON_RULES)
+include $(PIDGIN_COMMON_RULES)

 ##
 ## TARGET DEFINITIONS
@@ -90,9 +90,9 @@
 install: all $(DLL_INSTALL_DIR)
 	cp $(TARGET).dll $(DLL_INSTALL_DIR)

-$(OBJECTS): $(GAIM_CONFIG_H)
+$(OBJECTS): $(PURPLE_CONFIG_H)

-$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(OBJECTS)
+$(TARGET).dll: $(PURPLE_DLL).a $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll

 ##
@@ -102,4 +102,4 @@
 	rm -f $(OBJECTS)
 	rm -f $(TARGET).dll

-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
--- a/libpurple/protocols/novell/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/libpurple/protocols/novell/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -4,8 +4,8 @@
 # Description: Makefile for win32 (mingw) version of libnovell
 #

-GAIM_TOP := ../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak

 TARGET = libnovell
 TYPE = PLUGIN
@@ -13,10 +13,10 @@
 # Static or Plugin...
 ifeq ($(TYPE),STATIC)
   DEFINES += -DSTATIC
-  DLL_INSTALL_DIR =	$(GAIM_INSTALL_DIR)
+  DLL_INSTALL_DIR =	$(PURPLE_INSTALL_DIR)
 else
 ifeq ($(TYPE),PLUGIN)
-  DLL_INSTALL_DIR =	$(GAIM_INSTALL_PLUGINS_DIR)
+  DLL_INSTALL_DIR =	$(PURPLE_INSTALL_PLUGINS_DIR)
 endif
 endif

@@ -27,12 +27,12 @@
 			-I$(GTK_TOP)/include \
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
-			-I$(GAIM_LIB_TOP) \
-			-I$(GAIM_LIB_TOP)/win32 \
-			-I$(GAIM_TOP)
+			-I$(PURPLE_TOP) \
+			-I$(PURPLE_TOP)/win32 \
+			-I$(PIDGIN_TREE_TOP)

 LIB_PATHS =		-L$(GTK_TOP)/lib \
-			-L$(GAIM_LIB_TOP)
+			-L$(PURPLE_TOP)

 ##
 ##  SOURCES, OBJECTS
@@ -61,7 +61,7 @@
 			-lintl \
 			-lpurple

-include $(GAIM_COMMON_RULES)
+include $(PIDGIN_COMMON_RULES)

 ##
 ## TARGET DEFINITIONS
@@ -73,9 +73,9 @@
 install: all $(DLL_INSTALL_DIR)
 	cp $(TARGET).dll $(DLL_INSTALL_DIR)

-$(OBJECTS): $(GAIM_CONFIG_H)
+$(OBJECTS): $(PURPLE_CONFIG_H)

-$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(OBJECTS)
+$(TARGET).dll: $(PURPLE_DLL).a $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll

 ##
@@ -85,4 +85,4 @@
 	rm -f $(OBJECTS)
 	rm -f $(TARGET).dll

-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
--- a/libpurple/protocols/oscar/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/libpurple/protocols/oscar/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -4,8 +4,8 @@
 # Description: Makefile for win32 (mingw) version of liboscar
 #

-GAIM_TOP := ../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak

 TARGET = liboscar
 AIM_TARGET = libaim
@@ -15,10 +15,10 @@
 # Static or Plugin...
 ifeq ($(TYPE),STATIC)
   DEFINES += -DSTATIC
-  DLL_INSTALL_DIR =		$(GAIM_INSTALL_DIR)
+  DLL_INSTALL_DIR =		$(PURPLE_INSTALL_DIR)
 else
   ifeq ($(TYPE),PLUGIN)
-    DLL_INSTALL_DIR =	$(GAIM_INSTALL_PLUGINS_DIR)
+    DLL_INSTALL_DIR =	$(PURPLE_INSTALL_PLUGINS_DIR)
   endif
 endif

@@ -29,12 +29,12 @@
 			-I$(GTK_TOP)/include \
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
-			-I$(GAIM_LIB_TOP) \
-			-I$(GAIM_LIB_TOP)/win32 \
-			-I$(GAIM_TOP)
+			-I$(PURPLE_TOP) \
+			-I$(PURPLE_TOP)/win32 \
+			-I$(PIDGIN_TREE_TOP)

 LIB_PATHS =		-L$(GTK_TOP)/lib \
-			-L$(GAIM_LIB_TOP) \
+			-L$(PURPLE_TOP) \
 			-L.

 ##
@@ -93,7 +93,7 @@
 			-lws2_32 \
 			-lpurple

-include $(GAIM_COMMON_RULES)
+include $(PIDGIN_COMMON_RULES)

 ##
 ## TARGET DEFINITIONS
@@ -104,11 +104,11 @@

 install: all $(DLL_INSTALL_DIR)
 	cp $(AIM_TARGET).dll $(ICQ_TARGET).dll $(DLL_INSTALL_DIR)
-	cp $(TARGET).dll $(GAIM_INSTALL_DIR)
+	cp $(TARGET).dll $(PURPLE_INSTALL_DIR)

-$(OBJECTS): $(GAIM_CONFIG_H)
+$(OBJECTS): $(PURPLE_CONFIG_H)

-$(TARGET).dll.a $(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(OBJECTS)
+$(TARGET).dll.a $(TARGET).dll: $(PURPLE_DLL).a $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -Wl,--out-implib,$(TARGET).dll.a -o $(TARGET).dll

 $(AIM_TARGET).dll: $(TARGET).dll.a $(AIM_OBJECTS)
@@ -125,4 +125,4 @@
 	rm -f $(AIM_OBJECTS) $(AIM_TARGET).dll
 	rm -f $(ICQ_OBJECTS) $(ICQ_TARGET).dll

-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
--- a/libpurple/protocols/qq/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/libpurple/protocols/qq/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -4,8 +4,8 @@
 # Description: Makefile for win32 (mingw) version of the QQ prpl
 #

-GAIM_TOP := ../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak

 TARGET = libqq
 TYPE = PLUGIN
@@ -13,10 +13,10 @@
 # Static or Plugin...
 ifeq ($(TYPE),STATIC)
 	DEFINES += -DSTATIC
-	DLL_INSTALL_DIR =	$(GAIM_INSTALL_DIR)
+	DLL_INSTALL_DIR =	$(PURPLE_INSTALL_DIR)
 else
 ifeq ($(TYPE),PLUGIN)
-	DLL_INSTALL_DIR =	$(GAIM_INSTALL_PLUGINS_DIR)
+	DLL_INSTALL_DIR =	$(PURPLE_INSTALL_PLUGINS_DIR)
 endif
 endif

@@ -27,13 +27,13 @@
 	-I$(GTK_TOP)/include \
 	-I$(GTK_TOP)/include/glib-2.0 \
 	-I$(GTK_TOP)/lib/glib-2.0/include \
-	-I$(GAIM_LIB_TOP) \
-	-I$(GAIM_LIB_TOP)/win32 \
-	-I$(GAIM_TOP)
+	-I$(PURPLE_TOP) \
+	-I$(PURPLE_TOP)/win32 \
+	-I$(PIDGIN_TREE_TOP)

 LIB_PATHS = \
 	-L$(GTK_TOP)/lib \
-	-L$(GAIM_LIB_TOP)
+	-L$(PURPLE_TOP)

 ##
 ##  SOURCES, OBJECTS
@@ -84,7 +84,7 @@
 	-lintl \
 	-lpurple

-include $(GAIM_COMMON_RULES)
+include $(PIDGIN_COMMON_RULES)

 ##
 ## TARGET DEFINITIONS
@@ -96,9 +96,9 @@
 install: all $(DLL_INSTALL_DIR)
 	cp $(TARGET).dll $(DLL_INSTALL_DIR)

-$(OBJECTS): $(GAIM_CONFIG_H)
+$(OBJECTS): $(PURPLE_CONFIG_H)

-$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(OBJECTS)
+$(TARGET).dll: $(PURPLE_DLL).a $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll

 ##
@@ -108,4 +108,4 @@
 	rm -f $(OBJECTS)
 	rm -f $(TARGET).dll

-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
--- a/libpurple/protocols/sametime/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/libpurple/protocols/sametime/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -4,8 +4,8 @@
 # Description: Makefile for win32 (mingw) version of libsametime
 #

-GAIM_TOP := ../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak

 TARGET = libsametime
 NEEDED_DLLS = $(MEANWHILE_TOP)/bin/libmeanwhile-1.dll
@@ -14,10 +14,10 @@
 # Static or Plugin...
 ifeq ($(TYPE),STATIC)
   DEFINES += -DSTATIC
-  DLL_INSTALL_DIR = 	$(GAIM_INSTALL_DIR)
+  DLL_INSTALL_DIR = 	$(PURPLE_INSTALL_DIR)
 else
   ifeq ($(TYPE),PLUGIN)
-    DLL_INSTALL_DIR = 	$(GAIM_INSTALL_PLUGINS_DIR)
+    DLL_INSTALL_DIR = 	$(PURPLE_INSTALL_PLUGINS_DIR)
   endif
 endif

@@ -29,13 +29,13 @@
 			-I$(GTK_TOP)/include \
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
-			-I$(GAIM_LIB_TOP) \
-			-I$(GAIM_LIB_TOP)/win32 \
-			-I$(GAIM_TOP)
+			-I$(PURPLE_TOP) \
+			-I$(PURPLE_TOP)/win32 \
+			-I$(PIDGIN_TREE_TOP)

 LIB_PATHS =		-L$(GTK_TOP)/lib \
 			-L$(MEANWHILE_TOP)/lib \
-			-L$(GAIM_LIB_TOP)
+			-L$(PURPLE_TOP)

 ##
 ##  SOURCES, OBJECTS
@@ -54,7 +54,7 @@
 		-lmeanwhile \
 		-lpurple

-include $(GAIM_COMMON_RULES)
+include $(PIDGIN_COMMON_RULES)

 ##
 ## TARGET DEFINITIONS
@@ -63,13 +63,13 @@

 all: $(TARGET).dll

-install: all $(DLL_INSTALL_DIR) $(GAIM_INSTALL_DIR)
+install: all $(DLL_INSTALL_DIR) $(PURPLE_INSTALL_DIR)
 	cp $(TARGET).dll $(DLL_INSTALL_DIR)
-	cp $(NEEDED_DLLS) $(GAIM_INSTALL_DIR)
+	cp $(NEEDED_DLLS) $(PURPLE_INSTALL_DIR)

-$(OBJECTS): $(GAIM_CONFIG_H)
+$(OBJECTS): $(PURPLE_CONFIG_H)

-$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(OBJECTS)
+$(TARGET).dll: $(PURPLE_DLL).a $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll

 ##
@@ -80,4 +80,4 @@
 	rm -f $(OBJECTS)
 	rm -f $(TARGET).dll

-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
--- a/libpurple/protocols/silc/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/libpurple/protocols/silc/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -4,8 +4,8 @@
 # Description: Makefile for win32 (mingw) version of libsilc protocol plugin
 #

-GAIM_TOP := ../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak

 TARGET = libsilc
 NEEDED_DLLS =		$(SILC_TOOLKIT)/lib/silc.dll \
@@ -15,10 +15,10 @@
 # Static or Plugin...
 ifeq ($(TYPE),STATIC)
   DEFINES += -DSTATIC
-  DLL_INSTALL_DIR =	$(GAIM_INSTALL_DIR)
+  DLL_INSTALL_DIR =	$(PURPLE_INSTALL_DIR)
 else
 ifeq ($(TYPE),PLUGIN)
-  DLL_INSTALL_DIR =	$(GAIM_INSTALL_PLUGINS_DIR)
+  DLL_INSTALL_DIR =	$(PURPLE_INSTALL_PLUGINS_DIR)
 endif
 endif

@@ -29,13 +29,13 @@
 			-I$(GTK_TOP)/include \
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
-			-I$(GAIM_LIB_TOP) \
-			-I$(GAIM_LIB_TOP)/win32 \
-			-I$(GAIM_TOP) \
+			-I$(PURPLE_TOP) \
+			-I$(PURPLE_TOP)/win32 \
+			-I$(PIDGIN_TREE_TOP) \
 			-I$(SILC_TOOLKIT)/include

 LIB_PATHS =		-L$(GTK_TOP)/lib \
-			-L$(GAIM_LIB_TOP) \
+			-L$(PURPLE_TOP) \
 			-L$(SILC_TOOLKIT)/lib

 ##
@@ -63,7 +63,7 @@
 			-lsilc \
 			-lsilcclient

-include $(GAIM_COMMON_RULES)
+include $(PIDGIN_COMMON_RULES)

 ##
 ## TARGET DEFINITIONS
@@ -72,13 +72,13 @@

 all: $(TARGET).dll

-install: all $(DLL_INSTALL_DIR) $(GAIM_INSTALL_DIR)
+install: all $(DLL_INSTALL_DIR) $(PURPLE_INSTALL_DIR)
 	cp $(TARGET).dll $(DLL_INSTALL_DIR)
-	cp $(NEEDED_DLLS) $(GAIM_INSTALL_DIR)
+	cp $(NEEDED_DLLS) $(PURPLE_INSTALL_DIR)

-$(OBJECTS): $(GAIM_CONFIG_H)
+$(OBJECTS): $(PURPLE_CONFIG_H)

-$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(OBJECTS)
+$(TARGET).dll: $(PURPLE_DLL).a $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -Wl,--image-base,0x64000000 -o $(TARGET).dll

 ##
@@ -88,4 +88,4 @@
 	rm -f $(OBJECTS)
 	rm -f $(TARGET).dll

-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
--- a/libpurple/protocols/simple/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/libpurple/protocols/simple/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -4,8 +4,8 @@
 # Description: Makefile for win32 (mingw) version of libsimple
 #

-GAIM_TOP := ../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak

 TARGET = libsimple
 TYPE = PLUGIN
@@ -13,10 +13,10 @@
 # Static or Plugin...
 ifeq ($(TYPE),STATIC)
   DEFINES += -DSTATIC
-  DLL_INSTALL_DIR =	$(GAIM_INSTALL_DIR)
+  DLL_INSTALL_DIR =	$(PURPLE_INSTALL_DIR)
 else
 ifeq ($(TYPE),PLUGIN)
-  DLL_INSTALL_DIR =	$(GAIM_INSTALL_PLUGINS_DIR)
+  DLL_INSTALL_DIR =	$(PURPLE_INSTALL_PLUGINS_DIR)
 endif
 endif

@@ -27,12 +27,12 @@
 			-I$(GTK_TOP)/include \
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
-			-I$(GAIM_LIB_TOP) \
-			-I$(GAIM_LIB_TOP)/win32 \
-			-I$(GAIM_TOP)
+			-I$(PURPLE_TOP) \
+			-I$(PURPLE_TOP)/win32 \
+			-I$(PIDGIN_TREE_TOP)

 LIB_PATHS =		-L$(GTK_TOP)/lib \
-			-L$(GAIM_LIB_TOP)
+			-L$(PURPLE_TOP)

 ##
 ##  SOURCES, OBJECTS
@@ -51,7 +51,7 @@
 			-lintl \
 			-lpurple

-include $(GAIM_COMMON_RULES)
+include $(PIDGIN_COMMON_RULES)

 ##
 ## TARGET DEFINITIONS
@@ -63,9 +63,9 @@
 install: all $(DLL_INSTALL_DIR)
 	cp $(TARGET).dll $(DLL_INSTALL_DIR)

-$(OBJECTS): $(GAIM_CONFIG_H)
+$(OBJECTS): $(PURPLE_CONFIG_H)

-$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(OBJECTS)
+$(TARGET).dll: $(PURPLE_DLL).a $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll

 ##
@@ -75,4 +75,4 @@
 	rm -f $(OBJECTS)
 	rm -f $(TARGET).dll

-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
--- a/libpurple/protocols/toc/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/libpurple/protocols/toc/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -4,8 +4,8 @@
 # Description: Makefile for win32 (mingw) version of libtoc
 #

-GAIM_TOP := ../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak

 TARGET = libtoc
 TYPE = PLUGIN
@@ -13,10 +13,10 @@
 # Static or Plugin...
 ifeq ($(TYPE),STATIC)
   DEFINES += -DSTATIC
-  DLL_INSTALL_DIR =	$(GAIM_INSTALL_DIR)
+  DLL_INSTALL_DIR =	$(PURPLE_INSTALL_DIR)
 else
 ifeq ($(TYPE),PLUGIN)
-  DLL_INSTALL_DIR =	$(GAIM_INSTALL_PLUGINS_DIR)
+  DLL_INSTALL_DIR =	$(PURPLE_INSTALL_PLUGINS_DIR)
 endif
 endif

@@ -27,12 +27,12 @@
 			-I$(GTK_TOP)/include \
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
-			-I$(LIBGAIM_TOP) \
-			-I$(LIBGAIM_TOP)/win32 \
-			-I$(GAIM_TOP)
+			-I$(LIBPIDGIN_TREE_TOP) \
+			-I$(LIBPIDGIN_TREE_TOP)/win32 \
+			-I$(PIDGIN_TREE_TOP)

 LIB_PATHS =		-L$(GTK_TOP)/lib \
-			-L$(LIBGAIM_TOP)
+			-L$(LIBPIDGIN_TREE_TOP)

 ##
 ##  SOURCES, OBJECTS
@@ -50,7 +50,7 @@
 			-lintl \
 			-lpurple

-include $(GAIM_COMMON_RULES)
+include $(PIDGIN_COMMON_RULES)

 ##
 ## TARGET DEFINITIONS
@@ -63,9 +63,9 @@
 install: all $(DLL_INSTALL_DIR)
 	cp $(TARGET).dll $(DLL_INSTALL_DIR)

-$(OBJECTS): $(GAIM_CONFIG_H)
+$(OBJECTS): $(PURPLE_CONFIG_H)

-$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(OBJECTS)
+$(TARGET).dll: $(PURPLE_DLL).a $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll

 ##
@@ -75,4 +75,4 @@
 	rm -f $(OBJECTS)
 	rm -f $(TARGET).dll

-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
--- a/libpurple/protocols/yahoo/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/libpurple/protocols/yahoo/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -4,8 +4,8 @@
 # Description: Makefile for win32 (mingw) version of libyahoo
 #

-GAIM_TOP := ../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak

 TARGET = libyahoo
 TYPE = PLUGIN
@@ -13,10 +13,10 @@
 # Static or Plugin...
 ifeq ($(TYPE),STATIC)
   DEFINES += -DSTATIC
-  DLL_INSTALL_DIR =	$(GAIM_INSTALL_DIR)
+  DLL_INSTALL_DIR =	$(PURPLE_INSTALL_DIR)
 else
 ifeq ($(TYPE),PLUGIN)
-  DLL_INSTALL_DIR =	$(GAIM_INSTALL_PLUGINS_DIR)
+  DLL_INSTALL_DIR =	$(PURPLE_INSTALL_PLUGINS_DIR)
 endif
 endif

@@ -27,12 +27,12 @@
 			-I$(GTK_TOP)/include \
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
-			-I$(GAIM_LIB_TOP) \
-			-I$(GAIM_LIB_TOP)/win32 \
-			-I$(GAIM_TOP)
+			-I$(PURPLE_TOP) \
+			-I$(PURPLE_TOP)/win32 \
+			-I$(PIDGIN_TREE_TOP)

 LIB_PATHS =		-L$(GTK_TOP)/lib \
-			-L$(GAIM_LIB_TOP)
+			-L$(PURPLE_TOP)

 ##
 ##  SOURCES, OBJECTS
@@ -61,7 +61,7 @@
 			-lintl \
 			-lpurple

-include $(GAIM_COMMON_RULES)
+include $(PIDGIN_COMMON_RULES)

 ##
 ## TARGET DEFINITIONS
@@ -74,9 +74,9 @@
 install: all $(DLL_INSTALL_DIR)
 	cp $(TARGET).dll $(DLL_INSTALL_DIR)

-$(OBJECTS): $(GAIM_CONFIG_H)
+$(OBJECTS): $(PURPLE_CONFIG_H)

-$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(OBJECTS)
+$(TARGET).dll: $(PURPLE_DLL).a $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll

 ##
@@ -86,4 +86,4 @@
 	rm -f $(OBJECTS)
 	rm -f $(TARGET).dll

-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
--- a/libpurple/protocols/zephyr/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/libpurple/protocols/zephyr/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -4,8 +4,8 @@
 # Description: Makefile for win32 (mingw) version of libzephyr
 #

-GAIM_TOP := ../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak

 TARGET = libzephyr
 KRB4_TOP := $(WIN32_DEV_TOP)/kfw-2.6.3-final.fixed
@@ -20,10 +20,10 @@
 # Static or Plugin...
 ifeq ($(TYPE),STATIC)
   DEFINES += -DSTATIC
-  DLL_INSTALL_DIR =	$(GAIM_INSTALL_DIR)
+  DLL_INSTALL_DIR =	$(PURPLE_INSTALL_DIR)
 else
 ifeq ($(TYPE),PLUGIN)
-  DLL_INSTALL_DIR =	$(GAIM_INSTALL_PLUGINS_DIR)
+  DLL_INSTALL_DIR =	$(PURPLE_INSTALL_PLUGINS_DIR)
 endif
 endif

@@ -34,16 +34,16 @@
 			-I$(GTK_TOP)/include \
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
-			-I$(GAIM_LIB_TOP) \
-			-I$(GAIM_LIB_TOP)/win32 \
-			-I$(GAIM_TOP)
+			-I$(PURPLE_TOP) \
+			-I$(PURPLE_TOP)/win32 \
+			-I$(PIDGIN_TREE_TOP)

 ifeq ($(USE_KRB4), true)
    INCLUDE_PATHS += -I$(KRB4_TOP)/inc/krb4
 endif

 LIB_PATHS =		-L$(GTK_TOP)/lib \
-			-L$(GAIM_LIB_TOP)
+			-L$(PURPLE_TOP)

 ifeq ($(USE_KRB4), true)
   LIB_PATHS+=-L$(KRB4_TOP)/lib/i386
@@ -122,7 +122,7 @@
   LIBS+= -lkrbv4w32
 endif

-include $(GAIM_COMMON_RULES)
+include $(PIDGIN_COMMON_RULES)

 ##
 ## TARGET DEFINITIONS
@@ -134,9 +134,9 @@
 install: all $(DLL_INSTALL_DIR)
 	cp $(TARGET).dll $(DLL_INSTALL_DIR)

-$(OBJECTS): $(GAIM_CONFIG_H)
+$(OBJECTS): $(PURPLE_CONFIG_H)

-$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(OBJECTS)
+$(TARGET).dll: $(PURPLE_DLL).a $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -Wl,--enable-stdcall-fixup -o $(TARGET).dll

 ##
@@ -146,4 +146,4 @@
 	rm -f $(OBJECTS)
 	rm -f $(TARGET).dll

-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
--- a/libpurple/win32/global.mak	Tue Apr 10 16:48:20 2007 +0000
+++ b/libpurple/win32/global.mak	Tue Apr 10 16:54:51 2007 +0000
@@ -2,14 +2,14 @@
 # global.mak
 #
 # This file should be included by all Makefile.mingw files for project
-# wide definitions (after correctly defining GAIM_TOP).
+# wide definitions (after correctly defining PIDGIN_TREE_TOP).
 #

-#include optional $(GAIM_TOP)/local.mak to allow overriding of any definitions
--include $(GAIM_TOP)/local.mak
+#include optional $(PIDGIN_TREE_TOP)/local.mak to allow overriding of any definitions
+-include $(PIDGIN_TREE_TOP)/local.mak

 # Locations of our various dependencies
-WIN32_DEV_TOP ?= $(GAIM_TOP)/../win32-dev
+WIN32_DEV_TOP ?= $(PIDGIN_TREE_TOP)/../win32-dev
 ASPELL_TOP ?= $(WIN32_DEV_TOP)/aspell-dev-0-50-3-3
 GTKSPELL_TOP ?= $(WIN32_DEV_TOP)/gtkspell-2.0.6
 GTK_TOP ?= $(WIN32_DEV_TOP)/gtk_2_0
@@ -24,48 +24,53 @@
 TCL_LIB_TOP ?= $(WIN32_DEV_TOP)/tcl-8.4.5

 # Where we installing this stuff to?
-GAIM_INSTALL_DIR := $(GAIM_TOP)/win32-install-dir
-GAIM_INSTALL_PERLMOD_DIR := $(GAIM_INSTALL_DIR)/perlmod
-GAIM_INSTALL_PLUGINS_DIR := $(GAIM_INSTALL_DIR)/plugins
-GAIM_INSTALL_PO_DIR := $(GAIM_INSTALL_DIR)/locale
+PIDGIN_INSTALL_DIR := $(PIDGIN_TREE_TOP)/win32-install-dir
+PURPLE_INSTALL_DIR := $(PIDGIN_TREE_TOP)/win32-install-dir
+PIDGIN_INSTALL_PERLMOD_DIR := $(PIDGIN_INSTALL_DIR)/perlmod
+PIDGIN_INSTALL_PLUGINS_DIR := $(PIDGIN_INSTALL_DIR)/plugins
+PURPLE_INSTALL_PERLMOD_DIR := $(PURPLE_INSTALL_DIR)/perlmod
+PURPLE_INSTALL_PLUGINS_DIR := $(PURPLE_INSTALL_DIR)/plugins
+PURPLE_INSTALL_PO_DIR := $(PURPLE_INSTALL_DIR)/locale

 # Important (enough) locations in our source code
-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)/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
-GAIM_GTK_SOUNDS_TOP := $(GAIM_GTK_TOP)/sounds
-GAIM_PO_TOP := $(GAIM_TOP)/po
-GAIM_PROTOS_TOP := $(GAIM_LIB_TOP)/protocols
+PURPLE_TOP := $(PIDGIN_TREE_TOP)/libpurple
+PURPLE_PLUGINS_TOP := $(PURPLE_TOP)/plugins
+PURPLE_PERL_TOP := $(PURPLE_PLUGINS_TOP)/perl
+PIDGIN_TOP := $(PIDGIN_TREE_TOP)/pidgin
+PIDGIN_IDLETRACK_TOP := $(PIDGIN_TOP)/win32/IdleTracker
+PIDGIN_PIXMAPS_TOP := $(PIDGIN_TOP)/pixmaps
+PIDGIN_PLUGINS_TOP := $(PIDGIN_TOP)/plugins
+PIDGIN_SOUNDS_TOP := $(PIDGIN_TOP)/sounds
+PURPLE_PO_TOP := $(PIDGIN_TREE_TOP)/po
+PURPLE_PROTOS_TOP := $(PURPLE_TOP)/protocols

 # 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)/libpurple.dll
-GAIM_LIBGAIM_PERL_DLL := $(GAIM_LIB_PERL_TOP)/perl.dll
-GAIM_GTKGAIM_DLL := $(GAIM_GTK_TOP)/pidgin.dll
-GAIM_EXE := $(GAIM_GTK_TOP)/pidgin.exe
-GAIM_PORTABLE_EXE := $(GAIM_GTK_TOP)/pidgin-portable.exe
+PIDGIN_CONFIG_H := $(PIDGIN_TREE_TOP)/config.h
+PURPLE_CONFIG_H := $(PIDGIN_TREE_TOP)/config.h
+PIDGIN_IDLETRACK_DLL := $(PIDGIN_IDLETRACK_TOP)/idletrack.dll
+PURPLE_DLL := $(PURPLE_TOP)/libpurple.dll
+PURPLE_PERL_DLL := $(PURPLE_PERL_TOP)/perl.dll
+PIDGIN_DLL := $(PIDGIN_TOP)/pidgin.dll
+PIDGIN_EXE := $(PIDGIN_TOP)/pidgin.exe
+PIDGIN_PORTABLE_EXE := $(PIDGIN_TOP)/pidgin-portable.exe

 GCCWARNINGS := -Waggregate-return -Wcast-align -Wdeclaration-after-statement -Werror-implicit-function-declaration -Wextra -Wno-sign-compare -Wno-unused-parameter -Winit-self -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wundef

 # parse the version number from the configure.ac file if it is newer
-#AC_INIT([gaim], [2.0.0dev], [gaim-devel@lists.sourceforge.net])
-GAIM_VERSION := $(shell \
-  if [ ! $(GAIM_TOP)/VERSION -nt $(GAIM_TOP)/configure.ac ]; then \
+#AC_INIT([pidgin], [2.0.0dev], [devel@pidgin.im])
+PIDGIN_VERSION := $(shell \
+  if [ ! $(PIDGIN_TREE_TOP)/VERSION -nt $(PIDGIN_TREE_TOP)/configure.ac ]; then \
     awk 'BEGIN {FS="\\] *, *\\["} /^AC_INIT\(.+\)/ {printf("%s",$$2); exit}' \
-      $(GAIM_TOP)/configure.ac > $(GAIM_TOP)/VERSION; \
+      $(PIDGIN_TREE_TOP)/configure.ac > $(PIDGIN_TREE_TOP)/VERSION; \
   fi; \
-  cat $(GAIM_TOP)/VERSION \
+  cat $(PIDGIN_TREE_TOP)/VERSION \
 )
+PURPLE_VERSION := $(PIDGIN_VERSION)

-DEFINES += 	-DVERSION=\"$(GAIM_VERSION)\" \
+DEFINES += 	-DVERSION=\"$(PIDGIN_VERSION)\" \
 		-DHAVE_CONFIG_H

-# Use -g flag when building debug version of Gaim (including plugins).
+# Use -g flag when building debug version of Pidgin (including plugins).
 # Use -fnative-struct instead of -mms-bitfields when using mingw 1.1
 # (gcc 2.95)
 CFLAGS += -O2 -Wall $(GCCWARNINGS) -pipe -mno-cygwin -mms-bitfields -g
@@ -87,6 +92,6 @@
 WINDRES ?= windres
 STRIP ?= strip

-GAIM_COMMON_RULES := $(GAIM_LIB_TOP)/win32/rules.mak
-GAIM_COMMON_TARGETS := $(GAIM_LIB_TOP)/win32/targets.mak
-GAIM_WIN32_MAKEFILE := Makefile.mingw
+PIDGIN_COMMON_RULES := $(PURPLE_TOP)/win32/rules.mak
+PIDGIN_COMMON_TARGETS := $(PURPLE_TOP)/win32/targets.mak
+MINGW_MAKEFILE := Makefile.mingw
--- a/libpurple/win32/rules.mak	Tue Apr 10 16:48:20 2007 +0000
+++ b/libpurple/win32/rules.mak	Tue Apr 10 16:54:51 2007 +0000
@@ -4,7 +4,7 @@
 	$(CC) $(CFLAGS) $(DEFINES) $(INCLUDE_PATHS) -o $@ -c $<

 %.c: %.xs
-	$(PERL) $(EXTUTILS)/xsubpp -typemap $(EXTUTILS)/typemap -typemap $(GAIM_LIB_PERL_TOP)/common/typemap $< > $@
+	$(PERL) $(EXTUTILS)/xsubpp -typemap $(EXTUTILS)/typemap -typemap $(PURPLE_PERL_TOP)/common/typemap $< > $@

 %.o: %.rc
-	$(WINDRES) -I$(GAIM_LIB_TOP) -i $< -o $@
+	$(WINDRES) -I$(PURPLE_TOP) -i $< -o $@
--- a/libpurple/win32/targets.mak	Tue Apr 10 16:48:20 2007 +0000
+++ b/libpurple/win32/targets.mak	Tue Apr 10 16:54:51 2007 +0000
@@ -5,37 +5,37 @@
 # files for better handling of cross directory dependencies
 #

-$(GAIM_CONFIG_H): $(GAIM_TOP)/config.h.mingw
-	cp $(GAIM_TOP)/config.h.mingw $(GAIM_CONFIG_H)
+$(PIDGIN_CONFIG_H): $(PIDGIN_TREE_TOP)/config.h.mingw
+	cp $(PIDGIN_TREE_TOP)/config.h.mingw $(PIDGIN_CONFIG_H)

-$(GAIM_LIBGAIM_DLL) $(GAIM_LIBGAIM_DLL).a:
-	$(MAKE) -C $(GAIM_LIB_TOP) -f $(GAIM_WIN32_MAKEFILE) libpurple.dll
+$(PURPLE_DLL) $(PURPLE_DLL).a:
+	$(MAKE) -C $(PURPLE_TOP) -f $(MINGW_MAKEFILE) libpurple.dll

-$(GAIM_LIBGAIM_PERL_DLL) $(GAIM_LIBGAIM_PERL_DLL).a:
-	$(MAKE) -C $(GAIM_LIB_PERL_TOP) -f $(GAIM_WIN32_MAKEFILE) perl.dll
+$(PURPLE_PERL_DLL) $(PURPLE_PERL_DLL).a:
+	$(MAKE) -C $(PURPLE_PERL_TOP) -f $(MINGW_MAKEFILE) perl.dll

-$(GAIM_GTKGAIM_DLL) $(GAIM_GTKGAIM_DLL).a:
-	$(MAKE) -C $(GAIM_GTK_TOP) -f $(GAIM_WIN32_MAKEFILE) pidgin.dll
+$(PIDGIN_DLL) $(PIDGIN_DLL).a:
+	$(MAKE) -C $(PIDGIN_TOP) -f $(MINGW_MAKEFILE) pidgin.dll

-$(GAIM_IDLETRACK_DLL) $(GAIM_IDLETRACK_DLL).a:
-	$(MAKE) -C $(GAIM_GTK_IDLETRACK_TOP) -f $(GAIM_WIN32_MAKEFILE) idletrack.dll
+$(PIDGIN_IDLETRACK_DLL) $(PIDGIN_IDLETRACK_DLL).a:
+	$(MAKE) -C $(PIDGIN_IDLETRACK_TOP) -f $(MINGW_MAKEFILE) idletrack.dll

-$(GAIM_EXE):
-	$(MAKE) -C $(GAIM_GTK_TOP) -f $(GAIM_WIN32_MAKEFILE) pidgin.exe
+$(PIDGIN_EXE):
+	$(MAKE) -C $(PIDGIN_TOP) -f $(MINGW_MAKEFILE) pidgin.exe

-$(GAIM_PORTABLE_EXE):
-	$(MAKE) -C $(GAIM_GTK_TOP) -f $(GAIM_WIN32_MAKEFILE) pidgin-portable.exe
+$(PIDGIN_PORTABLE_EXE):
+	$(MAKE) -C $(PIDGIN_TOP) -f $(MINGW_MAKEFILE) pidgin-portable.exe

 # Installation Directories
-$(GAIM_INSTALL_DIR):
-	mkdir -p $(GAIM_INSTALL_DIR)
+$(PIDGIN_INSTALL_DIR):
+	mkdir -p $(PIDGIN_INSTALL_DIR)

-$(GAIM_INSTALL_PERLMOD_DIR):
-	mkdir -p $(GAIM_INSTALL_PERLMOD_DIR)
+$(PIDGIN_INSTALL_PERLMOD_DIR):
+	mkdir -p $(PURPLE_INSTALL_PERLMOD_DIR)

-$(GAIM_INSTALL_PLUGINS_DIR):
-	mkdir -p $(GAIM_INSTALL_PLUGINS_DIR)
+$(PIDGIN_INSTALL_PLUGINS_DIR):
+	mkdir -p $(PIDGIN_INSTALL_PLUGINS_DIR)

-$(GAIM_INSTALL_PO_DIR):
-	mkdir -p $(GAIM_INSTALL_PO_DIR)
+$(PURPLE_INSTALL_PO_DIR):
+	mkdir -p $(PURPLE_INSTALL_PO_DIR)
--- a/pidgin/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/pidgin/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -1,11 +1,11 @@
 #
 # Makefile.mingw
 #
-# Description: Makefile for win32 (mingw) version of Gaim
+# Description: Makefile for win32 (mingw) version of Pidgin
 #

-GAIM_TOP := ..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak

 NEEDED_DLLS = $(GTKSPELL_TOP)/gtkspell/libgtkspell.dll

@@ -13,7 +13,7 @@
 ## VARIABLE DEFINITIONS
 ##
 EXE_TARGET := pidgin
-GTKGAIM_TARGET := pidgin
+PIDGIN_TARGET := pidgin
 EXE_NAME := $(EXE_TARGET).exe

 WINAPP := -mwindows
@@ -23,19 +23,19 @@
 ##
 ## INCLUDE PATHS
 ##
-LIBGAIM_INCLUDE_PATHS =	\
-			-I$(GAIM_LIB_TOP) \
-			-I$(GAIM_LIB_TOP)/win32 \
-			-I$(GAIM_TOP) \
+PURPLE_INCLUDE_PATHS =	\
+			-I$(PURPLE_TOP) \
+			-I$(PURPLE_TOP)/win32 \
+			-I$(PIDGIN_TREE_TOP) \
 			-I$(GTK_TOP)/include \
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include

 INCLUDE_PATHS =	\
-			$(LIBGAIM_INCLUDE_PATHS) \
-			-I$(GAIM_GTK_IDLETRACK_TOP) \
-			-I$(GAIM_GTK_TOP) \
-			-I$(GAIM_GTK_TOP)/win32 \
+			$(PURPLE_INCLUDE_PATHS) \
+			-I$(PIDGIN_IDLETRACK_TOP) \
+			-I$(PIDGIN_TOP) \
+			-I$(PIDGIN_TOP)/win32 \
 			-I$(GTK_TOP)/include/gtk-2.0 \
 			-I$(GTK_TOP)/include/pango-1.0 \
 			-I$(GTK_TOP)/include/atk-1.0 \
@@ -44,15 +44,15 @@
 			-I$(ASPELL_TOP)/include

 LIB_PATHS =		-L$(GTK_TOP)/lib \
-			-L$(GAIM_LIB_TOP) \
-			-L$(GAIM_GTK_TOP) \
-			-L$(GAIM_GTK_IDLETRACK_TOP) \
+			-L$(PURPLE_TOP) \
+			-L$(PIDGIN_TOP) \
+			-L$(PIDGIN_IDLETRACK_TOP) \
 			-L$(ASPELL_TOP)/lib

 ##
 ##  SOURCES, OBJECTS
 ##
-GTKGAIM_C_SRC =	\
+PIDGIN_C_SRC =	\
 			gtkaccount.c \
 			gtkblist.c \
 			gtkconn.c \
@@ -95,8 +95,8 @@
 			win32/untar.c \
 			win32/wspell.c

-GTKGAIM_RC_SRC = win32/pidgin_dll_rc.rc
-GTKGAIM_OBJECTS = $(GTKGAIM_C_SRC:%.c=%.o) $(GTKGAIM_RC_SRC:%.rc=%.o)
+PIDGIN_RC_SRC = win32/pidgin_dll_rc.rc
+PIDGIN_OBJECTS = $(PIDGIN_C_SRC:%.c=%.o) $(PIDGIN_RC_SRC:%.rc=%.o)

 EXE_RC_SRC = win32/pidgin_exe_rc.rc
 EXE_C_SRC = win32/winpidgin.c
@@ -105,7 +105,7 @@
 ##
 ## LIBRARIES
 ##
-LIBGAIM_LIBS =	\
+LIBPURPLES =	\
 		-lpurple \
 		-lglib-2.0 \
 		-lgthread-2.0 \
@@ -116,8 +116,8 @@
 		-lwinmm \
 		-lz

-GTKGAIM_LIBS =	\
-		$(LIBGAIM_LIBS) \
+GTKPURPLES =	\
+		$(LIBPURPLES) \
 		-lidletrack \
 		-lgtk-win32-2.0 \
 		-latk-1.0 \
@@ -126,60 +126,60 @@
 		-lgdk_pixbuf-2.0 \
 		-lgdi32

-include $(GAIM_COMMON_RULES)
+include $(PIDGIN_COMMON_RULES)

 ##
 ## TARGET DEFINITIONS
 ##
 .PHONY: all install install_shallow clean clean_exe

-all: $(EXE_TARGET).exe $(GTKGAIM_TARGET).dll
-	$(MAKE) -C $(GAIM_GTK_PLUGINS_TOP) -f $(GAIM_WIN32_MAKEFILE)
+all: $(EXE_TARGET).exe $(PIDGIN_TARGET).dll
+	$(MAKE) -C $(PIDGIN_PLUGINS_TOP) -f $(MINGW_MAKEFILE)

-win32/pidgin_exe_rc.rc: win32/pidgin_exe_rc.rc.in $(GAIM_TOP)/VERSION
-	sed -e 's/@PIDGIN_VERSION@/$(GAIM_VERSION)/g' \
+win32/pidgin_exe_rc.rc: win32/pidgin_exe_rc.rc.in $(PIDGIN_TREE_TOP)/VERSION
+	sed -e 's/@PIDGIN_VERSION@/$(PIDGIN_VERSION)/g' \
 	    -e 's/@ORIGINAL_FILENAME@/$(EXE_NAME)/' \
 	    $@.in > $@

-install_shallow: $(GAIM_INSTALL_DIR) $(EXE_TARGET).exe $(GTKGAIM_TARGET).dll
-	cp $(EXE_TARGET).exe $(GTKGAIM_TARGET).dll $(GAIM_INSTALL_DIR)
-	cp $(NEEDED_DLLS) $(GAIM_INSTALL_DIR)
+install_shallow: $(PIDGIN_INSTALL_DIR) $(EXE_TARGET).exe $(PIDGIN_TARGET).dll
+	cp $(EXE_TARGET).exe $(PIDGIN_TARGET).dll $(PIDGIN_INSTALL_DIR)
+	cp $(NEEDED_DLLS) $(PIDGIN_INSTALL_DIR)

 install: install_shallow all
-	$(MAKE) -C $(GAIM_GTK_PLUGINS_TOP) -f $(GAIM_WIN32_MAKEFILE) install
-	$(MAKE) -C $(GAIM_GTK_PIXMAPS_TOP) -f $(GAIM_WIN32_MAKEFILE) install
-	$(MAKE) -C $(GAIM_GTK_SOUNDS_TOP) -f $(GAIM_WIN32_MAKEFILE) install
-	$(MAKE) -C $(GAIM_GTK_IDLETRACK_TOP) -f $(GAIM_WIN32_MAKEFILE) install
+	$(MAKE) -C $(PIDGIN_PLUGINS_TOP) -f $(MINGW_MAKEFILE) install
+	$(MAKE) -C $(PIDGIN_PIXMAPS_TOP) -f $(MINGW_MAKEFILE) install
+	$(MAKE) -C $(PIDGIN_SOUNDS_TOP) -f $(MINGW_MAKEFILE) install
+	$(MAKE) -C $(PIDGIN_IDLETRACK_TOP) -f $(MINGW_MAKEFILE) install

-win32/pidgin_dll_rc.rc: win32/pidgin_dll_rc.rc.in $(GAIM_TOP)/VERSION
-	sed -e 's/@PIDGIN_VERSION@/$(GAIM_VERSION)/g' \
+win32/pidgin_dll_rc.rc: win32/pidgin_dll_rc.rc.in $(PIDGIN_TREE_TOP)/VERSION
+	sed -e 's/@PIDGIN_VERSION@/$(PIDGIN_VERSION)/g' \
 	    $@.in > $@

-$(EXE_OBJECTS) $(GTKGAIM_OBJECTS): $(GAIM_CONFIG_H)
+$(EXE_OBJECTS) $(PIDGIN_OBJECTS): $(PIDGIN_CONFIG_H)

-$(GTKGAIM_TARGET).dll $(GTKGAIM_TARGET).dll.a: $(GAIM_LIBGAIM_DLL).a $(GAIM_IDLETRACK_DLL).a $(GTKGAIM_OBJECTS)
-	$(CC) -shared $(GTKGAIM_OBJECTS) $(LIB_PATHS) $(GTKGAIM_LIBS) $(DLL_LD_FLAGS) -Wl,--out-implib,$(GTKGAIM_TARGET).dll.a -o $(GTKGAIM_TARGET).dll
+$(PIDGIN_TARGET).dll $(PIDGIN_TARGET).dll.a: $(PURPLE_DLL).a $(PIDGIN_IDLETRACK_DLL).a $(PIDGIN_OBJECTS)
+	$(CC) -shared $(PIDGIN_OBJECTS) $(LIB_PATHS) $(GTKPURPLES) $(DLL_LD_FLAGS) -Wl,--out-implib,$(PIDGIN_TARGET).dll.a -o $(PIDGIN_TARGET).dll

-$(EXE_TARGET).exe: $(GAIM_CONFIG_H) $(GAIM_GTKGAIM_DLL).a $(GAIM_IDLETRACK_DLL).a $(EXE_OBJECTS)
+$(EXE_TARGET).exe: $(PIDGIN_CONFIG_H) $(PIDGIN_DLL).a $(PIDGIN_IDLETRACK_DLL).a $(EXE_OBJECTS)
 	$(CC) $(LDFLAGS) $(EXE_OBJECTS) -o $(EXE_TARGET).exe

 $(EXE_TARGET)-portable.exe: DEFINES += -DPORTABLE
 $(EXE_TARGET)-portable.exe: EXE_NAME := $(EXE_TARGET)-portable.exe
-$(EXE_TARGET)-portable.exe: clean_exe $(GAIM_CONFIG_H) $(GAIM_GTKGAIM_DLL).a $(GAIM_IDLETRACK_DLL).a $(EXE_OBJECTS)
+$(EXE_TARGET)-portable.exe: clean_exe $(PIDGIN_CONFIG_H) $(PIDGIN_DLL).a $(PIDGIN_IDLETRACK_DLL).a $(EXE_OBJECTS)
 	$(CC) $(LDFLAGS) $(EXE_OBJECTS) -o $(EXE_TARGET)-portable.exe
-	$(MAKE) -f $(GAIM_WIN32_MAKEFILE) clean_exe
+	$(MAKE) -f $(MINGW_MAKEFILE) clean_exe

 ##
 ## CLEAN RULES
 ##
 clean:
-	$(MAKE) -C $(GAIM_GTK_IDLETRACK_TOP) -f $(GAIM_WIN32_MAKEFILE) clean
-	$(MAKE) -C $(GAIM_GTK_PLUGINS_TOP) -f $(GAIM_WIN32_MAKEFILE) clean
-	rm -f $(GTKGAIM_OBJECTS) $(GTKGAIM_RC_SRC) $(EXE_OBJECTS) $(EXE_RC_SRC)
-	rm -f $(GTKGAIM_TARGET).dll $(GTKGAIM_TARGET).dll.a
+	$(MAKE) -C $(PIDGIN_IDLETRACK_TOP) -f $(MINGW_MAKEFILE) clean
+	$(MAKE) -C $(PIDGIN_PLUGINS_TOP) -f $(MINGW_MAKEFILE) clean
+	rm -f $(PIDGIN_OBJECTS) $(PIDGIN_RC_SRC) $(EXE_OBJECTS) $(EXE_RC_SRC)
+	rm -f $(PIDGIN_TARGET).dll $(PIDGIN_TARGET).dll.a
 	rm -f $(EXE_TARGET).exe $(EXE_TARGET)-portable.exe

 clean_exe:
 	rm -f $(EXE_OBJECTS) $(EXE_RC_SRC)

-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
--- a/pidgin/gtkdialogs.c	Tue Apr 10 16:48:20 2007 +0000
+++ b/pidgin/gtkdialogs.c	Tue Apr 10 16:54:51 2007 +0000
@@ -182,7 +182,7 @@
 	{N_("Romanian"),            "ro", "Mişu Moldovan", "dumol@gnome.ro"},
 	{N_("Russian"),             "ru", "Dmitry Beloglazov", "dmaa@users.sf.net"},
 	{N_("Slovak"),              "sk", "Jozef Káčer", "quickparser@gmail.com"},
-	{N_("Slovack"),             "sk", "loptosko", "loptosko@gmail.com"},
+	{N_("Slovak"),              "sk", "loptosko", "loptosko@gmail.com"},
 	{N_("Slovenian"),           "sl", "Martin Srebotnjak", "miles@filmsi.net"},
 	{N_("Albanian"),            "sq", "Besnik Bleta", "besnik@programeshqip.org"},
 	{N_("Serbian"),             "sr", "Danilo Šegan", "dsegan@gmx.net"},
--- a/pidgin/pixmaps/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/pidgin/pixmaps/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -1,41 +1,41 @@
-#
-# Makefile.mingw
-#
-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
-#
-
-GAIM_TOP := ../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
-
-datadir := $(GAIM_INSTALL_DIR)
-include ./Makefile.am
-
-.PHONY: install
-
-install:
-	if test '$(SUBDIRS)'; then \
-	  list='$(SUBDIRS)'; for subdir in $$list; do \
-	    $(MAKE) -C $$subdir -f $(GAIM_WIN32_MAKEFILE) install || exit 1 ;\
-	  done; \
-	fi;
-	if test '$(pidginbuttonpix_DATA)'; then \
-	  mkdir -p $(pidginbuttonpixdir); \
-	  cp $(pidginbuttonpix_DATA) $(pidginbuttonpixdir); \
-	fi;
-	if test '$(pidgindialogpix_DATA)'; then \
-	  mkdir -p $(pidgindialogpixdir); \
-	  cp $(pidgindialogpix_DATA) $(pidgindialogpixdir); \
-	fi;
-	if test '$(pidginiconpix_DATA)'; then \
-	  mkdir -p $(pidginiconpixdir); \
-	  cp $(pidginiconpix_DATA) $(pidginiconpixdir); \
-	fi;
-	if test '$(pidgindistpix_DATA)'; then \
-	  mkdir -p $(pidgindistpixdir); \
-	  cp $(pidgindistpix_DATA) $(pidgindistpixdir); \
-	fi;
-#	if test '$(distpixmap_DATA)'; then \
-#	  mkdir -p $(distpixmapdir); \
-#	  cp $(distpixmap_DATA) $(distpixmapdir); \
-#	fi;
-
+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+PIDGIN_TREE_TOP := ../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
+
+datadir := $(PIDGIN_INSTALL_DIR)
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(SUBDIRS)'; then \
+	  list='$(SUBDIRS)'; for subdir in $$list; do \
+	    $(MAKE) -C $$subdir -f $(MINGW_MAKEFILE) install || exit 1 ;\
+	  done; \
+	fi;
+	if test '$(pidginbuttonpix_DATA)'; then \
+	  mkdir -p $(pidginbuttonpixdir); \
+	  cp $(pidginbuttonpix_DATA) $(pidginbuttonpixdir); \
+	fi;
+	if test '$(pidgindialogpix_DATA)'; then \
+	  mkdir -p $(pidgindialogpixdir); \
+	  cp $(pidgindialogpix_DATA) $(pidgindialogpixdir); \
+	fi;
+	if test '$(pidginiconpix_DATA)'; then \
+	  mkdir -p $(pidginiconpixdir); \
+	  cp $(pidginiconpix_DATA) $(pidginiconpixdir); \
+	fi;
+	if test '$(pidgindistpix_DATA)'; then \
+	  mkdir -p $(pidgindistpixdir); \
+	  cp $(pidgindistpix_DATA) $(pidgindistpixdir); \
+	fi;
+#	if test '$(distpixmap_DATA)'; then \
+#	  mkdir -p $(distpixmapdir); \
+#	  cp $(distpixmap_DATA) $(distpixmapdir); \
+#	fi;
+
--- a/pidgin/pixmaps/animations/16/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/pidgin/pixmaps/animations/16/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -1,20 +1,20 @@
-#
-# Makefile.mingw
-#
-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
-#
-
-GAIM_TOP := ../../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
-
-datadir = $(GAIM_INSTALL_DIR)
-include ./Makefile.am
-
-.PHONY: install
-
-install:
-	if test '$(pidginanimpix_DATA)'; then \
-	  mkdir -p $(pidginanimpixdir); \
-	  cp $(pidginanimpix_DATA) $(pidginanimpixdir); \
-	fi;
-
+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+PIDGIN_TREE_TOP := ../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
+
+datadir = $(PIDGIN_INSTALL_DIR)
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(pidginanimpix_DATA)'; then \
+	  mkdir -p $(pidginanimpixdir); \
+	  cp $(pidginanimpix_DATA) $(pidginanimpixdir); \
+	fi;
+
--- a/pidgin/pixmaps/animations/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/pidgin/pixmaps/animations/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -1,7 +1,7 @@
 #
 # Makefile.mingw
 #
-# Description: Makefile for win32 (mingw) version of Gaim pixmaps
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
 #

 include ./Makefile.am
--- a/pidgin/pixmaps/buddy_icons/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/pidgin/pixmaps/buddy_icons/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -1,7 +1,7 @@
 #
 # Makefile.mingw
 #
-# Description: Makefile for win32 (mingw) version of Gaim pixmaps
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
 #

 include ./Makefile.am
--- a/pidgin/pixmaps/buddy_icons/qq/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/pidgin/pixmaps/buddy_icons/qq/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -1,14 +1,14 @@
 #
 ## Makefile.mingw
 #
-## Description: Makefile for win32 (mingw) version of Gaim QQ buddy icons
+## Description: Makefile for win32 (mingw) version of Pidgin QQ buddy icons
 #
 #

-GAIM_TOP = ../../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP = ../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak

-datadir = $(GAIM_INSTALL_DIR)
+datadir = $(PIDGIN_INSTALL_DIR)
 include ./Makefile.am

 install:
--- a/pidgin/pixmaps/dialogs/16/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/pidgin/pixmaps/dialogs/16/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -1,20 +1,20 @@
-#
-# Makefile.mingw
-#
-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
-#
-
-GAIM_TOP := ../../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
-
-datadir = $(GAIM_INSTALL_DIR)
-include ./Makefile.am
-
-.PHONY: install
-
-install:
-	if test '$(pidgindialogpix_DATA)'; then \
-	  mkdir -p $(pidgindialogpixdir); \
-	  cp $(pidgindialogpix_DATA) $(pidgindialogpixdir); \
-	fi;
-
+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+PIDGIN_TREE_TOP := ../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
+
+datadir = $(PIDGIN_INSTALL_DIR)
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(pidgindialogpix_DATA)'; then \
+	  mkdir -p $(pidgindialogpixdir); \
+	  cp $(pidgindialogpix_DATA) $(pidgindialogpixdir); \
+	fi;
+
--- a/pidgin/pixmaps/dialogs/64/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/pidgin/pixmaps/dialogs/64/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -1,20 +1,20 @@
-#
-# Makefile.mingw
-#
-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
-#
-
-GAIM_TOP := ../../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
-
-datadir = $(GAIM_INSTALL_DIR)
-include ./Makefile.am
-
-.PHONY: install
-
-install:
-	if test '$(pidgindialogpix_DATA)'; then \
-	  mkdir -p $(pidgindialogpixdir); \
-	  cp $(pidgindialogpix_DATA) $(pidgindialogpixdir); \
-	fi;
-
+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+PIDGIN_TREE_TOP := ../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
+
+datadir = $(PIDGIN_INSTALL_DIR)
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(pidgindialogpix_DATA)'; then \
+	  mkdir -p $(pidgindialogpixdir); \
+	  cp $(pidgindialogpix_DATA) $(pidgindialogpixdir); \
+	fi;
+
--- a/pidgin/pixmaps/dialogs/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/pidgin/pixmaps/dialogs/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -1,16 +1,16 @@
-#
-# Makefile.mingw
-#
-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
-#
-
-include ./Makefile.am
-
-.PHONY: install
-
-install:
-	if test '$(SUBDIRS)'; then \
-	  list='$(SUBDIRS)'; for subdir in $$list; do \
-	    $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \
-	  done; \
-	fi;
+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(SUBDIRS)'; then \
+	  list='$(SUBDIRS)'; for subdir in $$list; do \
+	    $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \
+	  done; \
+	fi;
--- a/pidgin/pixmaps/emblems/16/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/pidgin/pixmaps/emblems/16/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -1,20 +1,20 @@
-#
-# Makefile.mingw
-#
-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
-#
-
-GAIM_TOP := ../../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
-
-datadir = $(GAIM_INSTALL_DIR)
-include ./Makefile.am
-
-.PHONY: install
-
-install:
-	if test '$(pidginemblempix_DATA)'; then \
-	  mkdir -p $(pidginemblempixdir); \
-	  cp $(pidginemblempix_DATA) $(pidginemblempixdir); \
-	fi;
-
+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+PIDGIN_TREE_TOP := ../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
+
+datadir = $(PIDGIN_INSTALL_DIR)
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(pidginemblempix_DATA)'; then \
+	  mkdir -p $(pidginemblempixdir); \
+	  cp $(pidginemblempix_DATA) $(pidginemblempixdir); \
+	fi;
+
--- a/pidgin/pixmaps/emblems/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/pidgin/pixmaps/emblems/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -1,16 +1,16 @@
-#
-# Makefile.mingw
-#
-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
-#
-
-include ./Makefile.am
-
-.PHONY: install
-
-install:
-	if test '$(SUBDIRS)'; then \
-	  list='$(SUBDIRS)'; for subdir in $$list; do \
-	    $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \
-	  done; \
-	fi;
+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(SUBDIRS)'; then \
+	  list='$(SUBDIRS)'; for subdir in $$list; do \
+	    $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \
+	  done; \
+	fi;
--- a/pidgin/pixmaps/emotes/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/pidgin/pixmaps/emotes/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -1,16 +1,16 @@
-#
-# Makefile.mingw
-#
-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
-#
-
-include ./Makefile.am
-
-.PHONY: install
-
-install:
-	if test '$(SUBDIRS)'; then \
-	  list='$(SUBDIRS)'; for subdir in $$list; do \
-	    $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \
-	  done; \
-	fi;
+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(SUBDIRS)'; then \
+	  list='$(SUBDIRS)'; for subdir in $$list; do \
+	    $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \
+	  done; \
+	fi;
--- a/pidgin/pixmaps/emotes/default/22/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/pidgin/pixmaps/emotes/default/22/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -1,20 +1,20 @@
-#
-# Makefile.mingw
-#
-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
-#
-
-GAIM_TOP := ../../../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
-
-datadir = $(GAIM_INSTALL_DIR)
-include ./Makefile.am
-
-.PHONY: install
-
-install:
-	if test '$(pidginsmileypix_DATA)'; then \
-	  mkdir -p $(pidginsmileypixdir); \
-	  cp $(pidginsmileypix_DATA) $(pidginsmileypixdir); \
-	fi;
-
+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+PIDGIN_TREE_TOP := ../../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
+
+datadir = $(PIDGIN_INSTALL_DIR)
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(pidginsmileypix_DATA)'; then \
+	  mkdir -p $(pidginsmileypixdir); \
+	  cp $(pidginsmileypix_DATA) $(pidginsmileypixdir); \
+	fi;
+
--- a/pidgin/pixmaps/emotes/default/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/pidgin/pixmaps/emotes/default/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -1,16 +1,16 @@
-#
-# Makefile.mingw
-#
-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
-#
-
-include ./Makefile.am
-
-.PHONY: install
-
-install:
-	if test '$(SUBDIRS)'; then \
-	  list='$(SUBDIRS)'; for subdir in $$list; do \
-	    $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \
-	  done; \
-	fi;
+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(SUBDIRS)'; then \
+	  list='$(SUBDIRS)'; for subdir in $$list; do \
+	    $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \
+	  done; \
+	fi;
--- a/pidgin/pixmaps/emotes/none/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/pidgin/pixmaps/emotes/none/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -1,20 +1,20 @@
-#
-# Makefile.mingw
-#
-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
-#
-
-GAIM_TOP := ../../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
-
-datadir = $(GAIM_INSTALL_DIR)
-include ./Makefile.am
-
-.PHONY: install
-
-install:
-	if test '$(gaimsmileypix_DATA)'; then \
-	  mkdir -p $(gaimsmileypixdir); \
-	  cp $(gaimsmileypix_DATA) $(gaimsmileypixdir); \
-	fi;
-
+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+PIDGIN_TREE_TOP := ../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
+
+datadir = $(PIDGIN_INSTALL_DIR)
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(pidginsmileypix_DATA)'; then \
+	  mkdir -p $(pidginsmileypixdir); \
+	  cp $(pidginsmileypix_DATA) $(pidginsmileypixdir); \
+	fi;
+
--- a/pidgin/pixmaps/icons/16/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/pidgin/pixmaps/icons/16/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -1,20 +1,20 @@
-#
-# Makefile.mingw
-#
-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
-#
-
-GAIM_TOP := ../../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
-
-datadir = $(GAIM_INSTALL_DIR)
-include ./Makefile.am
-
-.PHONY: install
-
-install:
-	if test '$(pidginiconspix_DATA)'; then \
-	  mkdir -p $(pidginiconspixdir); \
-	  cp $(pidginiconspix_DATA) $(pidginiconspixdir); \
-	fi;
-
+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+PIDGIN_TREE_TOP := ../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
+
+datadir = $(PIDGIN_INSTALL_DIR)
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(pidginiconspix_DATA)'; then \
+	  mkdir -p $(pidginiconspixdir); \
+	  cp $(pidginiconspix_DATA) $(pidginiconspixdir); \
+	fi;
+
--- a/pidgin/pixmaps/icons/24/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/pidgin/pixmaps/icons/24/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -1,20 +1,20 @@
-#
-# Makefile.mingw
-#
-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
-#
-
-GAIM_TOP := ../../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
-
-datadir = $(GAIM_INSTALL_DIR)
-include ./Makefile.am
-
-.PHONY: install
-
-install:
-	if test '$(pidginiconspix_DATA)'; then \
-	  mkdir -p $(pidginiconspixdir); \
-	  cp $(pidginiconspix_DATA) $(pidginiconspixdir); \
-	fi;
-
+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+PIDGIN_TREE_TOP := ../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
+
+datadir = $(PIDGIN_INSTALL_DIR)
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(pidginiconspix_DATA)'; then \
+	  mkdir -p $(pidginiconspixdir); \
+	  cp $(pidginiconspix_DATA) $(pidginiconspixdir); \
+	fi;
+
--- a/pidgin/pixmaps/icons/32/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/pidgin/pixmaps/icons/32/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -1,20 +1,20 @@
-#
-# Makefile.mingw
-#
-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
-#
-
-GAIM_TOP := ../../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
-
-datadir = $(GAIM_INSTALL_DIR)
-include ./Makefile.am
-
-.PHONY: install
-
-install:
-	if test '$(pidginiconspix_DATA)'; then \
-	  mkdir -p $(pidginiconspixdir); \
-	  cp $(pidginiconspix_DATA) $(pidginiconspixdir); \
-	fi;
-
+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+PIDGIN_TREE_TOP := ../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
+
+datadir = $(PIDGIN_INSTALL_DIR)
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(pidginiconspix_DATA)'; then \
+	  mkdir -p $(pidginiconspixdir); \
+	  cp $(pidginiconspix_DATA) $(pidginiconspixdir); \
+	fi;
+
--- a/pidgin/pixmaps/icons/48/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/pidgin/pixmaps/icons/48/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -1,20 +1,20 @@
-#
-# Makefile.mingw
-#
-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
-#
-
-GAIM_TOP := ../../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
-
-datadir = $(GAIM_INSTALL_DIR)
-include ./Makefile.am
-
-.PHONY: install
-
-install:
-	if test '$(pidginiconspix_DATA)'; then \
-	  mkdir -p $(pidginiconspixdir); \
-	  cp $(pidginiconspix_DATA) $(pidginiconspixdir); \
-	fi;
-
+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+PIDGIN_TREE_TOP := ../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
+
+datadir = $(PIDGIN_INSTALL_DIR)
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(pidginiconspix_DATA)'; then \
+	  mkdir -p $(pidginiconspixdir); \
+	  cp $(pidginiconspix_DATA) $(pidginiconspixdir); \
+	fi;
+
--- a/pidgin/pixmaps/icons/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/pidgin/pixmaps/icons/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -1,7 +1,7 @@
 #
 # Makefile.mingw
 #
-# Description: Makefile for win32 (mingw) version of Gaim pixmaps
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
 #

 include ./Makefile.am
--- a/pidgin/pixmaps/protocols/16/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/pidgin/pixmaps/protocols/16/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -1,20 +1,20 @@
-#
-# Makefile.mingw
-#
-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
-#
-
-GAIM_TOP := ../../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
-
-datadir = $(GAIM_INSTALL_DIR)
-include ./Makefile.am
-
-.PHONY: install
-
-install:
-	if test '$(pidginprotocolpix_DATA)'; then \
-	  mkdir -p $(pidginprotocolpixdir); \
-	  cp $(pidginprotocolpix_DATA) $(pidginprotocolpixdir); \
-	fi;
-
+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+PIDGIN_TREE_TOP := ../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
+
+datadir = $(PIDGIN_INSTALL_DIR)
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(pidginprotocolpix_DATA)'; then \
+	  mkdir -p $(pidginprotocolpixdir); \
+	  cp $(pidginprotocolpix_DATA) $(pidginprotocolpixdir); \
+	fi;
+
--- a/pidgin/pixmaps/protocols/22/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/pidgin/pixmaps/protocols/22/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -1,20 +1,20 @@
-#
-# Makefile.mingw
-#
-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
-#
-
-GAIM_TOP := ../../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
-
-datadir = $(GAIM_INSTALL_DIR)
-include ./Makefile.am
-
-.PHONY: install
-
-install:
-	if test '$(pidginprotocolpix_DATA)'; then \
-	  mkdir -p $(pidginprotocolpixdir); \
-	  cp $(pidginprotocolpix_DATA) $(pidginprotocolpixdir); \
-	fi;
-
+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+PIDGIN_TREE_TOP := ../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
+
+datadir = $(PIDGIN_INSTALL_DIR)
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(pidginprotocolpix_DATA)'; then \
+	  mkdir -p $(pidginprotocolpixdir); \
+	  cp $(pidginprotocolpix_DATA) $(pidginprotocolpixdir); \
+	fi;
+
--- a/pidgin/pixmaps/protocols/48/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/pidgin/pixmaps/protocols/48/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -1,20 +1,20 @@
-#
-# Makefile.mingw
-#
-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
-#
-
-GAIM_TOP := ../../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
-
-datadir = $(GAIM_INSTALL_DIR)
-include ./Makefile.am
-
-.PHONY: install
-
-install:
-	if test '$(pidginprotocolpix_DATA)'; then \
-	  mkdir -p $(pidginprotocolpixdir); \
-	  cp $(pidginprotocolpix_DATA) $(pidginprotocolpixdir); \
-	fi;
-
+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+PIDGIN_TREE_TOP := ../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
+
+datadir = $(PIDGIN_INSTALL_DIR)
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(pidginprotocolpix_DATA)'; then \
+	  mkdir -p $(pidginprotocolpixdir); \
+	  cp $(pidginprotocolpix_DATA) $(pidginprotocolpixdir); \
+	fi;
+
--- a/pidgin/pixmaps/protocols/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/pidgin/pixmaps/protocols/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -1,16 +1,16 @@
-#
-# Makefile.mingw
-#
-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
-#
-
-include ./Makefile.am
-
-.PHONY: install
-
-install:
-	if test '$(SUBDIRS)'; then \
-	  list='$(SUBDIRS)'; for subdir in $$list; do \
-	    $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \
-	  done; \
-	fi;
+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(SUBDIRS)'; then \
+	  list='$(SUBDIRS)'; for subdir in $$list; do \
+	    $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \
+	  done; \
+	fi;
--- a/pidgin/pixmaps/status/16/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/pidgin/pixmaps/status/16/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -1,20 +1,20 @@
-#
-# Makefile.mingw
-#
-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
-#
-
-GAIM_TOP := ../../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
-
-datadir = $(GAIM_INSTALL_DIR)
-include ./Makefile.am
-
-.PHONY: install
-
-install:
-	if test '$(pidginstatuspix_DATA)'; then \
-	  mkdir -p $(pidginstatuspixdir); \
-	  cp $(pidginstatuspix_DATA) $(pidginstatuspixdir); \
-	fi;
-
+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+PIDGIN_TREE_TOP := ../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
+
+datadir = $(PIDGIN_INSTALL_DIR)
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(pidginstatuspix_DATA)'; then \
+	  mkdir -p $(pidginstatuspixdir); \
+	  cp $(pidginstatuspix_DATA) $(pidginstatuspixdir); \
+	fi;
+
--- a/pidgin/pixmaps/status/22/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/pidgin/pixmaps/status/22/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -1,20 +1,20 @@
-#
-# Makefile.mingw
-#
-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
-#
-
-GAIM_TOP := ../../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
-
-datadir = $(GAIM_INSTALL_DIR)
-include ./Makefile.am
-
-.PHONY: install
-
-install:
-	if test '$(pidginstatuspix_DATA)'; then \
-	  mkdir -p $(pidginstatuspixdir); \
-	  cp $(pidginstatuspix_DATA) $(pidginstatuspixdir); \
-	fi;
-
+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+PIDGIN_TREE_TOP := ../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
+
+datadir = $(PIDGIN_INSTALL_DIR)
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(pidginstatuspix_DATA)'; then \
+	  mkdir -p $(pidginstatuspixdir); \
+	  cp $(pidginstatuspix_DATA) $(pidginstatuspixdir); \
+	fi;
+
--- a/pidgin/pixmaps/status/32/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/pidgin/pixmaps/status/32/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -1,20 +1,20 @@
-#
-# Makefile.mingw
-#
-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
-#
-
-GAIM_TOP := ../../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
-
-datadir = $(GAIM_INSTALL_DIR)
-include ./Makefile.am
-
-.PHONY: install
-
-install:
-	if test '$(pidginstatuspix_DATA)'; then \
-	  mkdir -p $(pidginstatuspixdir); \
-	  cp $(pidginstatuspix_DATA) $(pidginstatuspixdir); \
-	fi;
-
+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+PIDGIN_TREE_TOP := ../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
+
+datadir = $(PIDGIN_INSTALL_DIR)
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(pidginstatuspix_DATA)'; then \
+	  mkdir -p $(pidginstatuspixdir); \
+	  cp $(pidginstatuspix_DATA) $(pidginstatuspixdir); \
+	fi;
+
--- a/pidgin/pixmaps/status/48/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/pidgin/pixmaps/status/48/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -1,20 +1,20 @@
-#
-# Makefile.mingw
-#
-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
-#
-
-GAIM_TOP := ../../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
-
-datadir = $(GAIM_INSTALL_DIR)
-include ./Makefile.am
-
-.PHONY: install
-
-install:
-	if test '$(pidginstatuspix_DATA)'; then \
-	  mkdir -p $(pidginstatuspixdir); \
-	  cp $(pidginstatuspix_DATA) $(pidginstatuspixdir); \
-	fi;
-
+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+PIDGIN_TREE_TOP := ../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
+
+datadir = $(PIDGIN_INSTALL_DIR)
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(pidginstatuspix_DATA)'; then \
+	  mkdir -p $(pidginstatuspixdir); \
+	  cp $(pidginstatuspix_DATA) $(pidginstatuspixdir); \
+	fi;
+
--- a/pidgin/pixmaps/status/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/pidgin/pixmaps/status/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -1,7 +1,7 @@
 #
 # Makefile.mingw
 #
-# Description: Makefile for win32 (mingw) version of Gaim pixmaps
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
 #

 include ./Makefile.am
--- a/pidgin/pixmaps/status/default/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/pidgin/pixmaps/status/default/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -1,18 +1,18 @@
 #
 # Makefile.mingw
 #
-# Description: Makefile for win32 (mingw) version of Gaim pixmaps
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
 #

-GAIM_TOP = ../../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP = ../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak

-datadir = $(GAIM_INSTALL_DIR)
+datadir = $(PIDGIN_INSTALL_DIR)
 include ./Makefile.am

 install:
-	if test '$(gaimstatuspix_DATA)'; then \
-	  mkdir -p $(gaimstatuspixdir); \
-	  cp $(gaimstatuspix_DATA) $(gaimstatuspixdir); \
+	if test '$(pidginstatuspix_DATA)'; then \
+	  mkdir -p $(pidginstatuspixdir); \
+	  cp $(pidginstatuspix_DATA) $(pidginstatuspixdir); \
 	fi;
--- a/pidgin/pixmaps/toolbar/16/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/pidgin/pixmaps/toolbar/16/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -1,20 +1,20 @@
-#
-# Makefile.mingw
-#
-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
-#
-
-GAIM_TOP := ../../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
-
-datadir = $(GAIM_INSTALL_DIR)
-include ./Makefile.am
-
-.PHONY: install
-
-install:
-	if test '$(pidgintoolbarpix_DATA)'; then \
-	  mkdir -p $(pidgintoolbarpixdir); \
-	  cp $(pidgintoolbarpix_DATA) $(pidgintoolbarpixdir); \
-	fi;
-
+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+PIDGIN_TREE_TOP := ../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
+
+datadir = $(PIDGIN_INSTALL_DIR)
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(pidgintoolbarpix_DATA)'; then \
+	  mkdir -p $(pidgintoolbarpixdir); \
+	  cp $(pidgintoolbarpix_DATA) $(pidgintoolbarpixdir); \
+	fi;
+
Binary file pidgin/pixmaps/toolbar/16/change-bgcolor.png has changed
Binary file pidgin/pixmaps/toolbar/16/change-fgcolor.png has changed
Binary file pidgin/pixmaps/toolbar/16/font-size-down.png has changed
Binary file pidgin/pixmaps/toolbar/16/font-size-up.png has changed
--- a/pidgin/pixmaps/toolbar/16/scalable/change-bgcolor.svg	Tue Apr 10 16:48:20 2007 +0000
+++ b/pidgin/pixmaps/toolbar/16/scalable/change-bgcolor.svg	Tue Apr 10 16:54:51 2007 +0000
@@ -7,17 +7,17 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/s odipodi-0.dtd"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="16"
    height="16"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.43"
+   inkscape:version="0.44.1"
    version="1.0"
-   sodipodi:docbase="/home/hbons/Desktop/Gaim Refresh/toolbars"
+   sodipodi:docbase="/home/hbons/Desktop"
    sodipodi:docname="change-bgcolor.svg"
-   inkscape:export-filename="/home/hbons/Desktop/Gaim Refresh/toolbars/change-bgcolor.png"
+   inkscape:export-filename="/home/hbons/Desktop/change-bgcolor.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90">
   <defs
@@ -207,8 +207,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="36.388907"
-     inkscape:cx="13.18492"
-     inkscape:cy="11.465525"
+     inkscape:cx="11.481104"
+     inkscape:cy="8.7311752"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -218,7 +218,7 @@
      inkscape:window-width="1268"
      inkscape:window-height="971"
      inkscape:window-x="6"
-     inkscape:window-y="21" />
+     inkscape:window-y="25" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -234,38 +234,28 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1">
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.4;color:#000000;fill:url(#radialGradient2494);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path2492"
-       sodipodi:cx="24.837126"
-       sodipodi:cy="36.421127"
-       sodipodi:rx="15.644737"
-       sodipodi:ry="8.3968935"
-       d="M 40.481863 36.421127 A 15.644737 8.3968935 0 1 1  9.1923885,36.421127 A 15.644737 8.3968935 0 1 1  40.481863 36.421127 z"
-       transform="matrix(0.511354,0,0,0.178638,-4.700565,7.993818)"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true" />
     <rect
-       style="opacity:1;fill:url(#linearGradient1337);fill-opacity:1;stroke:#555753;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:1;fill:url(#linearGradient1337);fill-opacity:1;stroke:#204a87;stroke-width:0.86440802;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect1307"
        width="12.070982"
        height="12.999136"
        x="2.4642847"
        y="1.5004305"
        rx="1.9062512"
-       ry="1.9062517" />
+       ry="1.9062517"
+       transform="matrix(1.159806,0,0,1.153923,-2.358093,-1.231382)" />
     <path
        sodipodi:type="inkscape:offset"
        inkscape:radius="-0.98440135"
        inkscape:original="M 4.375 1.5 C 3.3189368 1.5 2.46875 2.3501867 2.46875 3.40625 L 2.46875 12.59375 C 2.46875 13.649813 3.3189368 14.5 4.375 14.5 L 12.625 14.5 C 13.681063 14.5 14.53125 13.649813 14.53125 12.59375 L 14.53125 3.40625 C 14.53125 2.3501866 13.681064 1.5 12.625 1.5 L 4.375 1.5 z "
        xlink:href="#rect1307"
-       style="opacity:0.2;fill:url(#linearGradient5674);fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.2;fill:url(#linearGradient5674);fill-opacity:1;stroke:white;stroke-width:0.84233886;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="path1335"
        inkscape:href="#rect1307"
-       d="M 4.375,2.5 C 3.8472669,2.5 3.46875,2.8785168 3.46875,3.40625 L 3.46875,12.59375 C 3.46875,13.121483 3.8472671,13.5 4.375,13.5 L 12.625,13.5 C 13.152733,13.5 13.53125,13.121483 13.53125,12.59375 L 13.53125,3.40625 C 13.53125,2.8785161 13.152734,2.5 12.625,2.5 L 4.375,2.5 z " />
+       d="M 4.375,2.5 C 3.8472669,2.5 3.46875,2.8785168 3.46875,3.40625 L 3.46875,12.59375 C 3.46875,13.121483 3.8472671,13.5 4.375,13.5 L 12.625,13.5 C 13.152733,13.5 13.53125,13.121483 13.53125,12.59375 L 13.53125,3.40625 C 13.53125,2.8785161 13.152734,2.5 12.625,2.5 L 4.375,2.5 z "
+       transform="matrix(1.192547,0,0,1.181818,-2.636646,-1.454545)" />
     <path
-       transform="scale(0.904727,1.105306)"
+       transform="matrix(0.904727,0,0,1.105306,-1,3.3068e-8)"
        style="font-size:9.92835999px;font-style:normal;font-weight:normal;fill:#eeeeec;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
        d="M 9.4499435,5.428361 L 8.8424464,8.1425415 L 9.9477522,8.1425415 M 9.9477522,3.6189073 L 13.26367,10.856722 L 11.053058,10.856722 L 10.464124,9.0472684 L 8.3564496,9.0472684 L 7.7371406,10.856722 L 5.526529,10.856722 L 8.8424464,3.6189073"
        id="text5663"
--- a/pidgin/pixmaps/toolbar/16/scalable/change-fgcolor.svg	Tue Apr 10 16:48:20 2007 +0000
+++ b/pidgin/pixmaps/toolbar/16/scalable/change-fgcolor.svg	Tue Apr 10 16:54:51 2007 +0000
@@ -7,58 +7,23 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/s odipodi-0.dtd"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="16"
    height="16"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.43"
+   inkscape:version="0.44.1"
    version="1.0"
-   sodipodi:docbase="/home/hbons/Desktop/Gaim Refresh/toolbars"
+   sodipodi:docbase="/home/hbons/Desktop"
    sodipodi:docname="change-fgcolor.svg"
-   inkscape:export-filename="/home/hbons/Desktop/Gaim Refresh/toolbars/change-fgcolor.png"
+   inkscape:export-filename="/home/hbons/Desktop/change-fgcolor.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90">
   <defs
      id="defs4">
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient5702">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1;"
-         offset="0"
-         id="stop5704" />
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:0;"
-         offset="1"
-         id="stop5706" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8662">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop8664" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop8666" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="radialGradient2494"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.536723,4.952005e-15,16.87306)"
-       cx="24.837126"
-       cy="36.421127"
-       fx="24.837126"
-       fy="36.421127"
-       r="15.644737" />
-    <linearGradient
-       inkscape:collect="always"
        id="linearGradient2233">
       <stop
          style="stop-color:#ffffff;stop-opacity:1;"
@@ -180,26 +145,6 @@
        x2="19.988434"
        y2="6.4341555"
        gradientTransform="matrix(0.186481,0,0,0.186481,2.16736,4.241648)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5702"
-       id="linearGradient5708"
-       x1="8.4997759"
-       y1="12.925254"
-       x2="8.4997759"
-       y2="-5.7467904"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.994466,0,0,1,4.658362e-2,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5702"
-       id="linearGradient2250"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.994466,0,0,1,4.658362e-2,0)"
-       x1="8.4997759"
-       y1="12.925254"
-       x2="8.4997759"
-       y2="-5.7467904" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -209,8 +154,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="36.388907"
-     inkscape:cx="13.18492"
-     inkscape:cy="9.2670521"
+     inkscape:cx="11.728432"
+     inkscape:cy="7.9067481"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -220,7 +165,7 @@
      inkscape:window-width="1268"
      inkscape:window-height="971"
      inkscape:window-x="6"
-     inkscape:window-y="21" />
+     inkscape:window-y="25" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -237,46 +182,27 @@
      inkscape:groupmode="layer"
      id="layer1">
     <rect
-       style="opacity:1;fill:#eeeeec;fill-opacity:1;stroke:none;stroke-width:1.00000036;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect2212"
-       width="12.004177"
+       style="opacity:1;fill:#eeeeec;fill-opacity:1;stroke:#888a85;stroke-width:0.86440802;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect1307"
+       width="12.070982"
        height="12.999136"
-       x="2.4972301"
+       x="2.4642847"
        y="1.5004305"
-       rx="1.9062521"
-       ry="1.9062517" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.4;color:#000000;fill:url(#radialGradient2494);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path2492"
-       sodipodi:cx="24.837126"
-       sodipodi:cy="36.421127"
-       sodipodi:rx="15.644737"
-       sodipodi:ry="8.3968935"
-       d="M 40.481863 36.421127 A 15.644737 8.3968935 0 1 1  9.1923885,36.421127 A 15.644737 8.3968935 0 1 1  40.481863 36.421127 z"
-       transform="matrix(0.511354,0,0,0.178638,-4.700565,7.993818)"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true" />
-    <rect
-       style="opacity:1;fill:url(#linearGradient2250);fill-opacity:1;stroke:#555753;stroke-width:1.00000036;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect1307"
-       width="12.004177"
-       height="12.999136"
-       x="2.4972301"
-       y="1.5004305"
-       rx="1.9062521"
-       ry="1.9062517" />
+       rx="1.9062512"
+       ry="1.9062517"
+       transform="matrix(1.159806,0,0,1.153923,-2.358093,-1.231382)" />
     <path
        sodipodi:type="inkscape:offset"
-       inkscape:radius="-0.98931247"
-       inkscape:original="M 4.40625 1.5 C 3.3501863 1.5 2.5 2.3501867 2.5 3.40625 L 2.5 12.59375 C 2.5 13.649813 3.3501861 14.5 4.40625 14.5 L 12.59375 14.5 C 13.649814 14.5 14.5 13.649813 14.5 12.59375 L 14.5 3.40625 C 14.5 2.3501866 13.649814 1.5 12.59375 1.5 L 4.40625 1.5 z "
+       inkscape:radius="-0.98440135"
+       inkscape:original="M 4.375 1.5 C 3.3189368 1.5 2.46875 2.3501867 2.46875 3.40625 L 2.46875 12.59375 C 2.46875 13.649813 3.3189368 14.5 4.375 14.5 L 12.625 14.5 C 13.681063 14.5 14.53125 13.649813 14.53125 12.59375 L 14.53125 3.40625 C 14.53125 2.3501866 13.681064 1.5 12.625 1.5 L 4.375 1.5 z "
        xlink:href="#rect1307"
-       style="opacity:0.7;fill:url(#linearGradient5708);fill-opacity:1;stroke:#ffffff;stroke-width:1.00000036;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path2248"
+       style="opacity:0.2;fill:none;fill-opacity:1;stroke:white;stroke-width:0.84233886;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1335"
        inkscape:href="#rect1307"
-       d="M 4.40625,2.5 C 3.8811519,2.5 3.5,2.8811523 3.5,3.40625 L 3.5,12.59375 C 3.5,13.118847 3.8811518,13.5 4.40625,13.5 L 12.59375,13.5 C 13.118848,13.5 13.5,13.118847 13.5,12.59375 L 13.5,3.40625 C 13.5,2.881152 13.118849,2.5 12.59375,2.5 L 4.40625,2.5 z " />
+       d="M 4.375,2.5 C 3.8472669,2.5 3.46875,2.8785168 3.46875,3.40625 L 3.46875,12.59375 C 3.46875,13.121483 3.8472671,13.5 4.375,13.5 L 12.625,13.5 C 13.152733,13.5 13.53125,13.121483 13.53125,12.59375 L 13.53125,3.40625 C 13.53125,2.8785161 13.152734,2.5 12.625,2.5 L 4.375,2.5 z "
+       transform="matrix(1.192547,0,0,1.181818,-2.636646,-1.454545)" />
     <path
-       transform="scale(0.904727,1.105306)"
+       transform="matrix(0.904727,0,0,1.105306,-1,3.3068e-8)"
        style="font-size:9.92835999px;font-style:normal;font-weight:normal;fill:#729fcf;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
        d="M 9.4499435,5.428361 L 8.8424464,8.1425415 L 9.9477522,8.1425415 M 9.9477522,3.6189073 L 13.26367,10.856722 L 11.053058,10.856722 L 10.464124,9.0472684 L 8.3564496,9.0472684 L 7.7371406,10.856722 L 5.526529,10.856722 L 8.8424464,3.6189073"
        id="text5663"
--- a/pidgin/pixmaps/toolbar/16/scalable/font-size-down.svg	Tue Apr 10 16:48:20 2007 +0000
+++ b/pidgin/pixmaps/toolbar/16/scalable/font-size-down.svg	Tue Apr 10 16:54:51 2007 +0000
@@ -7,17 +7,17 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/s odipodi-0.dtd"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="16"
    height="16"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.43"
+   inkscape:version="0.44.1"
    version="1.0"
-   sodipodi:docbase="/home/hbons/Desktop/Gaim Refresh/toolbars"
+   sodipodi:docbase="/home/hbons/Desktop"
    sodipodi:docname="font-size-down.svg"
-   inkscape:export-filename="/home/hbons/Desktop/Gaim Refresh/toolbars/font-size-down.png"
+   inkscape:export-filename="/home/hbons/Desktop/font-size-down.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90">
   <defs
@@ -183,16 +183,6 @@
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5702"
-       id="linearGradient5708"
-       x1="8.4997759"
-       y1="12.925254"
-       x2="8.4997759"
-       y2="-5.7467904"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.994466,0,0,1,4.658362e-2,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5702"
        id="linearGradient2250"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.994466,0,0,1,4.658362e-2,0)"
@@ -200,16 +190,6 @@
        y1="12.925254"
        x2="8.4997759"
        y2="-5.7467904" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5702"
-       id="linearGradient2594"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.073676,0,0,1,-1.144463,0)"
-       x1="8.4997759"
-       y1="12.925254"
-       x2="8.4997759"
-       y2="-5.7467904" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -219,8 +199,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="36.388907"
-     inkscape:cx="14.311637"
-     inkscape:cy="9.1571285"
+     inkscape:cx="13.676358"
+     inkscape:cy="9.3357544"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -230,7 +210,7 @@
      inkscape:window-width="1268"
      inkscape:window-height="971"
      inkscape:window-x="6"
-     inkscape:window-y="21" />
+     inkscape:window-y="25" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -247,53 +227,36 @@
      inkscape:groupmode="layer"
      id="layer1">
     <rect
-       style="opacity:1;fill:#eeeeec;fill-opacity:1;stroke:none;stroke-width:1.00000036;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect2212"
-       width="12.004177"
-       height="12.999136"
-       x="2.4972301"
-       y="1.5004305"
-       rx="1.9062521"
-       ry="1.9062517" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.4;color:#000000;fill:url(#radialGradient2494);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path2492"
-       sodipodi:cx="24.837126"
-       sodipodi:cy="36.421127"
-       sodipodi:rx="15.644737"
-       sodipodi:ry="8.3968935"
-       d="M 40.481863 36.421127 A 15.644737 8.3968935 0 1 1  9.1923885,36.421127 A 15.644737 8.3968935 0 1 1  40.481863 36.421127 z"
-       transform="matrix(0.511354,0,0,0.178638,-4.700565,7.993818)"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true" />
-    <rect
-       style="opacity:1;fill:url(#linearGradient2594);fill-opacity:1;stroke:#555753;stroke-width:1.00000036;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:1;fill:#eeeeec;fill-opacity:1;stroke:#888a85;stroke-width:0.86531419;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect1307"
        width="12.960312"
        height="12.999136"
        x="1.5013776"
        y="1.5004305"
        rx="1.9062524"
-       ry="1.9062517" />
+       ry="1.9062517"
+       transform="matrix(1.157379,0,0,1.153923,-1.237663,-1.231382)" />
     <path
        sodipodi:type="inkscape:offset"
        inkscape:radius="-0.98931247"
        inkscape:original="M 3.40625 1.5 C 2.3501862 1.5 1.5 2.3501867 1.5 3.40625 L 1.5 12.59375 C 1.5 13.649813 2.3501862 14.5 3.40625 14.5 L 12.5625 14.5 C 13.618564 14.5 14.46875 13.649813 14.46875 12.59375 L 14.46875 3.40625 C 14.46875 2.3501866 13.618564 1.5 12.5625 1.5 L 3.40625 1.5 z "
        xlink:href="#rect1307"
-       style="opacity:0.7;fill:url(#linearGradient5708);fill-opacity:1;stroke:#ffffff;stroke-width:1.00000036;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-opacity:1;stroke:white;stroke-width:0.84495139;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="path2248"
        inkscape:href="#rect1307"
-       d="M 4.40625,2.5 C 3.8811519,2.5 3.5,2.8811523 3.5,3.40625 L 3.5,12.59375 C 3.5,13.118847 3.8811518,13.5 4.40625,13.5 L 12.59375,13.5 C 13.118848,13.5 13.5,13.118847 13.5,12.59375 L 13.5,3.40625 C 13.5,2.881152 13.118849,2.5 12.59375,2.5 L 4.40625,2.5 z " />
+       d="M 3.40625,2.5 C 2.8811518,2.5 2.5,2.8811522 2.5,3.40625 L 2.5,12.59375 C 2.5,13.118847 2.881152,13.5 3.40625,13.5 L 12.5625,13.5 C 13.087598,13.5 13.46875,13.118847 13.46875,12.59375 L 13.46875,3.40625 C 13.46875,2.881152 13.087599,2.5 12.5625,2.5 L 3.40625,2.5 z "
+       transform="matrix(1.185185,0,0,1.181818,-1.462962,-1.454545)" />
     <path
        style="font-size:9.92835999px;font-style:normal;font-weight:normal;fill:#888a85;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
        d="M 7.549619,6 L 7,9 L 8,9 M 8,4 L 11,12 L 9,12 L 8.4671755,10 L 6.5603056,10 L 6,12 L 4,12 L 7,4"
        id="text5663"
-       sodipodi:nodetypes="ccccccccccc" />
+       sodipodi:nodetypes="ccccccccccc"
+       transform="translate(0,1)" />
     <path
        style="fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 11.00061,5 L 13,3 L 9,3 L 11.00061,5 z "
+       d="M 11.00061,3 L 13,5 L 9,5 L 11.00061,3 z "
        id="rect2583"
-       sodipodi:nodetypes="cccc" />
+       sodipodi:nodetypes="cccc"
+       transform="matrix(1,0,0,-1,0,8)" />
   </g>
 </svg>
--- a/pidgin/pixmaps/toolbar/16/scalable/font-size-up.svg	Tue Apr 10 16:48:20 2007 +0000
+++ b/pidgin/pixmaps/toolbar/16/scalable/font-size-up.svg	Tue Apr 10 16:54:51 2007 +0000
@@ -7,17 +7,17 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/s odipodi-0.dtd"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="16"
    height="16"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.43"
+   inkscape:version="0.44.1"
    version="1.0"
-   sodipodi:docbase="/home/hbons/Desktop/Gaim Refresh/toolbars"
+   sodipodi:docbase="/home/hbons/Desktop"
    sodipodi:docname="font-size-up.svg"
-   inkscape:export-filename="/home/hbons/Desktop/Gaim Refresh/toolbars/change-fgcolor.png"
+   inkscape:export-filename="/home/hbons/Desktop/font-size-up.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90">
   <defs
@@ -183,16 +183,6 @@
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5702"
-       id="linearGradient5708"
-       x1="8.4997759"
-       y1="12.925254"
-       x2="8.4997759"
-       y2="-5.7467904"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.994466,0,0,1,4.658362e-2,0)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5702"
        id="linearGradient2250"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.994466,0,0,1,4.658362e-2,0)"
@@ -200,16 +190,6 @@
        y1="12.925254"
        x2="8.4997759"
        y2="-5.7467904" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5702"
-       id="linearGradient2594"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.073676,0,0,1,-1.144463,0)"
-       x1="8.4997759"
-       y1="12.925254"
-       x2="8.4997759"
-       y2="-5.7467904" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -219,8 +199,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="36.388907"
-     inkscape:cx="14.311637"
-     inkscape:cy="9.1571285"
+     inkscape:cx="13.676358"
+     inkscape:cy="9.3357544"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -230,7 +210,7 @@
      inkscape:window-width="1268"
      inkscape:window-height="971"
      inkscape:window-x="6"
-     inkscape:window-y="21" />
+     inkscape:window-y="25" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -247,49 +227,31 @@
      inkscape:groupmode="layer"
      id="layer1">
     <rect
-       style="opacity:1;fill:#eeeeec;fill-opacity:1;stroke:none;stroke-width:1.00000036;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect2212"
-       width="12.004177"
-       height="12.999136"
-       x="2.4972301"
-       y="1.5004305"
-       rx="1.9062521"
-       ry="1.9062517" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.4;color:#000000;fill:url(#radialGradient2494);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path2492"
-       sodipodi:cx="24.837126"
-       sodipodi:cy="36.421127"
-       sodipodi:rx="15.644737"
-       sodipodi:ry="8.3968935"
-       d="M 40.481863 36.421127 A 15.644737 8.3968935 0 1 1  9.1923885,36.421127 A 15.644737 8.3968935 0 1 1  40.481863 36.421127 z"
-       transform="matrix(0.511354,0,0,0.178638,-4.700565,7.993818)"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true" />
-    <rect
-       style="opacity:1;fill:url(#linearGradient2594);fill-opacity:1;stroke:#555753;stroke-width:1.00000036;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:1;fill:#eeeeec;fill-opacity:1;stroke:#888a85;stroke-width:0.86531419;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect1307"
        width="12.960312"
        height="12.999136"
        x="1.5013776"
        y="1.5004305"
        rx="1.9062524"
-       ry="1.9062517" />
+       ry="1.9062517"
+       transform="matrix(1.157379,0,0,1.153923,-1.237663,-1.231382)" />
     <path
        sodipodi:type="inkscape:offset"
        inkscape:radius="-0.98931247"
        inkscape:original="M 3.40625 1.5 C 2.3501862 1.5 1.5 2.3501867 1.5 3.40625 L 1.5 12.59375 C 1.5 13.649813 2.3501862 14.5 3.40625 14.5 L 12.5625 14.5 C 13.618564 14.5 14.46875 13.649813 14.46875 12.59375 L 14.46875 3.40625 C 14.46875 2.3501866 13.618564 1.5 12.5625 1.5 L 3.40625 1.5 z "
        xlink:href="#rect1307"
-       style="opacity:0.7;fill:url(#linearGradient5708);fill-opacity:1;stroke:#ffffff;stroke-width:1.00000036;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-opacity:1;stroke:white;stroke-width:0.84495139;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="path2248"
        inkscape:href="#rect1307"
-       d="M 4.40625,2.5 C 3.8811519,2.5 3.5,2.8811523 3.5,3.40625 L 3.5,12.59375 C 3.5,13.118847 3.8811518,13.5 4.40625,13.5 L 12.59375,13.5 C 13.118848,13.5 13.5,13.118847 13.5,12.59375 L 13.5,3.40625 C 13.5,2.881152 13.118849,2.5 12.59375,2.5 L 4.40625,2.5 z " />
+       d="M 3.40625,2.5 C 2.8811518,2.5 2.5,2.8811522 2.5,3.40625 L 2.5,12.59375 C 2.5,13.118847 2.881152,13.5 3.40625,13.5 L 12.5625,13.5 C 13.087598,13.5 13.46875,13.118847 13.46875,12.59375 L 13.46875,3.40625 C 13.46875,2.881152 13.087599,2.5 12.5625,2.5 L 3.40625,2.5 z "
+       transform="matrix(1.185185,0,0,1.181818,-1.462962,-1.454545)" />
     <path
        style="font-size:9.92835999px;font-style:normal;font-weight:normal;fill:#888a85;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
        d="M 7.549619,6 L 7,9 L 8,9 M 8,4 L 11,12 L 9,12 L 8.4671755,10 L 6.5603056,10 L 6,12 L 4,12 L 7,4"
        id="text5663"
-       sodipodi:nodetypes="ccccccccccc" />
+       sodipodi:nodetypes="ccccccccccc"
+       transform="translate(0,1)" />
     <path
        style="fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
        d="M 11.00061,3 L 13,5 L 9,5 L 11.00061,3 z "
--- a/pidgin/pixmaps/tray/16/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/pidgin/pixmaps/tray/16/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -1,20 +1,20 @@
-#
-# Makefile.mingw
-#
-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
-#
-
-GAIM_TOP := ../../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
-
-datadir = $(GAIM_INSTALL_DIR)
-include ./Makefile.am
-
-.PHONY: install
-
-install:
-	if test '$(pidgintraypix_DATA)'; then \
-	  mkdir -p $(pidgintraypixdir); \
-	  cp $(pidgintraypix_DATA) $(pidgintraypixdir); \
-	fi;
-
+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+PIDGIN_TREE_TOP := ../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
+
+datadir = $(PIDGIN_INSTALL_DIR)
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(pidgintraypix_DATA)'; then \
+	  mkdir -p $(pidgintraypixdir); \
+	  cp $(pidgintraypix_DATA) $(pidgintraypixdir); \
+	fi;
+
--- a/pidgin/pixmaps/tray/22/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/pidgin/pixmaps/tray/22/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -1,20 +1,20 @@
-#
-# Makefile.mingw
-#
-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
-#
-
-GAIM_TOP := ../../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
-
-datadir = $(GAIM_INSTALL_DIR)
-include ./Makefile.am
-
-.PHONY: install
-
-install:
-	if test '$(pidgintraypix_DATA)'; then \
-	  mkdir -p $(pidgintraypixdir); \
-	  cp $(pidgintraypix_DATA) $(pidgintraypixdir); \
-	fi;
-
+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+PIDGIN_TREE_TOP := ../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
+
+datadir = $(PIDGIN_INSTALL_DIR)
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(pidgintraypix_DATA)'; then \
+	  mkdir -p $(pidgintraypixdir); \
+	  cp $(pidgintraypix_DATA) $(pidgintraypixdir); \
+	fi;
+
--- a/pidgin/pixmaps/tray/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/pidgin/pixmaps/tray/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -1,7 +1,7 @@
 #
 # Makefile.mingw
 #
-# Description: Makefile for win32 (mingw) version of Gaim pixmaps
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
 #

 include ./Makefile.am
--- a/pidgin/plugins/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/pidgin/plugins/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -1,11 +1,11 @@
 #
 # Makefile.mingw
 #
-# Description: Makefile for win32 (mingw) version of Gaim Plugins
+# Description: Makefile for win32 (mingw) version of Pidgin Plugins
 #

-GAIM_TOP := ../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak

 GTKPERL_PLUGIN := ./perl
 TICKER_PLUGIN := ./ticker
@@ -26,15 +26,15 @@
 			-I$(GTK_TOP)/include/atk-1.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
 			-I$(GTK_TOP)/lib/gtk-2.0/include \
-			-I$(GAIM_TOP) \
-			-I$(GAIM_LIB_TOP) \
-			-I$(GAIM_LIB_TOP)/win32 \
-			-I$(GAIM_GTK_TOP) \
-			-I$(GAIM_GTK_TOP)/win32
+			-I$(PIDGIN_TREE_TOP) \
+			-I$(PURPLE_TOP) \
+			-I$(PURPLE_TOP)/win32 \
+			-I$(PIDGIN_TOP) \
+			-I$(PIDGIN_TOP)/win32

 LIB_PATHS =		-L$(GTK_TOP)/lib \
-			-L$(GAIM_LIB_TOP) \
-			-L$(GAIM_GTK_TOP)
+			-L$(PURPLE_TOP) \
+			-L$(PIDGIN_TOP)

 ##
 ## LIBRARIES
@@ -57,17 +57,17 @@
 .PHONY: all clean plugins install

 all: plugins
-#	$(MAKE) -C $(GTKPERL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE)
-	$(MAKE) -C $(TICKER_PLUGIN) -f $(GAIM_WIN32_MAKEFILE)
-	$(MAKE) -C $(TRANSPARENCY_PLUGIN) -f $(GAIM_WIN32_MAKEFILE)
-	$(MAKE) -C $(WINPREFS_PLUGIN) -f $(GAIM_WIN32_MAKEFILE)
+#	$(MAKE) -C $(GTKPERL_PLUGIN) -f $(MINGW_MAKEFILE)
+	$(MAKE) -C $(TICKER_PLUGIN) -f $(MINGW_MAKEFILE)
+	$(MAKE) -C $(TRANSPARENCY_PLUGIN) -f $(MINGW_MAKEFILE)
+	$(MAKE) -C $(WINPREFS_PLUGIN) -f $(MINGW_MAKEFILE)

-install: all $(GAIM_INSTALL_PLUGINS_DIR)
-#	$(MAKE) -C $(GTKPERL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) install
-	$(MAKE) -C $(TICKER_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) install
-	$(MAKE) -C $(TRANSPARENCY_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) install
-	$(MAKE) -C $(WINPREFS_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) install
-	cp *.dll $(GAIM_INSTALL_PLUGINS_DIR)
+install: all $(PIDGIN_INSTALL_PLUGINS_DIR)
+#	$(MAKE) -C $(GTKPERL_PLUGIN) -f $(MINGW_MAKEFILE) install
+	$(MAKE) -C $(TICKER_PLUGIN) -f $(MINGW_MAKEFILE) install
+	$(MAKE) -C $(TRANSPARENCY_PLUGIN) -f $(MINGW_MAKEFILE) install
+	$(MAKE) -C $(WINPREFS_PLUGIN) -f $(MINGW_MAKEFILE) install
+	cp *.dll $(PIDGIN_INSTALL_PLUGINS_DIR)

 .c.dll:
 	$(CC) $(CFLAGS) $(DEFINES) $(INCLUDE_PATHS) -o $@.o -c $<
@@ -91,9 +91,9 @@
 ##
 clean:
 	rm -f *.o *.dll
-	$(MAKE) -C $(GTKPERL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) clean
-	$(MAKE) -C $(TICKER_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) clean
-	$(MAKE) -C $(TRANSPARENCY_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) clean
-	$(MAKE) -C $(WINPREFS_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) clean
+	$(MAKE) -C $(GTKPERL_PLUGIN) -f $(MINGW_MAKEFILE) clean
+	$(MAKE) -C $(TICKER_PLUGIN) -f $(MINGW_MAKEFILE) clean
+	$(MAKE) -C $(TRANSPARENCY_PLUGIN) -f $(MINGW_MAKEFILE) clean
+	$(MAKE) -C $(WINPREFS_PLUGIN) -f $(MINGW_MAKEFILE) clean

-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
--- a/pidgin/plugins/perl/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/pidgin/plugins/perl/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -4,8 +4,8 @@
 # Description: Makefile for perl plugin loader plugin.
 #

-GAIM_TOP := ../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak

 ##
 ## TARGET DEFINITIONS
@@ -13,13 +13,13 @@
 .PHONY: all install clean

 all:
-	$(MAKE) -C ./common -f $(GAIM_WIN32_MAKEFILE)
+	$(MAKE) -C ./common -f $(MINGW_MAKEFILE)

-install: all $(GAIM_INSTALL_PLUGINS_DIR)
-	$(MAKE) -C ./common -f $(GAIM_WIN32_MAKEFILE) install
+install: all $(PIDGIN_INSTALL_PLUGINS_DIR)
+	$(MAKE) -C ./common -f $(MINGW_MAKEFILE) install

 ##
 ## CLEAN RULES
 ##
 clean:
-	$(MAKE) -C ./common -f $(GAIM_WIN32_MAKEFILE) clean
+	$(MAKE) -C ./common -f $(MINGW_MAKEFILE) clean
--- a/pidgin/plugins/perl/common/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/pidgin/plugins/perl/common/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -1,13 +1,13 @@
 #
 # Makefile.mingw
 #
-# Description: Makefile for Gaim perl module.
+# Description: Makefile for Pidgin perl module.
 #

-GAIM_TOP := ../../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak

-TARGET = GtkUI
+TARGET = Pidgin
 EXTUTILS ?= C:/perl/lib/ExtUtils

 CFLAGS += -Wno-comment -Wno-unused
@@ -16,10 +16,10 @@
 ## INCLUDE PATHS
 ##
 INCLUDE_PATHS =		-I. \
-			-I$(GAIM_TOP) \
-			-I$(GAIM_LIB_TOP) \
-			-I$(GAIM_GTK_TOP) \
-			-I$(GAIM_GTK_TOP)/win32 \
+			-I$(PIDGIN_TREE_TOP) \
+			-I$(PURPLE_TOP) \
+			-I$(PIDGIN_TOP) \
+			-I$(PIDGIN_TOP)/win32 \
 			-I$(GTK_TOP)/include \
 			-I$(GTK_TOP)/include/atk-1.0 \
 			-I$(GTK_TOP)/include/glib-2.0 \
@@ -30,9 +30,9 @@
 			-I$(PERL_LIB_TOP)/CORE

 LIB_PATHS = 		-L$(PERL_LIB_TOP) \
-			-L$(GAIM_LIB_TOP) \
-			-L$(GAIM_GTK_TOP) \
-			-L$(GAIM_LIB_PERL_TOP) \
+			-L$(PURPLE_TOP) \
+			-L$(PIDGIN_TOP) \
+			-L$(PURPLE_PERL_TOP) \
 			-L$(GTK_TOP)/lib

 ##
@@ -77,7 +77,7 @@
 			-lpidgin \
 			-lglib-2.0

-include $(GAIM_COMMON_RULES)
+include $(PIDGIN_COMMON_RULES)

 ##
 ## TARGETS
@@ -86,18 +86,18 @@

 all: $(TARGET).dll

-$(GAIM_INSTALL_PERLMOD_DIR)/Gaim.pm:
-	$(MAKE) -C $(GAIM_LIB_PERL_TOP)/common -f $(GAIM_WIN32_MAKEFILE) install
+$(PURPLE_INSTALL_PERLMOD_DIR)/Purple.pm:
+	$(MAKE) -C $(PURPLE_PERL_TOP)/common -f $(MINGW_MAKEFILE) install

-install: all $(GAIM_INSTALL_PERLMOD_DIR)/Gaim.pm
-	rm -f $(GAIM_INSTALL_PERLMOD_DIR)/$(TARGET).dll $(GAIM_INSTALL_PERLMOD_DIR)/Gaim/$(TARGET).pm
-	mkdir -p $(GAIM_INSTALL_PERLMOD_DIR)/Gaim
-	cp $(TARGET).pm $(GAIM_INSTALL_PERLMOD_DIR)/Gaim/
-	cp $(TARGET).dll $(GAIM_INSTALL_PERLMOD_DIR)
+install: all $(PURPLE_INSTALL_PERLMOD_DIR)/Purple.pm
+	rm -f $(PIDGIN_INSTALL_PERLMOD_DIR)/$(TARGET).dll $(PIDGIN_INSTALL_PERLMOD_DIR)/Pidgin/$(TARGET).pm
+	mkdir -p $(PIDGIN_INSTALL_PERLMOD_DIR)/Pidgin
+	cp $(TARGET).pm $(PIDGIN_INSTALL_PERLMOD_DIR)/Pidgin/
+	cp $(TARGET).dll $(PIDGIN_INSTALL_PERLMOD_DIR)

-$(C_FILES): $(GAIM_CONFIG_H)
+$(C_FILES): $(PIDGIN_CONFIG_H)

-$(TARGET).dll: $(GAIM_GTKGAIM_DLL).a $(GAIM_LIBGAIM_PERL_DLL).a $(OBJECTS)
+$(TARGET).dll: $(PIDGIN_DLL).a $(PURPLE_PERL_DLL).a $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) -o $(TARGET).dll

 ##
@@ -106,4 +106,4 @@
 clean:
 	rm -f *.o $(C_FILES) $(TARGET).dll

-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
--- a/pidgin/plugins/ticker/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/pidgin/plugins/ticker/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -4,8 +4,8 @@
 # Description: Makefile for ticker plugin.
 #

-GAIM_TOP := ../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak

 TARGET = ticker

@@ -20,15 +20,15 @@
 			-I$(GTK_TOP)/include/atk-1.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
 			-I$(GTK_TOP)/lib/gtk-2.0/include \
-			-I$(GAIM_LIB_TOP) \
-			-I$(GAIM_LIB_TOP)/win32 \
-			-I$(GAIM_GTK_TOP) \
-			-I$(GAIM_GTK_TOP)/win32 \
-			-I$(GAIM_TOP)
+			-I$(PURPLE_TOP) \
+			-I$(PURPLE_TOP)/win32 \
+			-I$(PIDGIN_TOP) \
+			-I$(PIDGIN_TOP)/win32 \
+			-I$(PIDGIN_TREE_TOP)

 LIB_PATHS =		-L$(GTK_TOP)/lib \
-			-L$(GAIM_LIB_TOP) \
-			-L$(GAIM_GTK_TOP)
+			-L$(PURPLE_TOP) \
+			-L$(PIDGIN_TOP)

 ##
 ##  SOURCES, OBJECTS
@@ -49,7 +49,7 @@
 			-lpurple \
 			-lpidgin

-include $(GAIM_COMMON_RULES)
+include $(PIDGIN_COMMON_RULES)

 ##
 ## TARGET DEFINITIONS
@@ -58,12 +58,12 @@

 all: $(TARGET).dll

-install: $(GAIM_INSTALL_PLUGINS_DIR)
-	cp $(TARGET).dll $(GAIM_INSTALL_PLUGINS_DIR)
+install: $(PIDGIN_INSTALL_PLUGINS_DIR)
+	cp $(TARGET).dll $(PIDGIN_INSTALL_PLUGINS_DIR)

-$(OBJECTS): $(GAIM_CONFIG_H)
+$(OBJECTS): $(PIDGIN_CONFIG_H)

-$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(GAIM_GTKGAIM_DLL).a $(OBJECTS)
+$(TARGET).dll: $(PURPLE_DLL).a $(PIDGIN_DLL).a $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll

 ##
@@ -73,4 +73,4 @@
 	rm -rf $(OBJECTS)
 	rm -rf $(TARGET).dll

-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
--- a/pidgin/plugins/win32/transparency/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/pidgin/plugins/win32/transparency/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -4,8 +4,8 @@
 # Description: Makefile for win32trans plugin.
 #

-GAIM_TOP := ../../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak

 TARGET = win2ktrans
 DEFINES += -D_WIN32_WINNT=0x0500
@@ -21,15 +21,15 @@
 			-I$(GTK_TOP)/include/atk-1.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
 			-I$(GTK_TOP)/lib/gtk-2.0/include \
-			-I$(GAIM_LIB_TOP) \
-			-I$(GAIM_LIB_TOP)/win32 \
-			-I$(GAIM_GTK_TOP) \
-			-I$(GAIM_GTK_TOP)/win32 \
-			-I$(GAIM_TOP)
+			-I$(PURPLE_TOP) \
+			-I$(PURPLE_TOP)/win32 \
+			-I$(PIDGIN_TOP) \
+			-I$(PIDGIN_TOP)/win32 \
+			-I$(PIDGIN_TREE_TOP)

 LIB_PATHS =		-L$(GTK_TOP)/lib \
-			-L$(GAIM_LIB_TOP) \
-			-L$(GAIM_GTK_TOP)
+			-L$(PURPLE_TOP) \
+			-L$(PIDGIN_TOP)

 ##
 ##  SOURCES, OBJECTS
@@ -50,7 +50,7 @@
 			-lpidgin \
 			-lpurple

-include $(GAIM_COMMON_RULES)
+include $(PIDGIN_COMMON_RULES)

 ##
 ## TARGET DEFINITIONS
@@ -59,10 +59,10 @@

 all: $(TARGET).dll

-install: all $(GAIM_INSTALL_PLUGINS_DIR)
-	cp $(TARGET).dll $(GAIM_INSTALL_PLUGINS_DIR)
+install: all $(PIDGIN_INSTALL_PLUGINS_DIR)
+	cp $(TARGET).dll $(PIDGIN_INSTALL_PLUGINS_DIR)

-$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(GAIM_GTKGAIM_DLL).a $(OBJECTS)
+$(TARGET).dll: $(PURPLE_DLL).a $(PIDGIN_DLL).a $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll

 ##
@@ -72,4 +72,4 @@
 	rm -rf $(OBJECTS)
 	rm -rf $(TARGET).dll

-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
--- a/pidgin/plugins/win32/winprefs/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/pidgin/plugins/win32/winprefs/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -4,8 +4,8 @@
 # Description: Makefile for winprefs plugin.
 #

-GAIM_TOP := ../../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak

 TARGET = winprefs
 DEFINES += -DWINVER=0x500
@@ -21,15 +21,15 @@
 			-I$(GTK_TOP)/include/atk-1.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
 			-I$(GTK_TOP)/lib/gtk-2.0/include \
-			-I$(GAIM_LIB_TOP) \
-			-I$(GAIM_LIB_TOP)/win32 \
-			-I$(GAIM_GTK_TOP) \
-			-I$(GAIM_GTK_TOP)/win32 \
-			-I$(GAIM_TOP)
+			-I$(PURPLE_TOP) \
+			-I$(PURPLE_TOP)/win32 \
+			-I$(PIDGIN_TOP) \
+			-I$(PIDGIN_TOP)/win32 \
+			-I$(PIDGIN_TREE_TOP)

 LIB_PATHS =		-L$(GTK_TOP)/lib \
-			-L$(GAIM_LIB_TOP) \
-			-L$(GAIM_GTK_TOP)
+			-L$(PURPLE_TOP) \
+			-L$(PIDGIN_TOP)

 ##
 ##  SOURCES, OBJECTS
@@ -52,7 +52,7 @@
 			-lpurple \
 			-lpidgin

-include $(GAIM_COMMON_RULES)
+include $(PIDGIN_COMMON_RULES)

 ##
 ## TARGET DEFINITIONS
@@ -61,13 +61,13 @@

 all: $(TARGET).dll

-install: $(TARGET).dll $(GAIM_INSTALL_PLUGINS_DIR)
-	cp $(TARGET).dll $(GAIM_INSTALL_PLUGINS_DIR)
+install: $(TARGET).dll $(PIDGIN_INSTALL_PLUGINS_DIR)
+	cp $(TARGET).dll $(PIDGIN_INSTALL_PLUGINS_DIR)

 ##
 ## BUILD DLL
 ##
-$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(GAIM_GTKGAIM_DLL).a $(OBJECTS)
+$(TARGET).dll: $(PURPLE_DLL).a $(PIDGIN_DLL).a $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll

 ##
@@ -77,4 +77,4 @@
 	rm -rf $(OBJECTS)
 	rm -rf $(TARGET).dll

-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
--- a/pidgin/sounds/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/pidgin/sounds/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -1,13 +1,13 @@
 #
 # Makefile.mingw
 #
-# Description: Makefile for win32 (mingw) version of Gaim sounds
+# Description: Makefile for win32 (mingw) version of Pidgin sounds
 #

-GAIM_TOP := ../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak

-datadir := $(GAIM_INSTALL_DIR)
+datadir := $(PIDGIN_INSTALL_DIR)
 include ./Makefile.am

 .PHONY: install
--- a/pidgin/win32/IdleTracker/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/pidgin/win32/IdleTracker/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -4,8 +4,8 @@
 # Description: Makefile for idletrack
 #

-GAIM_TOP := ../../..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ../../..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak

 TARGET = idletrack

@@ -17,7 +17,7 @@

 OBJECTS = $(C_SRC:%.c=%.o)

-include $(GAIM_COMMON_RULES)
+include $(PIDGIN_COMMON_RULES)

 ##
 ## TARGET DEFINITIONS
@@ -27,8 +27,8 @@

 all: $(TARGET).dll

-install: $(GAIM_INSTALL_DIR)
-	cp $(TARGET).dll $(GAIM_INSTALL_DIR)
+install: $(PIDGIN_INSTALL_DIR)
+	cp $(TARGET).dll $(PIDGIN_INSTALL_DIR)

 ##
 ## BUILD DLL
@@ -44,4 +44,4 @@
 clean:
 	rm -f $(OBJECTS) $(TARGET).dll $(TARGET).dll.a

-include $(GAIM_COMMON_TARGETS)
+include $(PIDGIN_COMMON_TARGETS)
--- a/po/Makefile.mingw	Tue Apr 10 16:48:20 2007 +0000
+++ b/po/Makefile.mingw	Tue Apr 10 16:54:51 2007 +0000
@@ -3,8 +3,8 @@
 # Description: Makefile to generate mo files
 #

-GAIM_TOP := ..
-include $(GAIM_TOP)/libpurple/win32/global.mak
+PIDGIN_TREE_TOP := ..
+include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak

 PACKAGE = pidgin

@@ -33,19 +33,19 @@
 all: $(CATALOGS)

 install: all
-	mkdir -p $(GAIM_INSTALL_PO_DIR)
+	mkdir -p $(PURPLE_INSTALL_PO_DIR)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
-	  dir=$(GAIM_INSTALL_PO_DIR)/$$lang/LC_MESSAGES; \
+	  dir=$(PURPLE_INSTALL_PO_DIR)/$$lang/LC_MESSAGES; \
 	  mkdir -p $$dir; \
 	  if test -r $$cat; then \
 	    cp $$cat $$dir/$(PACKAGE).mo; \
 	    echo "installing $$cat as $$dir/$(PACKAGE).mo"; \
 	  else \
-	    cp $(GAIM_PO_TOP)/$$cat $$dir/$(PACKAGE).mo; \
-	    echo "installing $(GAIM_PO_TOP)/$$cat as" \
+	    cp $(PURPLE_PO_TOP)/$$cat $$dir/$(PACKAGE).mo; \
+	    echo "installing $(PURPLE_PO_TOP)/$$cat as" \
 		 "$$dir/$(PACKAGE).mo"; \
 	  fi; \
 	done
--- a/po/fi.po	Tue Apr 10 16:48:20 2007 +0000
+++ b/po/fi.po	Tue Apr 10 16:54:51 2007 +0000
@@ -15499,9 +15499,6 @@
 #~ msgid "Provides options specific to Windows "
 #~ msgstr "Tarjoaa asetukset jotka liittyvät erityisesti Windows-versioon "

-#~ msgid "Pidgin Internet Messenger"
-#~ msgstr "Pidgin-pikaviestin"
-
 #~ msgid "/Conversation/Insert Lin_k..."
 #~ msgstr "/Keskustelu/Lisää lin_kki..."