1460 files changed, 102 insertions, 103 deletions

diff --git a/Makefile.am b/Makefile.am
index e33052a2e0..c973cb2883 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,8 +36,8 @@ dist-hook: gaim.spec
 	cp gaim.spec $(distdir)
 	rm $(distdir)/config.h
 
-distcheck-hook: libgaim/plugins/perl/common/Gaim.pm gtk/plugins/perl/common/GtkUI.pm
-#	cp libgaim/plugins/perl/common/Gaim.pm $(distdir)/libgaim/plugins/perl/common
+distcheck-hook: libpurple/plugins/perl/common/Gaim.pm gtk/plugins/perl/common/GtkUI.pm
+#	cp libpurple/plugins/perl/common/Gaim.pm $(distdir)/libpurple/plugins/perl/common
 
 appsdir = $(datadir)/applications
 apps_in_files = gaim.desktop.in
@@ -45,14 +45,14 @@ apps_DATA = $(apps_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
 if ENABLE_GTK
-GTK_DIR=gtk
+GTK_DIR=pidgin
 endif
 
 if ENABLE_GNT
 GNT_DIR=console
 endif
 
-SUBDIRS = libgaim doc $(GNT_DIR) $(GTK_DIR) m4macros po
+SUBDIRS = libpurple doc $(GNT_DIR) $(GTK_DIR) m4macros po
 
 docs: Doxyfile
 if HAVE_DOXYGEN
@@ -69,5 +69,5 @@ endif
 distuninstallcheck_listfiles = \
 	find . -type f -print | grep -v perl | grep -v Gaim.3pm
 
-DISTCLEANFILES= gaim.desktop libgaim/gconf/gaim.schemas intltool-extract \
+DISTCLEANFILES= gaim.desktop libpurple/gconf/gaim.schemas intltool-extract \
 			intltool-merge intltool-update
diff --git a/configure.ac b/configure.ac
index 5525c64662..9523186bf0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1886,50 +1886,50 @@ AC_OUTPUT([Makefile
 		   doc/gaim.1
 		   doc/gaim-text.1
 		   m4macros/Makefile
-		   gtk/Makefile
-		   gtk/pixmaps/Makefile
-		   gtk/pixmaps/buddy_icons/Makefile
-		   gtk/pixmaps/buddy_icons/qq/Makefile
-		   gtk/pixmaps/smileys/Makefile
-		   gtk/pixmaps/smileys/default/Makefile
-		   gtk/pixmaps/smileys/none/Makefile
-		   gtk/pixmaps/status/Makefile
-		   gtk/pixmaps/status/default/Makefile
-		   gtk/plugins/Makefile
-		   gtk/plugins/cap/Makefile
-		   gtk/plugins/gestures/Makefile
-		   gtk/plugins/gevolution/Makefile
-		   gtk/plugins/musicmessaging/Makefile
-		   gtk/plugins/perl/Makefile
-		   gtk/plugins/perl/common/Makefile.PL
-		   gtk/plugins/ticker/Makefile
-		   gtk/sounds/Makefile
-		   libgaim/gconf/Makefile
-		   libgaim/plugins/Makefile
-		   libgaim/plugins/mono/Makefile
-		   libgaim/plugins/mono/api/Makefile
-		   libgaim/plugins/mono/loader/Makefile
-		   libgaim/plugins/perl/Makefile
-		   libgaim/plugins/perl/common/Makefile.PL
-		   libgaim/plugins/ssl/Makefile
-		   libgaim/plugins/tcl/Makefile
-		   libgaim/Makefile
-		   libgaim/protocols/Makefile
-		   libgaim/protocols/bonjour/Makefile
-		   libgaim/protocols/gg/Makefile
-		   libgaim/protocols/irc/Makefile
-		   libgaim/protocols/jabber/Makefile
-		   libgaim/protocols/msn/Makefile
-		   libgaim/protocols/novell/Makefile
-		   libgaim/protocols/oscar/Makefile
-		   libgaim/protocols/qq/Makefile
-		   libgaim/protocols/sametime/Makefile
-		   libgaim/protocols/silc/Makefile
-		   libgaim/protocols/simple/Makefile
-		   libgaim/protocols/toc/Makefile
-		   libgaim/protocols/yahoo/Makefile
-		   libgaim/protocols/zephyr/Makefile
-		   libgaim/tests/Makefile
+		   pidgin/Makefile
+		   pidgin/pixmaps/Makefile
+		   pidgin/pixmaps/buddy_icons/Makefile
+		   pidgin/pixmaps/buddy_icons/qq/Makefile
+		   pidgin/pixmaps/smileys/Makefile
+		   pidgin/pixmaps/smileys/default/Makefile
+		   pidgin/pixmaps/smileys/none/Makefile
+		   pidgin/pixmaps/status/Makefile
+		   pidgin/pixmaps/status/default/Makefile
+		   pidgin/plugins/Makefile
+		   pidgin/plugins/cap/Makefile
+		   pidgin/plugins/gestures/Makefile
+		   pidgin/plugins/gevolution/Makefile
+		   pidgin/plugins/musicmessaging/Makefile
+		   pidgin/plugins/perl/Makefile
+		   pidgin/plugins/perl/common/Makefile.PL
+		   pidgin/plugins/ticker/Makefile
+		   pidgin/sounds/Makefile
+		   libpurple/gconf/Makefile
+		   libpurple/plugins/Makefile
+		   libpurple/plugins/mono/Makefile
+		   libpurple/plugins/mono/api/Makefile
+		   libpurple/plugins/mono/loader/Makefile
+		   libpurple/plugins/perl/Makefile
+		   libpurple/plugins/perl/common/Makefile.PL
+		   libpurple/plugins/ssl/Makefile
+		   libpurple/plugins/tcl/Makefile
+		   libpurple/Makefile
+		   libpurple/protocols/Makefile
+		   libpurple/protocols/bonjour/Makefile
+		   libpurple/protocols/gg/Makefile
+		   libpurple/protocols/irc/Makefile
+		   libpurple/protocols/jabber/Makefile
+		   libpurple/protocols/msn/Makefile
+		   libpurple/protocols/novell/Makefile
+		   libpurple/protocols/oscar/Makefile
+		   libpurple/protocols/qq/Makefile
+		   libpurple/protocols/sametime/Makefile
+		   libpurple/protocols/silc/Makefile
+		   libpurple/protocols/simple/Makefile
+		   libpurple/protocols/toc/Makefile
+		   libpurple/protocols/yahoo/Makefile
+		   libpurple/protocols/zephyr/Makefile
+		   libpurple/tests/Makefile
 		   console/Makefile
 		   console/libgnt/Makefile
 		   console/libgnt/gnt.pc
diff --git a/console/Makefile.am b/console/Makefile.am
index 6928254e20..0e571f548c 100644
--- a/console/Makefile.am
+++ b/console/Makefile.am
@@ -46,7 +46,7 @@ gaim_text_LDADD = \
 	$(LIBXML_LIBS) \
 	$(GNT_LIBS) \
 	./libgnt/libgnt.la \
-	$(top_builddir)/libgaim/libgaim.la
+	$(top_builddir)/libpurple/libgaim.la
 
 AM_CPPFLAGS = \
 	-DSTANDALONE \
@@ -55,7 +55,7 @@ AM_CPPFLAGS = \
 	-DLIBDIR=\"$(libdir)/gaim/\" \
 	-DLOCALEDIR=\"$(datadir)/locale\" \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-I$(top_srcdir)/libgaim/ \
+	-I$(top_srcdir)/libpurple/ \
 	-I$(top_srcdir) \
 	-I$(srcdir)/libgnt/ \
 	$(DEBUG_CFLAGS) \
diff --git a/console/gntgaim.h b/console/gntgaim.h
index 5338e76e3a..3047d263a0 100644
--- a/console/gntgaim.h
+++ b/console/gntgaim.h
@@ -21,7 +21,7 @@
  */
 #include <glib.h>
 
-#include "libgaim/internal.h"
+#include "libpurple/internal.h"
 
 #define GAIM_GNT_UI "gnt-gaim"
 
diff --git a/console/libgnt/wms/Makefile.am b/console/libgnt/wms/Makefile.am
index db6c2bf708..dc8288f055 100644
--- a/console/libgnt/wms/Makefile.am
+++ b/console/libgnt/wms/Makefile.am
@@ -9,14 +9,14 @@ s_la_SOURCES = s.c
 s_la_LIBADD =  \
   $(GLIB_LIBS) \
   $(top_builddir)/console/libgnt/libgnt.la \
-  $(top_builddir)/libgaim/libgaim.la
+  $(top_builddir)/libpurple/libgaim.la
 
 EXTRA_DIST = 
 
 AM_CPPFLAGS = \
 	-DDATADIR=\"$(datadir)\" \
 	-DVERSION=\"$(VERSION)\" \
-	-I$(top_srcdir)/libgaim \
+	-I$(top_srcdir)/libpurple \
 	-I$(top_srcdir)/console \
 	-I$(top_srcdir)/console/libgnt \
 	$(DEBUG_CFLAGS) \
diff --git a/console/plugins/Makefile.am b/console/plugins/Makefile.am
index 2f3af0e804..24a37b2c4f 100644
--- a/console/plugins/Makefile.am
+++ b/console/plugins/Makefile.am
@@ -28,8 +28,8 @@ EXTRA_DIST =
 AM_CPPFLAGS = \
 	-DDATADIR=\"$(datadir)\" \
 	-DVERSION=\"$(VERSION)\" \
-	-I$(top_builddir)/libgaim \
-	-I$(top_srcdir)/libgaim \
+	-I$(top_builddir)/libpurple \
+	-I$(top_srcdir)/libpurple \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/console \
 	-I$(top_srcdir)/console/libgnt \
diff --git a/libgaim/Makefile.am b/libpurple/Makefile.am
index a5d6c3afa9..a5d6c3afa9 100644
--- a/libgaim/Makefile.am
+++ b/libpurple/Makefile.am
diff --git a/libgaim/Makefile.mingw b/libpurple/Makefile.mingw
index d69bcec153..d69bcec153 100644
--- a/libgaim/Makefile.mingw
+++ b/libpurple/Makefile.mingw
diff --git a/libgaim/account.c b/libpurple/account.c
index cc409cd713..cc409cd713 100644
--- a/libgaim/account.c
+++ b/libpurple/account.c
diff --git a/libgaim/account.h b/libpurple/account.h
index 43a71f8fb4..43a71f8fb4 100644
--- a/libgaim/account.h
+++ b/libpurple/account.h
diff --git a/libgaim/accountopt.c b/libpurple/accountopt.c
index 78fd990f9d..78fd990f9d 100644
--- a/libgaim/accountopt.c
+++ b/libpurple/accountopt.c
diff --git a/libgaim/accountopt.h b/libpurple/accountopt.h
index 3790779d25..3790779d25 100644
--- a/libgaim/accountopt.h
+++ b/libpurple/accountopt.h
diff --git a/libgaim/blist.c b/libpurple/blist.c
index 75c580827d..75c580827d 100644
--- a/libgaim/blist.c
+++ b/libpurple/blist.c
diff --git a/libgaim/blist.h b/libpurple/blist.h
index 3eb23cdea1..3eb23cdea1 100644
--- a/libgaim/blist.h
+++ b/libpurple/blist.h
diff --git a/libgaim/buddyicon.c b/libpurple/buddyicon.c
index fe9e87f889..fe9e87f889 100644
--- a/libgaim/buddyicon.c
+++ b/libpurple/buddyicon.c
diff --git a/libgaim/buddyicon.h b/libpurple/buddyicon.h
index 8a7e853c92..8a7e853c92 100644
--- a/libgaim/buddyicon.h
+++ b/libpurple/buddyicon.h
diff --git a/libgaim/cipher.c b/libpurple/cipher.c
index 5bbd8a78dd..5bbd8a78dd 100644
--- a/libgaim/cipher.c
+++ b/libpurple/cipher.c
diff --git a/libgaim/cipher.h b/libpurple/cipher.h
index e325fa6bdb..e325fa6bdb 100644
--- a/libgaim/cipher.h
+++ b/libpurple/cipher.h
diff --git a/libgaim/circbuffer.c b/libpurple/circbuffer.c
index 441e700479..441e700479 100644
--- a/libgaim/circbuffer.c
+++ b/libpurple/circbuffer.c
diff --git a/libgaim/circbuffer.h b/libpurple/circbuffer.h
index 27229efc11..27229efc11 100644
--- a/libgaim/circbuffer.h
+++ b/libpurple/circbuffer.h
diff --git a/libgaim/cmds.c b/libpurple/cmds.c
index c0f2d19402..c0f2d19402 100644
--- a/libgaim/cmds.c
+++ b/libpurple/cmds.c
diff --git a/libgaim/cmds.h b/libpurple/cmds.h
index 35c88efdf0..35c88efdf0 100644
--- a/libgaim/cmds.h
+++ b/libpurple/cmds.h
diff --git a/libgaim/connection.c b/libpurple/connection.c
index 1e89d2ed8e..1e89d2ed8e 100644
--- a/libgaim/connection.c
+++ b/libpurple/connection.c
diff --git a/libgaim/connection.h b/libpurple/connection.h
index 51b912a4d3..51b912a4d3 100644
--- a/libgaim/connection.h
+++ b/libpurple/connection.h
diff --git a/libgaim/conversation.c b/libpurple/conversation.c
index ee81ca8b1f..ee81ca8b1f 100644
--- a/libgaim/conversation.c
+++ b/libpurple/conversation.c
diff --git a/libgaim/conversation.h b/libpurple/conversation.h
index c24611e460..c24611e460 100644
--- a/libgaim/conversation.h
+++ b/libpurple/conversation.h
diff --git a/libgaim/core.c b/libpurple/core.c
index fa90d83e79..fa90d83e79 100644
--- a/libgaim/core.c
+++ b/libpurple/core.c
diff --git a/libgaim/core.h b/libpurple/core.h
index ba392b0edd..ba392b0edd 100644
--- a/libgaim/core.h
+++ b/libpurple/core.h
diff --git a/libgaim/dbus-analyze-functions.py b/libpurple/dbus-analyze-functions.py
index 9d37546878..9d37546878 100644
--- a/libgaim/dbus-analyze-functions.py
+++ b/libpurple/dbus-analyze-functions.py
diff --git a/libgaim/dbus-analyze-types.py b/libpurple/dbus-analyze-types.py
index 1f068ec75a..1f068ec75a 100644
--- a/libgaim/dbus-analyze-types.py
+++ b/libpurple/dbus-analyze-types.py
diff --git a/libgaim/dbus-bindings.h b/libpurple/dbus-bindings.h
index c350004f61..c350004f61 100644
--- a/libgaim/dbus-bindings.h
+++ b/libpurple/dbus-bindings.h
diff --git a/libgaim/dbus-define-api.h b/libpurple/dbus-define-api.h
index da55b2391c..da55b2391c 100644
--- a/libgaim/dbus-define-api.h
+++ b/libpurple/dbus-define-api.h
diff --git a/libgaim/dbus-gaim.h b/libpurple/dbus-gaim.h
index 9a555af252..9a555af252 100644
--- a/libgaim/dbus-gaim.h
+++ b/libpurple/dbus-gaim.h
diff --git a/libgaim/dbus-gaim.service b/libpurple/dbus-gaim.service
index e6bfe22117..e6bfe22117 100644
--- a/libgaim/dbus-gaim.service
+++ b/libpurple/dbus-gaim.service
diff --git a/libgaim/dbus-maybe.h b/libpurple/dbus-maybe.h
index a3cd8f01f0..a3cd8f01f0 100644
--- a/libgaim/dbus-maybe.h
+++ b/libpurple/dbus-maybe.h
diff --git a/libgaim/dbus-server.c b/libpurple/dbus-server.c
index 16eea5988e..16eea5988e 100644
--- a/libgaim/dbus-server.c
+++ b/libpurple/dbus-server.c
diff --git a/libgaim/dbus-server.h b/libpurple/dbus-server.h
index 5147654b03..5147654b03 100644
--- a/libgaim/dbus-server.h
+++ b/libpurple/dbus-server.h
diff --git a/libgaim/dbus-useful.c b/libpurple/dbus-useful.c
index dae64aa12b..dae64aa12b 100644
--- a/libgaim/dbus-useful.c
+++ b/libpurple/dbus-useful.c
diff --git a/libgaim/dbus-useful.h b/libpurple/dbus-useful.h
index c5889a2a9f..c5889a2a9f 100644
--- a/libgaim/dbus-useful.h
+++ b/libpurple/dbus-useful.h
diff --git a/libgaim/debug.c b/libpurple/debug.c
index 0541bf6cbe..0541bf6cbe 100644
--- a/libgaim/debug.c
+++ b/libpurple/debug.c
diff --git a/libgaim/debug.h b/libpurple/debug.h
index 03348b035d..03348b035d 100644
--- a/libgaim/debug.h
+++ b/libpurple/debug.h
diff --git a/libgaim/desktopitem.c b/libpurple/desktopitem.c
index 9154c24ad7..9154c24ad7 100644
--- a/libgaim/desktopitem.c
+++ b/libpurple/desktopitem.c
diff --git a/libgaim/desktopitem.h b/libpurple/desktopitem.h
index efb03e901d..efb03e901d 100644
--- a/libgaim/desktopitem.h
+++ b/libpurple/desktopitem.h
diff --git a/libgaim/dnsquery.c b/libpurple/dnsquery.c
index 825c6d71d0..825c6d71d0 100644
--- a/libgaim/dnsquery.c
+++ b/libpurple/dnsquery.c
diff --git a/libgaim/dnsquery.h b/libpurple/dnsquery.h
index 8c3a98e12c..8c3a98e12c 100644
--- a/libgaim/dnsquery.h
+++ b/libpurple/dnsquery.h
diff --git a/libgaim/dnssrv.c b/libpurple/dnssrv.c
index ae5cbacab9..ae5cbacab9 100644
--- a/libgaim/dnssrv.c
+++ b/libpurple/dnssrv.c
diff --git a/libgaim/dnssrv.h b/libpurple/dnssrv.h
index f2dee8f6ac..f2dee8f6ac 100644
--- a/libgaim/dnssrv.h
+++ b/libpurple/dnssrv.h
diff --git a/libgaim/eventloop.c b/libpurple/eventloop.c
index 3ee0b2ecb2..3ee0b2ecb2 100644
--- a/libgaim/eventloop.c
+++ b/libpurple/eventloop.c
diff --git a/libgaim/eventloop.h b/libpurple/eventloop.h
index ca29f646e8..ca29f646e8 100644
--- a/libgaim/eventloop.h
+++ b/libpurple/eventloop.h
diff --git a/libgaim/ft.c b/libpurple/ft.c
index af09b713bc..af09b713bc 100644
--- a/libgaim/ft.c
+++ b/libpurple/ft.c
diff --git a/libgaim/ft.h b/libpurple/ft.h
index ef8a653877..ef8a653877 100644
--- a/libgaim/ft.h
+++ b/libpurple/ft.h
diff --git a/libgaim/gaim-client-example.c b/libpurple/gaim-client-example.c
index d2f69a2ce0..d2f69a2ce0 100644
--- a/libgaim/gaim-client-example.c
+++ b/libpurple/gaim-client-example.c
diff --git a/libgaim/gaim-client.c b/libpurple/gaim-client.c
index b2286a293d..b2286a293d 100644
--- a/libgaim/gaim-client.c
+++ b/libpurple/gaim-client.c
diff --git a/libgaim/gaim-client.h b/libpurple/gaim-client.h
index 8bc8ed63ca..8bc8ed63ca 100644
--- a/libgaim/gaim-client.h
+++ b/libpurple/gaim-client.h
diff --git a/libgaim/gaim-notifications-example b/libpurple/gaim-notifications-example
index 7fbe03e15f..7fbe03e15f 100644
--- a/libgaim/gaim-notifications-example
+++ b/libpurple/gaim-notifications-example
diff --git a/libgaim/gaim-remote b/libpurple/gaim-remote
index dad3a89303..dad3a89303 100755
--- a/libgaim/gaim-remote
+++ b/libpurple/gaim-remote
diff --git a/libgaim/gaim-send b/libpurple/gaim-send
index 394a364fde..394a364fde 100755
--- a/libgaim/gaim-send
+++ b/libpurple/gaim-send
diff --git a/libgaim/gaim-send-async b/libpurple/gaim-send-async
index ed28825a4f..ed28825a4f 100755
--- a/libgaim/gaim-send-async
+++ b/libpurple/gaim-send-async
diff --git a/libgaim/gaim-url-handler b/libpurple/gaim-url-handler
index a663af179a..a663af179a 100755
--- a/libgaim/gaim-url-handler
+++ b/libpurple/gaim-url-handler
diff --git a/libgaim/gaim.h b/libpurple/gaim.h
index b70c6d7b07..b70c6d7b07 100644
--- a/libgaim/gaim.h
+++ b/libpurple/gaim.h
diff --git a/libgaim/gconf/Makefile.am b/libpurple/gconf/Makefile.am
index e974c2a8b8..e974c2a8b8 100644
--- a/libgaim/gconf/Makefile.am
+++ b/libpurple/gconf/Makefile.am
diff --git a/libgaim/gconf/gaim.schemas.in b/libpurple/gconf/gaim.schemas.in
index 2b77808fd5..2b77808fd5 100644
--- a/libgaim/gconf/gaim.schemas.in
+++ b/libpurple/gconf/gaim.schemas.in
diff --git a/libgaim/idle.c b/libpurple/idle.c
index 3d0c9fbe1f..3d0c9fbe1f 100644
--- a/libgaim/idle.c
+++ b/libpurple/idle.c
diff --git a/libgaim/idle.h b/libpurple/idle.h
index 4cdd8b41d7..4cdd8b41d7 100644
--- a/libgaim/idle.h
+++ b/libpurple/idle.h
diff --git a/libgaim/imgstore.c b/libpurple/imgstore.c
index 48b58a8c91..48b58a8c91 100644
--- a/libgaim/imgstore.c
+++ b/libpurple/imgstore.c
diff --git a/libgaim/imgstore.h b/libpurple/imgstore.h
index 46389adb74..46389adb74 100644
--- a/libgaim/imgstore.h
+++ b/libpurple/imgstore.h
diff --git a/libgaim/internal.h b/libpurple/internal.h
index 78a0b58454..78a0b58454 100644
--- a/libgaim/internal.h
+++ b/libpurple/internal.h
diff --git a/libgaim/log.c b/libpurple/log.c
index ac289c65da..ac289c65da 100644
--- a/libgaim/log.c
+++ b/libpurple/log.c
diff --git a/libgaim/log.h b/libpurple/log.h
index b5cf239158..b5cf239158 100644
--- a/libgaim/log.h
+++ b/libpurple/log.h
diff --git a/libgaim/mime.c b/libpurple/mime.c
index 7239cfaea9..7239cfaea9 100644
--- a/libgaim/mime.c
+++ b/libpurple/mime.c
diff --git a/libgaim/mime.h b/libpurple/mime.h
index abce1884a6..abce1884a6 100644
--- a/libgaim/mime.h
+++ b/libpurple/mime.h
diff --git a/libgaim/network.c b/libpurple/network.c
index 61d378a7f2..61d378a7f2 100644
--- a/libgaim/network.c
+++ b/libpurple/network.c
diff --git a/libgaim/network.h b/libpurple/network.h
index cfcf47e6ab..cfcf47e6ab 100644
--- a/libgaim/network.h
+++ b/libpurple/network.h
diff --git a/libgaim/notify.c b/libpurple/notify.c
index 34a492c808..34a492c808 100644
--- a/libgaim/notify.c
+++ b/libpurple/notify.c
diff --git a/libgaim/notify.h b/libpurple/notify.h
index bd111b21fa..bd111b21fa 100644
--- a/libgaim/notify.h
+++ b/libpurple/notify.h
diff --git a/libgaim/ntlm.c b/libpurple/ntlm.c
index d285082764..d285082764 100644
--- a/libgaim/ntlm.c
+++ b/libpurple/ntlm.c
diff --git a/libgaim/ntlm.h b/libpurple/ntlm.h
index bb4b013afe..bb4b013afe 100644
--- a/libgaim/ntlm.h
+++ b/libpurple/ntlm.h
diff --git a/libgaim/plugin.c b/libpurple/plugin.c
index 377ac39301..377ac39301 100644
--- a/libgaim/plugin.c
+++ b/libpurple/plugin.c
diff --git a/libgaim/plugin.h b/libpurple/plugin.h
index e517436d94..e517436d94 100644
--- a/libgaim/plugin.h
+++ b/libpurple/plugin.h
diff --git a/libgaim/pluginpref.c b/libpurple/pluginpref.c
index c3b4e8e47e..c3b4e8e47e 100644
--- a/libgaim/pluginpref.c
+++ b/libpurple/pluginpref.c
diff --git a/libgaim/pluginpref.h b/libpurple/pluginpref.h
index edb6c3b593..edb6c3b593 100644
--- a/libgaim/pluginpref.h
+++ b/libpurple/pluginpref.h
diff --git a/libgaim/plugins/Makefile.am b/libpurple/plugins/Makefile.am
index 3b336613c1..26324007af 100644
--- a/libgaim/plugins/Makefile.am
+++ b/libpurple/plugins/Makefile.am
@@ -80,14 +80,14 @@ dbus_example_la_LIBADD      = $(GLIB_LIBS) $(DBUS_LIBS)
 
 .PHONY: always
 
-$(top_builddir)/libgaim/dbus-types.h: always
+$(top_builddir)/libpurple/dbus-types.h: always
 	cd $(@D) && $(MAKE) $(AM_MAKEFLAGS) $(@F)
 
-dbus-example-bindings.c: $(top_srcdir)/libgaim/dbus-analyze-functions.py $(dbus_example_la_SOURCES)
+dbus-example-bindings.c: $(top_srcdir)/libpurple/dbus-analyze-functions.py $(dbus_example_la_SOURCES)
 	cat $(srcdir)/$(dbus_example_la_SOURCES) | \
-	$(PYTHON) $(top_srcdir)/libgaim/dbus-analyze-functions.py --export-only > $@
+	$(PYTHON) $(top_srcdir)/libpurple/dbus-analyze-functions.py --export-only > $@
 
-$(dbus_example_la_OBJECTS) dbus-example.so: dbus-example-bindings.c $(top_builddir)/libgaim/dbus-types.h
+$(dbus_example_la_OBJECTS) dbus-example.so: dbus-example-bindings.c $(top_builddir)/libpurple/dbus-types.h
 
 
 endif # ENABLE_DBUS
@@ -109,8 +109,8 @@ EXTRA_DIST = \
 AM_CPPFLAGS = \
 	-DDATADIR=\"$(datadir)\" \
 	-DVERSION=\"$(VERSION)\" \
-	-I$(top_builddir)/libgaim \
-	-I$(top_srcdir)/libgaim \
+	-I$(top_builddir)/libpurple \
+	-I$(top_srcdir)/libpurple \
 	$(DEBUG_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(PLUGIN_CFLAGS) \
diff --git a/libgaim/plugins/Makefile.mingw b/libpurple/plugins/Makefile.mingw
index 4076c06c54..4076c06c54 100644
--- a/libgaim/plugins/Makefile.mingw
+++ b/libpurple/plugins/Makefile.mingw
diff --git a/libgaim/plugins/autoaccept.c b/libpurple/plugins/autoaccept.c
index cd4185f126..cd4185f126 100644
--- a/libgaim/plugins/autoaccept.c
+++ b/libpurple/plugins/autoaccept.c
diff --git a/libgaim/plugins/autoreply.c b/libpurple/plugins/autoreply.c
index df4602247d..df4602247d 100644
--- a/libgaim/plugins/autoreply.c
+++ b/libpurple/plugins/autoreply.c
diff --git a/libgaim/plugins/buddynote.c b/libpurple/plugins/buddynote.c
index 9bfe3f922a..9bfe3f922a 100644
--- a/libgaim/plugins/buddynote.c
+++ b/libpurple/plugins/buddynote.c
diff --git a/libgaim/plugins/ciphertest.c b/libpurple/plugins/ciphertest.c
index d7416dbc71..d7416dbc71 100644
--- a/libgaim/plugins/ciphertest.c
+++ b/libpurple/plugins/ciphertest.c
diff --git a/libgaim/plugins/codeinline.c b/libpurple/plugins/codeinline.c
index 734a918000..734a918000 100755
--- a/libgaim/plugins/codeinline.c
+++ b/libpurple/plugins/codeinline.c
diff --git a/libgaim/plugins/dbus-buddyicons-example.py b/libpurple/plugins/dbus-buddyicons-example.py
index d501370568..d501370568 100644
--- a/libgaim/plugins/dbus-buddyicons-example.py
+++ b/libpurple/plugins/dbus-buddyicons-example.py
diff --git a/libgaim/plugins/dbus-example.c b/libpurple/plugins/dbus-example.c
index ceba0d5e2e..ceba0d5e2e 100644
--- a/libgaim/plugins/dbus-example.c
+++ b/libpurple/plugins/dbus-example.c
diff --git a/libgaim/plugins/filectl.c b/libpurple/plugins/filectl.c
index cdcb13adfb..cdcb13adfb 100644
--- a/libgaim/plugins/filectl.c
+++ b/libpurple/plugins/filectl.c
diff --git a/libgaim/plugins/fortuneprofile.pl b/libpurple/plugins/fortuneprofile.pl
index 4a0570efaa..4a0570efaa 100644
--- a/libgaim/plugins/fortuneprofile.pl
+++ b/libpurple/plugins/fortuneprofile.pl
diff --git a/libgaim/plugins/gaim.pl b/libpurple/plugins/gaim.pl
index c21c6c4f29..c21c6c4f29 100644
--- a/libgaim/plugins/gaim.pl
+++ b/libpurple/plugins/gaim.pl
diff --git a/libgaim/plugins/idle.c b/libpurple/plugins/idle.c
index 06fff27458..06fff27458 100644
--- a/libgaim/plugins/idle.c
+++ b/libpurple/plugins/idle.c
diff --git a/libgaim/plugins/ipc-test-client.c b/libpurple/plugins/ipc-test-client.c
index c31de71f42..c31de71f42 100644
--- a/libgaim/plugins/ipc-test-client.c
+++ b/libpurple/plugins/ipc-test-client.c
diff --git a/libgaim/plugins/ipc-test-server.c b/libpurple/plugins/ipc-test-server.c
index f082661e9c..f082661e9c 100644
--- a/libgaim/plugins/ipc-test-server.c
+++ b/libpurple/plugins/ipc-test-server.c
diff --git a/libgaim/plugins/log_reader.c b/libpurple/plugins/log_reader.c
index 826aeed664..826aeed664 100644
--- a/libgaim/plugins/log_reader.c
+++ b/libpurple/plugins/log_reader.c
diff --git a/libgaim/plugins/mono/BooPlugin.boo b/libpurple/plugins/mono/BooPlugin.boo
index bae8579f74..bae8579f74 100644
--- a/libgaim/plugins/mono/BooPlugin.boo
+++ b/libpurple/plugins/mono/BooPlugin.boo
diff --git a/libgaim/plugins/mono/GetBuddyBack.cs b/libpurple/plugins/mono/GetBuddyBack.cs
index 09e667dd40..09e667dd40 100644
--- a/libgaim/plugins/mono/GetBuddyBack.cs
+++ b/libpurple/plugins/mono/GetBuddyBack.cs
diff --git a/libgaim/plugins/mono/MPlugin.cs b/libpurple/plugins/mono/MPlugin.cs
index 0a6762d2e4..0a6762d2e4 100644
--- a/libgaim/plugins/mono/MPlugin.cs
+++ b/libpurple/plugins/mono/MPlugin.cs
diff --git a/libgaim/plugins/mono/Makefile.am b/libpurple/plugins/mono/Makefile.am
index 8fb0c75fcd..8fb0c75fcd 100644
--- a/libgaim/plugins/mono/Makefile.am
+++ b/libpurple/plugins/mono/Makefile.am
diff --git a/libgaim/plugins/mono/api/BlistNode.cs b/libpurple/plugins/mono/api/BlistNode.cs
index a6108171a9..a6108171a9 100644
--- a/libgaim/plugins/mono/api/BlistNode.cs
+++ b/libpurple/plugins/mono/api/BlistNode.cs
diff --git a/libgaim/plugins/mono/api/Buddy.cs b/libpurple/plugins/mono/api/Buddy.cs
index 2e1287b337..2e1287b337 100644
--- a/libgaim/plugins/mono/api/Buddy.cs
+++ b/libpurple/plugins/mono/api/Buddy.cs
diff --git a/libgaim/plugins/mono/api/BuddyList.cs b/libpurple/plugins/mono/api/BuddyList.cs
index 384df53d58..384df53d58 100644
--- a/libgaim/plugins/mono/api/BuddyList.cs
+++ b/libpurple/plugins/mono/api/BuddyList.cs
diff --git a/libgaim/plugins/mono/api/Contact.cs b/libpurple/plugins/mono/api/Contact.cs
index 627eea2319..627eea2319 100644
--- a/libgaim/plugins/mono/api/Contact.cs
+++ b/libpurple/plugins/mono/api/Contact.cs
diff --git a/libgaim/plugins/mono/api/Debug.cs b/libpurple/plugins/mono/api/Debug.cs
index fde8bb3f11..fde8bb3f11 100644
--- a/libgaim/plugins/mono/api/Debug.cs
+++ b/libpurple/plugins/mono/api/Debug.cs
diff --git a/libgaim/plugins/mono/api/Event.cs b/libpurple/plugins/mono/api/Event.cs
index 266ea12f37..266ea12f37 100644
--- a/libgaim/plugins/mono/api/Event.cs
+++ b/libpurple/plugins/mono/api/Event.cs
diff --git a/libgaim/plugins/mono/api/GaimPlugin.cs b/libpurple/plugins/mono/api/GaimPlugin.cs
index 89739ca418..89739ca418 100644
--- a/libgaim/plugins/mono/api/GaimPlugin.cs
+++ b/libpurple/plugins/mono/api/GaimPlugin.cs
diff --git a/libgaim/plugins/mono/api/Group.cs b/libpurple/plugins/mono/api/Group.cs
index 87ce3b8230..87ce3b8230 100644
--- a/libgaim/plugins/mono/api/Group.cs
+++ b/libpurple/plugins/mono/api/Group.cs
diff --git a/libgaim/plugins/mono/api/Makefile.am b/libpurple/plugins/mono/api/Makefile.am
index 43bc5476cd..43bc5476cd 100644
--- a/libgaim/plugins/mono/api/Makefile.am
+++ b/libpurple/plugins/mono/api/Makefile.am
diff --git a/libgaim/plugins/mono/api/Signal.cs b/libpurple/plugins/mono/api/Signal.cs
index eeb1fab2d5..eeb1fab2d5 100644
--- a/libgaim/plugins/mono/api/Signal.cs
+++ b/libpurple/plugins/mono/api/Signal.cs
diff --git a/libgaim/plugins/mono/api/Status.cs b/libpurple/plugins/mono/api/Status.cs
index a000fabf95..a000fabf95 100644
--- a/libgaim/plugins/mono/api/Status.cs
+++ b/libpurple/plugins/mono/api/Status.cs
diff --git a/libgaim/plugins/mono/loader/Makefile.am b/libpurple/plugins/mono/loader/Makefile.am
index 58a57f9362..58a57f9362 100644
--- a/libgaim/plugins/mono/loader/Makefile.am
+++ b/libpurple/plugins/mono/loader/Makefile.am
diff --git a/libgaim/plugins/mono/loader/blist-glue.c b/libpurple/plugins/mono/loader/blist-glue.c
index a6673a2e95..a6673a2e95 100644
--- a/libgaim/plugins/mono/loader/blist-glue.c
+++ b/libpurple/plugins/mono/loader/blist-glue.c
diff --git a/libgaim/plugins/mono/loader/debug-glue.c b/libpurple/plugins/mono/loader/debug-glue.c
index 9d5107bad3..9d5107bad3 100644
--- a/libgaim/plugins/mono/loader/debug-glue.c
+++ b/libpurple/plugins/mono/loader/debug-glue.c
diff --git a/libgaim/plugins/mono/loader/mono-glue.h b/libpurple/plugins/mono/loader/mono-glue.h
index da0d37e988..da0d37e988 100644
--- a/libgaim/plugins/mono/loader/mono-glue.h
+++ b/libpurple/plugins/mono/loader/mono-glue.h
diff --git a/libgaim/plugins/mono/loader/mono-helper.c b/libpurple/plugins/mono/loader/mono-helper.c
index 84f6200332..84f6200332 100644
--- a/libgaim/plugins/mono/loader/mono-helper.c
+++ b/libpurple/plugins/mono/loader/mono-helper.c
diff --git a/libgaim/plugins/mono/loader/mono-helper.h b/libpurple/plugins/mono/loader/mono-helper.h
index d2198d6123..d2198d6123 100644
--- a/libgaim/plugins/mono/loader/mono-helper.h
+++ b/libpurple/plugins/mono/loader/mono-helper.h
diff --git a/libgaim/plugins/mono/loader/mono.c b/libpurple/plugins/mono/loader/mono.c
index 4539065d3b..4539065d3b 100644
--- a/libgaim/plugins/mono/loader/mono.c
+++ b/libpurple/plugins/mono/loader/mono.c
diff --git a/libgaim/plugins/mono/loader/signal-glue.c b/libpurple/plugins/mono/loader/signal-glue.c
index 49d13822a1..49d13822a1 100644
--- a/libgaim/plugins/mono/loader/signal-glue.c
+++ b/libpurple/plugins/mono/loader/signal-glue.c
diff --git a/libgaim/plugins/mono/loader/status-glue.c b/libpurple/plugins/mono/loader/status-glue.c
index 342f6ecc0b..342f6ecc0b 100644
--- a/libgaim/plugins/mono/loader/status-glue.c
+++ b/libpurple/plugins/mono/loader/status-glue.c
diff --git a/libgaim/plugins/newline.c b/libpurple/plugins/newline.c
index a3dbf3ef41..a3dbf3ef41 100644
--- a/libgaim/plugins/newline.c
+++ b/libpurple/plugins/newline.c
diff --git a/libgaim/plugins/offlinemsg.c b/libpurple/plugins/offlinemsg.c
index 976f3799e2..976f3799e2 100644
--- a/libgaim/plugins/offlinemsg.c
+++ b/libpurple/plugins/offlinemsg.c
diff --git a/libgaim/plugins/perl/Makefile.am b/libpurple/plugins/perl/Makefile.am
index 59517cc9fa..e2d3e3e399 100644
--- a/libgaim/plugins/perl/Makefile.am
+++ b/libpurple/plugins/perl/Makefile.am
@@ -161,7 +161,7 @@ distclean-generic:
 AM_CPPFLAGS = \
 	-DVERSION=\"$(VERSION)\" \
 	-I$(top_srcdir) \
-	-I$(top_srcdir)/libgaim \
+	-I$(top_srcdir)/libpurple \
 	$(DEBUG_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(PLUGIN_CFLAGS) \
diff --git a/libgaim/plugins/perl/Makefile.mingw b/libpurple/plugins/perl/Makefile.mingw
index 91d9f330dc..91d9f330dc 100755
--- a/libgaim/plugins/perl/Makefile.mingw
+++ b/libpurple/plugins/perl/Makefile.mingw
diff --git a/libgaim/plugins/perl/common/Account.xs b/libpurple/plugins/perl/common/Account.xs
index c419fc5a82..c419fc5a82 100644
--- a/libgaim/plugins/perl/common/Account.xs
+++ b/libpurple/plugins/perl/common/Account.xs
diff --git a/libgaim/plugins/perl/common/AccountOpts.xs b/libpurple/plugins/perl/common/AccountOpts.xs
index a9a4eee9e0..a9a4eee9e0 100644
--- a/libgaim/plugins/perl/common/AccountOpts.xs
+++ b/libpurple/plugins/perl/common/AccountOpts.xs
diff --git a/libgaim/plugins/perl/common/BuddyIcon.xs b/libpurple/plugins/perl/common/BuddyIcon.xs
index e109631b73..e109631b73 100644
--- a/libgaim/plugins/perl/common/BuddyIcon.xs
+++ b/libpurple/plugins/perl/common/BuddyIcon.xs
diff --git a/libgaim/plugins/perl/common/BuddyList.xs b/libpurple/plugins/perl/common/BuddyList.xs
index c4091743c3..c4091743c3 100644
--- a/libgaim/plugins/perl/common/BuddyList.xs
+++ b/libpurple/plugins/perl/common/BuddyList.xs
diff --git a/libgaim/plugins/perl/common/Cipher.xs b/libpurple/plugins/perl/common/Cipher.xs
index 64f0a1e59d..64f0a1e59d 100644
--- a/libgaim/plugins/perl/common/Cipher.xs
+++ b/libpurple/plugins/perl/common/Cipher.xs
diff --git a/libgaim/plugins/perl/common/Cmds.xs b/libpurple/plugins/perl/common/Cmds.xs
index 0aa87f6060..0aa87f6060 100644
--- a/libgaim/plugins/perl/common/Cmds.xs
+++ b/libpurple/plugins/perl/common/Cmds.xs
diff --git a/libgaim/plugins/perl/common/Connection.xs b/libpurple/plugins/perl/common/Connection.xs
index bae0d030dc..bae0d030dc 100644
--- a/libgaim/plugins/perl/common/Connection.xs
+++ b/libpurple/plugins/perl/common/Connection.xs
diff --git a/libgaim/plugins/perl/common/Conversation.xs b/libpurple/plugins/perl/common/Conversation.xs
index 7c2ef3187c..7c2ef3187c 100644
--- a/libgaim/plugins/perl/common/Conversation.xs
+++ b/libpurple/plugins/perl/common/Conversation.xs
diff --git a/libgaim/plugins/perl/common/Core.xs b/libpurple/plugins/perl/common/Core.xs
index 15db1632a2..15db1632a2 100644
--- a/libgaim/plugins/perl/common/Core.xs
+++ b/libpurple/plugins/perl/common/Core.xs
diff --git a/libgaim/plugins/perl/common/Debug.xs b/libpurple/plugins/perl/common/Debug.xs
index d73e55f9e3..d73e55f9e3 100644
--- a/libgaim/plugins/perl/common/Debug.xs
+++ b/libpurple/plugins/perl/common/Debug.xs
diff --git a/libgaim/plugins/perl/common/FT.xs b/libpurple/plugins/perl/common/FT.xs
index c4232fbcc8..c4232fbcc8 100644
--- a/libgaim/plugins/perl/common/FT.xs
+++ b/libpurple/plugins/perl/common/FT.xs
diff --git a/libgaim/plugins/perl/common/Gaim.pm b/libpurple/plugins/perl/common/Gaim.pm
index c2ca5b85fa..c2ca5b85fa 100644
--- a/libgaim/plugins/perl/common/Gaim.pm
+++ b/libpurple/plugins/perl/common/Gaim.pm
diff --git a/libgaim/plugins/perl/common/Gaim.xs b/libpurple/plugins/perl/common/Gaim.xs
index 49a0f6b9a1..49a0f6b9a1 100644
--- a/libgaim/plugins/perl/common/Gaim.xs
+++ b/libpurple/plugins/perl/common/Gaim.xs
diff --git a/libgaim/plugins/perl/common/ImgStore.xs b/libpurple/plugins/perl/common/ImgStore.xs
index 17fba026a7..17fba026a7 100644
--- a/libgaim/plugins/perl/common/ImgStore.xs
+++ b/libpurple/plugins/perl/common/ImgStore.xs
diff --git a/libgaim/plugins/perl/common/Log.xs b/libpurple/plugins/perl/common/Log.xs
index decc4b085f..decc4b085f 100644
--- a/libgaim/plugins/perl/common/Log.xs
+++ b/libpurple/plugins/perl/common/Log.xs
diff --git a/libgaim/plugins/perl/common/MANIFEST b/libpurple/plugins/perl/common/MANIFEST
index 2ed457d68b..2ed457d68b 100644
--- a/libgaim/plugins/perl/common/MANIFEST
+++ b/libpurple/plugins/perl/common/MANIFEST
diff --git a/libgaim/plugins/perl/common/Makefile.PL.in b/libpurple/plugins/perl/common/Makefile.PL.in
index 908c32172b..908c32172b 100644
--- a/libgaim/plugins/perl/common/Makefile.PL.in
+++ b/libpurple/plugins/perl/common/Makefile.PL.in
diff --git a/libgaim/plugins/perl/common/Makefile.mingw b/libpurple/plugins/perl/common/Makefile.mingw
index d884bd7073..d884bd7073 100644
--- a/libgaim/plugins/perl/common/Makefile.mingw
+++ b/libpurple/plugins/perl/common/Makefile.mingw
diff --git a/libgaim/plugins/perl/common/Network.xs b/libpurple/plugins/perl/common/Network.xs
index c4cdc3daa8..c4cdc3daa8 100644
--- a/libgaim/plugins/perl/common/Network.xs
+++ b/libpurple/plugins/perl/common/Network.xs
diff --git a/libgaim/plugins/perl/common/Notify.xs b/libpurple/plugins/perl/common/Notify.xs
index 967ee30e84..967ee30e84 100644
--- a/libgaim/plugins/perl/common/Notify.xs
+++ b/libpurple/plugins/perl/common/Notify.xs
diff --git a/libgaim/plugins/perl/common/Plugin.xs b/libpurple/plugins/perl/common/Plugin.xs
index 35affa902d..35affa902d 100644
--- a/libgaim/plugins/perl/common/Plugin.xs
+++ b/libpurple/plugins/perl/common/Plugin.xs
diff --git a/libgaim/plugins/perl/common/PluginPref.xs b/libpurple/plugins/perl/common/PluginPref.xs
index ac42b4a69d..ac42b4a69d 100644
--- a/libgaim/plugins/perl/common/PluginPref.xs
+++ b/libpurple/plugins/perl/common/PluginPref.xs
diff --git a/libgaim/plugins/perl/common/Pounce.xs b/libpurple/plugins/perl/common/Pounce.xs
index d9ab8960ae..d9ab8960ae 100644
--- a/libgaim/plugins/perl/common/Pounce.xs
+++ b/libpurple/plugins/perl/common/Pounce.xs
diff --git a/libgaim/plugins/perl/common/Prefs.xs b/libpurple/plugins/perl/common/Prefs.xs
index 5e169b12f7..5e169b12f7 100644
--- a/libgaim/plugins/perl/common/Prefs.xs
+++ b/libpurple/plugins/perl/common/Prefs.xs
diff --git a/libgaim/plugins/perl/common/Privacy.xs b/libpurple/plugins/perl/common/Privacy.xs
index 601fe08d4a..601fe08d4a 100644
--- a/libgaim/plugins/perl/common/Privacy.xs
+++ b/libpurple/plugins/perl/common/Privacy.xs
diff --git a/libgaim/plugins/perl/common/Proxy.xs b/libpurple/plugins/perl/common/Proxy.xs
index f21e737431..f21e737431 100644
--- a/libgaim/plugins/perl/common/Proxy.xs
+++ b/libpurple/plugins/perl/common/Proxy.xs
diff --git a/libgaim/plugins/perl/common/Prpl.xs b/libpurple/plugins/perl/common/Prpl.xs
index 757d4161cb..757d4161cb 100644
--- a/libgaim/plugins/perl/common/Prpl.xs
+++ b/libpurple/plugins/perl/common/Prpl.xs
diff --git a/libgaim/plugins/perl/common/Request.xs b/libpurple/plugins/perl/common/Request.xs
index ba5369a8b4..ba5369a8b4 100644
--- a/libgaim/plugins/perl/common/Request.xs
+++ b/libpurple/plugins/perl/common/Request.xs
diff --git a/libgaim/plugins/perl/common/Roomlist.xs b/libpurple/plugins/perl/common/Roomlist.xs
index eee92aee15..eee92aee15 100644
--- a/libgaim/plugins/perl/common/Roomlist.xs
+++ b/libpurple/plugins/perl/common/Roomlist.xs
diff --git a/libgaim/plugins/perl/common/SSLConn.xs b/libpurple/plugins/perl/common/SSLConn.xs
index 2b6e5ac00e..2b6e5ac00e 100644
--- a/libgaim/plugins/perl/common/SSLConn.xs
+++ b/libpurple/plugins/perl/common/SSLConn.xs
diff --git a/libgaim/plugins/perl/common/SavedStatuses.xs b/libpurple/plugins/perl/common/SavedStatuses.xs
index 8851ed84bb..8851ed84bb 100644
--- a/libgaim/plugins/perl/common/SavedStatuses.xs
+++ b/libpurple/plugins/perl/common/SavedStatuses.xs
diff --git a/libgaim/plugins/perl/common/Server.xs b/libpurple/plugins/perl/common/Server.xs
index e5fb5027df..e5fb5027df 100644
--- a/libgaim/plugins/perl/common/Server.xs
+++ b/libpurple/plugins/perl/common/Server.xs
diff --git a/libgaim/plugins/perl/common/Signal.xs b/libpurple/plugins/perl/common/Signal.xs
index 793f1dd223..793f1dd223 100644
--- a/libgaim/plugins/perl/common/Signal.xs
+++ b/libpurple/plugins/perl/common/Signal.xs
diff --git a/libgaim/plugins/perl/common/Sound.xs b/libpurple/plugins/perl/common/Sound.xs
index 0f732797c5..0f732797c5 100644
--- a/libgaim/plugins/perl/common/Sound.xs
+++ b/libpurple/plugins/perl/common/Sound.xs
diff --git a/libgaim/plugins/perl/common/Status.xs b/libpurple/plugins/perl/common/Status.xs
index 02ae4b2b4b..02ae4b2b4b 100644
--- a/libgaim/plugins/perl/common/Status.xs
+++ b/libpurple/plugins/perl/common/Status.xs
diff --git a/libgaim/plugins/perl/common/Stringref.xs b/libpurple/plugins/perl/common/Stringref.xs
index 710cab42ec..710cab42ec 100644
--- a/libgaim/plugins/perl/common/Stringref.xs
+++ b/libpurple/plugins/perl/common/Stringref.xs
diff --git a/libgaim/plugins/perl/common/Util.xs b/libpurple/plugins/perl/common/Util.xs
index 815507d7a8..815507d7a8 100644
--- a/libgaim/plugins/perl/common/Util.xs
+++ b/libpurple/plugins/perl/common/Util.xs
diff --git a/libgaim/plugins/perl/common/XMLNode.xs b/libpurple/plugins/perl/common/XMLNode.xs
index 601b9f36a6..601b9f36a6 100644
--- a/libgaim/plugins/perl/common/XMLNode.xs
+++ b/libpurple/plugins/perl/common/XMLNode.xs
diff --git a/libgaim/plugins/perl/common/fallback/const-c.inc b/libpurple/plugins/perl/common/fallback/const-c.inc
index 4e1290d661..4e1290d661 100644
--- a/libgaim/plugins/perl/common/fallback/const-c.inc
+++ b/libpurple/plugins/perl/common/fallback/const-c.inc
diff --git a/libgaim/plugins/perl/common/fallback/const-xs.inc b/libpurple/plugins/perl/common/fallback/const-xs.inc
index 45384ff63b..45384ff63b 100644
--- a/libgaim/plugins/perl/common/fallback/const-xs.inc
+++ b/libpurple/plugins/perl/common/fallback/const-xs.inc
diff --git a/libgaim/plugins/perl/common/module.h b/libpurple/plugins/perl/common/module.h
index 53357c1a8f..53357c1a8f 100644
--- a/libgaim/plugins/perl/common/module.h
+++ b/libpurple/plugins/perl/common/module.h
diff --git a/libgaim/plugins/perl/common/typemap b/libpurple/plugins/perl/common/typemap
index e1eba3412f..e1eba3412f 100644
--- a/libgaim/plugins/perl/common/typemap
+++ b/libpurple/plugins/perl/common/typemap
diff --git a/libgaim/plugins/perl/libgaimperl.c b/libpurple/plugins/perl/libgaimperl.c
index e0c25c3a66..e0c25c3a66 100644
--- a/libgaim/plugins/perl/libgaimperl.c
+++ b/libpurple/plugins/perl/libgaimperl.c
diff --git a/libgaim/plugins/perl/perl-common.c b/libpurple/plugins/perl/perl-common.c
index b4daee5f92..b4daee5f92 100644
--- a/libgaim/plugins/perl/perl-common.c
+++ b/libpurple/plugins/perl/perl-common.c
diff --git a/libgaim/plugins/perl/perl-common.h b/libpurple/plugins/perl/perl-common.h
index 13ef0fa283..13ef0fa283 100644
--- a/libgaim/plugins/perl/perl-common.h
+++ b/libpurple/plugins/perl/perl-common.h
diff --git a/libgaim/plugins/perl/perl-handlers.c b/libpurple/plugins/perl/perl-handlers.c
index 1d6b61d4c6..1d6b61d4c6 100644
--- a/libgaim/plugins/perl/perl-handlers.c
+++ b/libpurple/plugins/perl/perl-handlers.c
diff --git a/libgaim/plugins/perl/perl-handlers.h b/libpurple/plugins/perl/perl-handlers.h
index 9f0232fc68..9f0232fc68 100644
--- a/libgaim/plugins/perl/perl-handlers.h
+++ b/libpurple/plugins/perl/perl-handlers.h
diff --git a/libgaim/plugins/perl/perl.c b/libpurple/plugins/perl/perl.c
index 45d6e18eda..45d6e18eda 100644
--- a/libgaim/plugins/perl/perl.c
+++ b/libpurple/plugins/perl/perl.c
diff --git a/libgaim/plugins/perl/scripts/account.pl b/libpurple/plugins/perl/scripts/account.pl
index e4bc2ca282..e4bc2ca282 100644
--- a/libgaim/plugins/perl/scripts/account.pl
+++ b/libpurple/plugins/perl/scripts/account.pl
diff --git a/libgaim/plugins/perl/scripts/buddy_list.pl b/libpurple/plugins/perl/scripts/buddy_list.pl
index 3aef6487ae..3aef6487ae 100644
--- a/libgaim/plugins/perl/scripts/buddy_list.pl
+++ b/libpurple/plugins/perl/scripts/buddy_list.pl
diff --git a/libgaim/plugins/perl/scripts/conversation.pl b/libpurple/plugins/perl/scripts/conversation.pl
index a04273f2be..a04273f2be 100644
--- a/libgaim/plugins/perl/scripts/conversation.pl
+++ b/libpurple/plugins/perl/scripts/conversation.pl
diff --git a/libgaim/plugins/perl/scripts/count_down.pl b/libpurple/plugins/perl/scripts/count_down.pl
index d1a22fcded..d1a22fcded 100644
--- a/libgaim/plugins/perl/scripts/count_down.pl
+++ b/libpurple/plugins/perl/scripts/count_down.pl
diff --git a/libgaim/plugins/perl/scripts/gtk_frame_test.pl b/libpurple/plugins/perl/scripts/gtk_frame_test.pl
index 5569b39368..5569b39368 100644
--- a/libgaim/plugins/perl/scripts/gtk_frame_test.pl
+++ b/libpurple/plugins/perl/scripts/gtk_frame_test.pl
diff --git a/libgaim/plugins/perl/scripts/plugin_action.pl b/libpurple/plugins/perl/scripts/plugin_action.pl
index 04f28edb08..04f28edb08 100644
--- a/libgaim/plugins/perl/scripts/plugin_action.pl
+++ b/libpurple/plugins/perl/scripts/plugin_action.pl
diff --git a/libgaim/plugins/perl/scripts/plugin_pref.pl b/libpurple/plugins/perl/scripts/plugin_pref.pl
index 4a763356b4..4a763356b4 100644
--- a/libgaim/plugins/perl/scripts/plugin_pref.pl
+++ b/libpurple/plugins/perl/scripts/plugin_pref.pl
diff --git a/libgaim/plugins/perl/scripts/request.pl b/libpurple/plugins/perl/scripts/request.pl
index 1bed69f28f..1bed69f28f 100644
--- a/libgaim/plugins/perl/scripts/request.pl
+++ b/libpurple/plugins/perl/scripts/request.pl
diff --git a/libgaim/plugins/pluginpref_example.c b/libpurple/plugins/pluginpref_example.c
index 961c4d08da..961c4d08da 100644
--- a/libgaim/plugins/pluginpref_example.c
+++ b/libpurple/plugins/pluginpref_example.c
diff --git a/libgaim/plugins/psychic.c b/libpurple/plugins/psychic.c
index 134f777400..134f777400 100644
--- a/libgaim/plugins/psychic.c
+++ b/libpurple/plugins/psychic.c
diff --git a/libgaim/plugins/signals-test.c b/libpurple/plugins/signals-test.c
index 7bac24131d..7bac24131d 100644
--- a/libgaim/plugins/signals-test.c
+++ b/libpurple/plugins/signals-test.c
diff --git a/libgaim/plugins/simple.c b/libpurple/plugins/simple.c
index fb5fb7fa1c..fb5fb7fa1c 100644
--- a/libgaim/plugins/simple.c
+++ b/libpurple/plugins/simple.c
diff --git a/libgaim/plugins/ssl/Makefile.am b/libpurple/plugins/ssl/Makefile.am
index 41423b7693..dbdabdaf1f 100644
--- a/libgaim/plugins/ssl/Makefile.am
+++ b/libpurple/plugins/ssl/Makefile.am
@@ -27,7 +27,7 @@ endif # PLUGINS
 AM_CPPFLAGS = \
 	-DDATADIR=\"$(datadir)\" \
 	-DLIBDIR=\"$(libdir)/gaim/\" \
-	-I$(top_srcdir)/libgaim \
+	-I$(top_srcdir)/libpurple \
 	$(DEBUG_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(PLUGIN_CFLAGS) \
diff --git a/libgaim/plugins/ssl/Makefile.mingw b/libpurple/plugins/ssl/Makefile.mingw
index 03023644e0..03023644e0 100644
--- a/libgaim/plugins/ssl/Makefile.mingw
+++ b/libpurple/plugins/ssl/Makefile.mingw
diff --git a/libgaim/plugins/ssl/ssl-gnutls.c b/libpurple/plugins/ssl/ssl-gnutls.c
index 0d08dc33d7..0d08dc33d7 100644
--- a/libgaim/plugins/ssl/ssl-gnutls.c
+++ b/libpurple/plugins/ssl/ssl-gnutls.c
diff --git a/libgaim/plugins/ssl/ssl-nss.c b/libpurple/plugins/ssl/ssl-nss.c
index 019b89db1a..019b89db1a 100644
--- a/libgaim/plugins/ssl/ssl-nss.c
+++ b/libpurple/plugins/ssl/ssl-nss.c
diff --git a/libgaim/plugins/ssl/ssl.c b/libpurple/plugins/ssl/ssl.c
index 740ce5f562..740ce5f562 100644
--- a/libgaim/plugins/ssl/ssl.c
+++ b/libpurple/plugins/ssl/ssl.c
diff --git a/libgaim/plugins/statenotify.c b/libpurple/plugins/statenotify.c
index fcaf67c540..fcaf67c540 100644
--- a/libgaim/plugins/statenotify.c
+++ b/libpurple/plugins/statenotify.c
diff --git a/libgaim/plugins/tcl/Makefile.am b/libpurple/plugins/tcl/Makefile.am
index 235be616a3..b2551b4e11 100644
--- a/libgaim/plugins/tcl/Makefile.am
+++ b/libpurple/plugins/tcl/Makefile.am
@@ -14,7 +14,7 @@ EXTRA_DIST = signal-test.tcl Makefile.mingw
 AM_CPPFLAGS = \
 	-DVERSION=\"$(VERSION)\" \
 	-I$(top_srcdir) \
-	-I$(top_srcdir)/libgaim \
+	-I$(top_srcdir)/libpurple \
 	$(DEBUG_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(PLUGIN_CFLAGS) \
diff --git a/libgaim/plugins/tcl/Makefile.mingw b/libpurple/plugins/tcl/Makefile.mingw
index 11d9846ed0..11d9846ed0 100644
--- a/libgaim/plugins/tcl/Makefile.mingw
+++ b/libpurple/plugins/tcl/Makefile.mingw
diff --git a/libgaim/plugins/tcl/signal-test.tcl b/libpurple/plugins/tcl/signal-test.tcl
index de6ddaf6fe..de6ddaf6fe 100644
--- a/libgaim/plugins/tcl/signal-test.tcl
+++ b/libpurple/plugins/tcl/signal-test.tcl
diff --git a/libgaim/plugins/tcl/tcl.c b/libpurple/plugins/tcl/tcl.c
index 67260b1f3a..67260b1f3a 100644
--- a/libgaim/plugins/tcl/tcl.c
+++ b/libpurple/plugins/tcl/tcl.c
diff --git a/libgaim/plugins/tcl/tcl_cmd.c b/libpurple/plugins/tcl/tcl_cmd.c
index c5f9605e01..c5f9605e01 100644
--- a/libgaim/plugins/tcl/tcl_cmd.c
+++ b/libpurple/plugins/tcl/tcl_cmd.c
diff --git a/libgaim/plugins/tcl/tcl_cmds.c b/libpurple/plugins/tcl/tcl_cmds.c
index 5763eeb14d..5763eeb14d 100644
--- a/libgaim/plugins/tcl/tcl_cmds.c
+++ b/libpurple/plugins/tcl/tcl_cmds.c
diff --git a/libgaim/plugins/tcl/tcl_gaim.h b/libpurple/plugins/tcl/tcl_gaim.h
index 90afaf245b..90afaf245b 100644
--- a/libgaim/plugins/tcl/tcl_gaim.h
+++ b/libpurple/plugins/tcl/tcl_gaim.h
diff --git a/libgaim/plugins/tcl/tcl_glib.c b/libpurple/plugins/tcl/tcl_glib.c
index e8878c55b7..e8878c55b7 100644
--- a/libgaim/plugins/tcl/tcl_glib.c
+++ b/libpurple/plugins/tcl/tcl_glib.c
diff --git a/libgaim/plugins/tcl/tcl_glib.h b/libpurple/plugins/tcl/tcl_glib.h
index ebe18d89a1..ebe18d89a1 100644
--- a/libgaim/plugins/tcl/tcl_glib.h
+++ b/libpurple/plugins/tcl/tcl_glib.h
diff --git a/libgaim/plugins/tcl/tcl_ref.c b/libpurple/plugins/tcl/tcl_ref.c
index 340e68c72b..340e68c72b 100644
--- a/libgaim/plugins/tcl/tcl_ref.c
+++ b/libpurple/plugins/tcl/tcl_ref.c
diff --git a/libgaim/plugins/tcl/tcl_signals.c b/libpurple/plugins/tcl/tcl_signals.c
index 08c1ea105d..08c1ea105d 100644
--- a/libgaim/plugins/tcl/tcl_signals.c
+++ b/libpurple/plugins/tcl/tcl_signals.c
diff --git a/libgaim/plugins/test.pl b/libpurple/plugins/test.pl
index eea02a46e0..eea02a46e0 100644
--- a/libgaim/plugins/test.pl
+++ b/libpurple/plugins/test.pl
diff --git a/libgaim/pounce.c b/libpurple/pounce.c
index 20b7137b9e..20b7137b9e 100644
--- a/libgaim/pounce.c
+++ b/libpurple/pounce.c
diff --git a/libgaim/pounce.h b/libpurple/pounce.h
index 603962bbca..603962bbca 100644
--- a/libgaim/pounce.h
+++ b/libpurple/pounce.h
diff --git a/libgaim/prefix.c b/libpurple/prefix.c
index b86d091079..b86d091079 100644
--- a/libgaim/prefix.c
+++ b/libpurple/prefix.c
diff --git a/libgaim/prefix.h b/libpurple/prefix.h
index 6554978a16..6554978a16 100644
--- a/libgaim/prefix.h
+++ b/libpurple/prefix.h
diff --git a/libgaim/prefs.c b/libpurple/prefs.c
index 882882f628..882882f628 100644
--- a/libgaim/prefs.c
+++ b/libpurple/prefs.c
diff --git a/libgaim/prefs.h b/libpurple/prefs.h
index ae6b2524a5..ae6b2524a5 100644
--- a/libgaim/prefs.h
+++ b/libpurple/prefs.h
diff --git a/libgaim/privacy.c b/libpurple/privacy.c
index a23a783a2f..a23a783a2f 100644
--- a/libgaim/privacy.c
+++ b/libpurple/privacy.c
diff --git a/libgaim/privacy.h b/libpurple/privacy.h
index c21bf24078..c21bf24078 100644
--- a/libgaim/privacy.h
+++ b/libpurple/privacy.h
diff --git a/libgaim/protocols/Makefile.am b/libpurple/protocols/Makefile.am
index fd8d362188..fd8d362188 100644
--- a/libgaim/protocols/Makefile.am
+++ b/libpurple/protocols/Makefile.am
diff --git a/libgaim/protocols/Makefile.mingw b/libpurple/protocols/Makefile.mingw
index e9e758fd55..e9e758fd55 100644
--- a/libgaim/protocols/Makefile.mingw
+++ b/libpurple/protocols/Makefile.mingw
diff --git a/libgaim/protocols/bonjour/Makefile.am b/libpurple/protocols/bonjour/Makefile.am
index 85a7fb3414..2f8a047af7 100644
--- a/libgaim/protocols/bonjour/Makefile.am
+++ b/libpurple/protocols/bonjour/Makefile.am
@@ -36,7 +36,7 @@ endif
 
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/libgaim \
+	-I$(top_srcdir)/libpurple \
 	$(GLIB_CFLAGS) \
 	$(DEBUG_CFLAGS) \
 	$(HOWL_CFLAGS)
diff --git a/libgaim/protocols/bonjour/Makefile.mingw b/libpurple/protocols/bonjour/Makefile.mingw
index 26ff66442f..26ff66442f 100644
--- a/libgaim/protocols/bonjour/Makefile.mingw
+++ b/libpurple/protocols/bonjour/Makefile.mingw
diff --git a/libgaim/protocols/bonjour/bonjour.c b/libpurple/protocols/bonjour/bonjour.c
index fa5c69a895..fa5c69a895 100644
--- a/libgaim/protocols/bonjour/bonjour.c
+++ b/libpurple/protocols/bonjour/bonjour.c
diff --git a/libgaim/protocols/bonjour/bonjour.h b/libpurple/protocols/bonjour/bonjour.h
index 6686092fb9..6686092fb9 100644
--- a/libgaim/protocols/bonjour/bonjour.h
+++ b/libpurple/protocols/bonjour/bonjour.h
diff --git a/libgaim/protocols/bonjour/buddy.c b/libpurple/protocols/bonjour/buddy.c
index 3e59035662..3e59035662 100644
--- a/libgaim/protocols/bonjour/buddy.c
+++ b/libpurple/protocols/bonjour/buddy.c
diff --git a/libgaim/protocols/bonjour/buddy.h b/libpurple/protocols/bonjour/buddy.h
index f743b55575..f743b55575 100644
--- a/libgaim/protocols/bonjour/buddy.h
+++ b/libpurple/protocols/bonjour/buddy.h
diff --git a/libgaim/protocols/bonjour/dns_sd.c b/libpurple/protocols/bonjour/dns_sd.c
index 25b01345ea..25b01345ea 100644
--- a/libgaim/protocols/bonjour/dns_sd.c
+++ b/libpurple/protocols/bonjour/dns_sd.c
diff --git a/libgaim/protocols/bonjour/dns_sd.h b/libpurple/protocols/bonjour/dns_sd.h
index e556539186..e556539186 100644
--- a/libgaim/protocols/bonjour/dns_sd.h
+++ b/libpurple/protocols/bonjour/dns_sd.h
diff --git a/libgaim/protocols/bonjour/issues.txt b/libpurple/protocols/bonjour/issues.txt
index 62ea6e1f05..62ea6e1f05 100644
--- a/libgaim/protocols/bonjour/issues.txt
+++ b/libpurple/protocols/bonjour/issues.txt
diff --git a/libgaim/protocols/bonjour/jabber.c b/libpurple/protocols/bonjour/jabber.c
index c8da317632..c8da317632 100644
--- a/libgaim/protocols/bonjour/jabber.c
+++ b/libpurple/protocols/bonjour/jabber.c
diff --git a/libgaim/protocols/bonjour/jabber.h b/libpurple/protocols/bonjour/jabber.h
index efdc9dcb5e..efdc9dcb5e 100644
--- a/libgaim/protocols/bonjour/jabber.h
+++ b/libpurple/protocols/bonjour/jabber.h
diff --git a/libgaim/protocols/bonjour/messages.txt b/libpurple/protocols/bonjour/messages.txt
index 081d2f8989..081d2f8989 100644
--- a/libgaim/protocols/bonjour/messages.txt
+++ b/libpurple/protocols/bonjour/messages.txt
diff --git a/libgaim/protocols/gg/.todo b/libpurple/protocols/gg/.todo
index 833bb38f2c..833bb38f2c 100644
--- a/libgaim/protocols/gg/.todo
+++ b/libpurple/protocols/gg/.todo
diff --git a/libgaim/protocols/gg/Makefile.am b/libpurple/protocols/gg/Makefile.am
index 084f45ba4b..531808ca0e 100644
--- a/libgaim/protocols/gg/Makefile.am
+++ b/libpurple/protocols/gg/Makefile.am
@@ -29,7 +29,7 @@ INTGGSOURCES = \
 	lib/pubdir50.c \
 	lib/pubdir.c
 
-INTGG_CFLAGS = -I$(top_srcdir)/libgaim/protocols/gg/lib
+INTGG_CFLAGS = -I$(top_srcdir)/libpurple/protocols/gg/lib
 endif
 
 GGSOURCES = \
@@ -71,7 +71,7 @@ libgg_la_LIBADD  = $(GLIB_LIBS) $(GADU_LIBS)
 endif
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/libgaim \
+	-I$(top_srcdir)/libpurple \
 	$(INTGG_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(DEBUG_CFLAGS)
diff --git a/libgaim/protocols/gg/Makefile.mingw b/libpurple/protocols/gg/Makefile.mingw
index 544054d387..544054d387 100644
--- a/libgaim/protocols/gg/Makefile.mingw
+++ b/libpurple/protocols/gg/Makefile.mingw
diff --git a/libgaim/protocols/gg/buddylist.c b/libpurple/protocols/gg/buddylist.c
index beb1b3c31c..beb1b3c31c 100644
--- a/libgaim/protocols/gg/buddylist.c
+++ b/libpurple/protocols/gg/buddylist.c
diff --git a/libgaim/protocols/gg/buddylist.h b/libpurple/protocols/gg/buddylist.h
index d8e95aa26f..d8e95aa26f 100644
--- a/libgaim/protocols/gg/buddylist.h
+++ b/libpurple/protocols/gg/buddylist.h
diff --git a/libgaim/protocols/gg/confer.c b/libpurple/protocols/gg/confer.c
index 11fd13306c..11fd13306c 100644
--- a/libgaim/protocols/gg/confer.c
+++ b/libpurple/protocols/gg/confer.c
diff --git a/libgaim/protocols/gg/confer.h b/libpurple/protocols/gg/confer.h
index 74961d43bf..74961d43bf 100644
--- a/libgaim/protocols/gg/confer.h
+++ b/libpurple/protocols/gg/confer.h
diff --git a/libgaim/protocols/gg/gg-utils.c b/libpurple/protocols/gg/gg-utils.c
index ac0b84b5dc..ac0b84b5dc 100644
--- a/libgaim/protocols/gg/gg-utils.c
+++ b/libpurple/protocols/gg/gg-utils.c
diff --git a/libgaim/protocols/gg/gg-utils.h b/libpurple/protocols/gg/gg-utils.h
index d351363748..d351363748 100644
--- a/libgaim/protocols/gg/gg-utils.h
+++ b/libpurple/protocols/gg/gg-utils.h
diff --git a/libgaim/protocols/gg/gg.c b/libpurple/protocols/gg/gg.c
index 2e5dab8ea6..2e5dab8ea6 100644
--- a/libgaim/protocols/gg/gg.c
+++ b/libpurple/protocols/gg/gg.c
diff --git a/libgaim/protocols/gg/gg.h b/libpurple/protocols/gg/gg.h
index 11a4b888a0..11a4b888a0 100644
--- a/libgaim/protocols/gg/gg.h
+++ b/libpurple/protocols/gg/gg.h
diff --git a/libgaim/protocols/gg/lib/COPYING b/libpurple/protocols/gg/lib/COPYING
index 512ede3609..512ede3609 100644
--- a/libgaim/protocols/gg/lib/COPYING
+++ b/libpurple/protocols/gg/lib/COPYING
diff --git a/libgaim/protocols/gg/lib/common.c b/libpurple/protocols/gg/lib/common.c
index 095defa412..095defa412 100644
--- a/libgaim/protocols/gg/lib/common.c
+++ b/libpurple/protocols/gg/lib/common.c
diff --git a/libgaim/protocols/gg/lib/compat.h b/libpurple/protocols/gg/lib/compat.h
index d91e6ba22f..d91e6ba22f 100644
--- a/libgaim/protocols/gg/lib/compat.h
+++ b/libpurple/protocols/gg/lib/compat.h
diff --git a/libgaim/protocols/gg/lib/dcc.c b/libpurple/protocols/gg/lib/dcc.c
index 2bc6b2bbe3..2bc6b2bbe3 100644
--- a/libgaim/protocols/gg/lib/dcc.c
+++ b/libpurple/protocols/gg/lib/dcc.c
diff --git a/libgaim/protocols/gg/lib/events.c b/libpurple/protocols/gg/lib/events.c
index 00c77e2f63..00c77e2f63 100644
--- a/libgaim/protocols/gg/lib/events.c
+++ b/libpurple/protocols/gg/lib/events.c
diff --git a/libgaim/protocols/gg/lib/http.c b/libpurple/protocols/gg/lib/http.c
index 4105b51b11..4105b51b11 100644
--- a/libgaim/protocols/gg/lib/http.c
+++ b/libpurple/protocols/gg/lib/http.c
diff --git a/libgaim/protocols/gg/lib/libgadu-config.h b/libpurple/protocols/gg/lib/libgadu-config.h
index 0f5bf58484..0f5bf58484 100644
--- a/libgaim/protocols/gg/lib/libgadu-config.h
+++ b/libpurple/protocols/gg/lib/libgadu-config.h
diff --git a/libgaim/protocols/gg/lib/libgadu.c b/libpurple/protocols/gg/lib/libgadu.c
index 5edbdcb603..5edbdcb603 100644
--- a/libgaim/protocols/gg/lib/libgadu.c
+++ b/libpurple/protocols/gg/lib/libgadu.c
diff --git a/libgaim/protocols/gg/lib/libgadu.h b/libpurple/protocols/gg/lib/libgadu.h
index 21f6536eb2..21f6536eb2 100644
--- a/libgaim/protocols/gg/lib/libgadu.h
+++ b/libpurple/protocols/gg/lib/libgadu.h
diff --git a/libgaim/protocols/gg/lib/obsolete.c b/libpurple/protocols/gg/lib/obsolete.c
index d599b74fc5..d599b74fc5 100644
--- a/libgaim/protocols/gg/lib/obsolete.c
+++ b/libpurple/protocols/gg/lib/obsolete.c
diff --git a/libgaim/protocols/gg/lib/pubdir.c b/libpurple/protocols/gg/lib/pubdir.c
index 50ceaf70f6..50ceaf70f6 100644
--- a/libgaim/protocols/gg/lib/pubdir.c
+++ b/libpurple/protocols/gg/lib/pubdir.c
diff --git a/libgaim/protocols/gg/lib/pubdir50.c b/libpurple/protocols/gg/lib/pubdir50.c
index 20ad6dff49..20ad6dff49 100644
--- a/libgaim/protocols/gg/lib/pubdir50.c
+++ b/libpurple/protocols/gg/lib/pubdir50.c
diff --git a/libgaim/protocols/gg/search.c b/libpurple/protocols/gg/search.c
index db612ab017..db612ab017 100644
--- a/libgaim/protocols/gg/search.c
+++ b/libpurple/protocols/gg/search.c
diff --git a/libgaim/protocols/gg/search.h b/libpurple/protocols/gg/search.h
index 03f0dd3b34..03f0dd3b34 100644
--- a/libgaim/protocols/gg/search.h
+++ b/libpurple/protocols/gg/search.h
diff --git a/libgaim/protocols/irc/.todo b/libpurple/protocols/irc/.todo
index 5e15ad3631..5e15ad3631 100644
--- a/libgaim/protocols/irc/.todo
+++ b/libpurple/protocols/irc/.todo
diff --git a/libgaim/protocols/irc/Makefile.am b/libpurple/protocols/irc/Makefile.am
index 717219c84f..e1b9c9ad7b 100644
--- a/libgaim/protocols/irc/Makefile.am
+++ b/libpurple/protocols/irc/Makefile.am
@@ -29,6 +29,6 @@ libirc_la_LIBADD  = $(GLIB_LIBS)
 endif
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/libgaim \
+	-I$(top_srcdir)/libpurple \
 	$(GLIB_CFLAGS) \
 	$(DEBUG_CFLAGS)
diff --git a/libgaim/protocols/irc/Makefile.mingw b/libpurple/protocols/irc/Makefile.mingw
index 5489e40207..5489e40207 100644
--- a/libgaim/protocols/irc/Makefile.mingw
+++ b/libpurple/protocols/irc/Makefile.mingw
diff --git a/libgaim/protocols/irc/PROTOCOL b/libpurple/protocols/irc/PROTOCOL
index 09fbf34f70..09fbf34f70 100644
--- a/libgaim/protocols/irc/PROTOCOL
+++ b/libpurple/protocols/irc/PROTOCOL
diff --git a/libgaim/protocols/irc/cmds.c b/libpurple/protocols/irc/cmds.c
index f532f2d3ff..f532f2d3ff 100644
--- a/libgaim/protocols/irc/cmds.c
+++ b/libpurple/protocols/irc/cmds.c
diff --git a/libgaim/protocols/irc/dcc_send.c b/libpurple/protocols/irc/dcc_send.c
index 9707bbbc61..9707bbbc61 100644
--- a/libgaim/protocols/irc/dcc_send.c
+++ b/libpurple/protocols/irc/dcc_send.c
diff --git a/libgaim/protocols/irc/irc.c b/libpurple/protocols/irc/irc.c
index d2466bb958..d2466bb958 100644
--- a/libgaim/protocols/irc/irc.c
+++ b/libpurple/protocols/irc/irc.c
diff --git a/libgaim/protocols/irc/irc.h b/libpurple/protocols/irc/irc.h
index 6cb5b68f2f..6cb5b68f2f 100644
--- a/libgaim/protocols/irc/irc.h
+++ b/libpurple/protocols/irc/irc.h
diff --git a/libgaim/protocols/irc/msgs.c b/libpurple/protocols/irc/msgs.c
index a9421d9e62..a9421d9e62 100644
--- a/libgaim/protocols/irc/msgs.c
+++ b/libpurple/protocols/irc/msgs.c
diff --git a/libgaim/protocols/irc/parse.c b/libpurple/protocols/irc/parse.c
index f894800a36..f894800a36 100644
--- a/libgaim/protocols/irc/parse.c
+++ b/libpurple/protocols/irc/parse.c
diff --git a/libgaim/protocols/jabber/.todo b/libpurple/protocols/jabber/.todo
index 5f659a3e0f..5f659a3e0f 100644
--- a/libgaim/protocols/jabber/.todo
+++ b/libpurple/protocols/jabber/.todo
diff --git a/libgaim/protocols/jabber/JEPS b/libpurple/protocols/jabber/JEPS
index cd67248431..cd67248431 100644
--- a/libgaim/protocols/jabber/JEPS
+++ b/libpurple/protocols/jabber/JEPS
diff --git a/libgaim/protocols/jabber/Makefile.am b/libpurple/protocols/jabber/Makefile.am
index a60285f5d2..5c6a15a7c7 100644
--- a/libgaim/protocols/jabber/Makefile.am
+++ b/libpurple/protocols/jabber/Makefile.am
@@ -61,7 +61,7 @@ libjabber_la_LIBADD = $(GLIB_LIBS) $(SASL_LIBS) $(LIBXML_LIBS)
 endif
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/libgaim \
+	-I$(top_srcdir)/libpurple \
 	$(DEBUG_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(LIBXML_CFLAGS)
diff --git a/libgaim/protocols/jabber/Makefile.mingw b/libpurple/protocols/jabber/Makefile.mingw
index 1a59a8eaf2..1a59a8eaf2 100644
--- a/libgaim/protocols/jabber/Makefile.mingw
+++ b/libpurple/protocols/jabber/Makefile.mingw
diff --git a/libgaim/protocols/jabber/auth.c b/libpurple/protocols/jabber/auth.c
index 9f2718463e..9f2718463e 100644
--- a/libgaim/protocols/jabber/auth.c
+++ b/libpurple/protocols/jabber/auth.c
diff --git a/libgaim/protocols/jabber/auth.h b/libpurple/protocols/jabber/auth.h
index 5daf9ae6de..5daf9ae6de 100644
--- a/libgaim/protocols/jabber/auth.h
+++ b/libpurple/protocols/jabber/auth.h
diff --git a/libgaim/protocols/jabber/buddy.c b/libpurple/protocols/jabber/buddy.c
index d8a5c1fa17..d8a5c1fa17 100644
--- a/libgaim/protocols/jabber/buddy.c
+++ b/libpurple/protocols/jabber/buddy.c
diff --git a/libgaim/protocols/jabber/buddy.h b/libpurple/protocols/jabber/buddy.h
index db2b628aca..db2b628aca 100644
--- a/libgaim/protocols/jabber/buddy.h
+++ b/libpurple/protocols/jabber/buddy.h
diff --git a/libgaim/protocols/jabber/chat.c b/libpurple/protocols/jabber/chat.c
index 7346a15aa3..7346a15aa3 100644
--- a/libgaim/protocols/jabber/chat.c
+++ b/libpurple/protocols/jabber/chat.c
diff --git a/libgaim/protocols/jabber/chat.h b/libpurple/protocols/jabber/chat.h
index 150aa1918f..150aa1918f 100644
--- a/libgaim/protocols/jabber/chat.h
+++ b/libpurple/protocols/jabber/chat.h
diff --git a/libgaim/protocols/jabber/disco.c b/libpurple/protocols/jabber/disco.c
index 905a6d6791..905a6d6791 100644
--- a/libgaim/protocols/jabber/disco.c
+++ b/libpurple/protocols/jabber/disco.c
diff --git a/libgaim/protocols/jabber/disco.h b/libpurple/protocols/jabber/disco.h
index 550c591498..550c591498 100644
--- a/libgaim/protocols/jabber/disco.h
+++ b/libpurple/protocols/jabber/disco.h
diff --git a/libgaim/protocols/jabber/google.c b/libpurple/protocols/jabber/google.c
index 8dd6211a77..8dd6211a77 100644
--- a/libgaim/protocols/jabber/google.c
+++ b/libpurple/protocols/jabber/google.c
diff --git a/libgaim/protocols/jabber/google.h b/libpurple/protocols/jabber/google.h
index ac342450bc..ac342450bc 100644
--- a/libgaim/protocols/jabber/google.h
+++ b/libpurple/protocols/jabber/google.h
diff --git a/libgaim/protocols/jabber/iq.c b/libpurple/protocols/jabber/iq.c
index ce46831b41..ce46831b41 100644
--- a/libgaim/protocols/jabber/iq.c
+++ b/libpurple/protocols/jabber/iq.c
diff --git a/libgaim/protocols/jabber/iq.h b/libpurple/protocols/jabber/iq.h
index acde9ed681..acde9ed681 100644
--- a/libgaim/protocols/jabber/iq.h
+++ b/libpurple/protocols/jabber/iq.h
diff --git a/libgaim/protocols/jabber/jabber.c b/libpurple/protocols/jabber/jabber.c
index 7c6ca5343f..7c6ca5343f 100644
--- a/libgaim/protocols/jabber/jabber.c
+++ b/libpurple/protocols/jabber/jabber.c
diff --git a/libgaim/protocols/jabber/jabber.h b/libpurple/protocols/jabber/jabber.h
index 412a2a4de5..412a2a4de5 100644
--- a/libgaim/protocols/jabber/jabber.h
+++ b/libpurple/protocols/jabber/jabber.h
diff --git a/libgaim/protocols/jabber/jutil.c b/libpurple/protocols/jabber/jutil.c
index 025f6ba1d4..025f6ba1d4 100644
--- a/libgaim/protocols/jabber/jutil.c
+++ b/libpurple/protocols/jabber/jutil.c
diff --git a/libgaim/protocols/jabber/jutil.h b/libpurple/protocols/jabber/jutil.h
index 24570ab043..24570ab043 100644
--- a/libgaim/protocols/jabber/jutil.h
+++ b/libpurple/protocols/jabber/jutil.h
diff --git a/libgaim/protocols/jabber/message.c b/libpurple/protocols/jabber/message.c
index 49ee35a0a9..49ee35a0a9 100644
--- a/libgaim/protocols/jabber/message.c
+++ b/libpurple/protocols/jabber/message.c
diff --git a/libgaim/protocols/jabber/message.h b/libpurple/protocols/jabber/message.h
index 2755d55d3f..2755d55d3f 100644
--- a/libgaim/protocols/jabber/message.h
+++ b/libpurple/protocols/jabber/message.h
diff --git a/libgaim/protocols/jabber/oob.c b/libpurple/protocols/jabber/oob.c
index 2295de9d02..2295de9d02 100644
--- a/libgaim/protocols/jabber/oob.c
+++ b/libpurple/protocols/jabber/oob.c
diff --git a/libgaim/protocols/jabber/oob.h b/libpurple/protocols/jabber/oob.h
index bd5d3e0761..bd5d3e0761 100644
--- a/libgaim/protocols/jabber/oob.h
+++ b/libpurple/protocols/jabber/oob.h
diff --git a/libgaim/protocols/jabber/parser.c b/libpurple/protocols/jabber/parser.c
index 7ba794a4a5..7ba794a4a5 100644
--- a/libgaim/protocols/jabber/parser.c
+++ b/libpurple/protocols/jabber/parser.c
diff --git a/libgaim/protocols/jabber/parser.h b/libpurple/protocols/jabber/parser.h
index 29aa1eed0c..29aa1eed0c 100644
--- a/libgaim/protocols/jabber/parser.h
+++ b/libpurple/protocols/jabber/parser.h
diff --git a/libgaim/protocols/jabber/presence.c b/libpurple/protocols/jabber/presence.c
index 9ac70dfc57..9ac70dfc57 100644
--- a/libgaim/protocols/jabber/presence.c
+++ b/libpurple/protocols/jabber/presence.c
diff --git a/libgaim/protocols/jabber/presence.h b/libpurple/protocols/jabber/presence.h
index 3c65f3d823..3c65f3d823 100644
--- a/libgaim/protocols/jabber/presence.h
+++ b/libpurple/protocols/jabber/presence.h
diff --git a/libgaim/protocols/jabber/roster.c b/libpurple/protocols/jabber/roster.c
index d551466030..d551466030 100644
--- a/libgaim/protocols/jabber/roster.c
+++ b/libpurple/protocols/jabber/roster.c
diff --git a/libgaim/protocols/jabber/roster.h b/libpurple/protocols/jabber/roster.h
index 798effa6c7..798effa6c7 100644
--- a/libgaim/protocols/jabber/roster.h
+++ b/libpurple/protocols/jabber/roster.h
diff --git a/libgaim/protocols/jabber/si.c b/libpurple/protocols/jabber/si.c
index 637e48802e..637e48802e 100644
--- a/libgaim/protocols/jabber/si.c
+++ b/libpurple/protocols/jabber/si.c
diff --git a/libgaim/protocols/jabber/si.h b/libpurple/protocols/jabber/si.h
index 724a4dfe84..724a4dfe84 100644
--- a/libgaim/protocols/jabber/si.h
+++ b/libpurple/protocols/jabber/si.h
diff --git a/libgaim/protocols/jabber/win32/posix.uname.c b/libpurple/protocols/jabber/win32/posix.uname.c
index a5ecb128ed..a5ecb128ed 100644
--- a/libgaim/protocols/jabber/win32/posix.uname.c
+++ b/libpurple/protocols/jabber/win32/posix.uname.c
diff --git a/libgaim/protocols/jabber/win32/utsname.h b/libpurple/protocols/jabber/win32/utsname.h
index bbfa9a6d0c..bbfa9a6d0c 100644
--- a/libgaim/protocols/jabber/win32/utsname.h
+++ b/libpurple/protocols/jabber/win32/utsname.h
diff --git a/libgaim/protocols/jabber/xdata.c b/libpurple/protocols/jabber/xdata.c
index 0a8ff52252..0a8ff52252 100644
--- a/libgaim/protocols/jabber/xdata.c
+++ b/libpurple/protocols/jabber/xdata.c
diff --git a/libgaim/protocols/jabber/xdata.h b/libpurple/protocols/jabber/xdata.h
index 09a1fdbae3..09a1fdbae3 100644
--- a/libgaim/protocols/jabber/xdata.h
+++ b/libpurple/protocols/jabber/xdata.h
diff --git a/libgaim/protocols/msn/.todo b/libpurple/protocols/msn/.todo
index f0bd44339d..f0bd44339d 100644
--- a/libgaim/protocols/msn/.todo
+++ b/libpurple/protocols/msn/.todo
diff --git a/libgaim/protocols/msn/Makefile.am b/libpurple/protocols/msn/Makefile.am
index e9f40015f0..9fa9721a69 100644
--- a/libgaim/protocols/msn/Makefile.am
+++ b/libpurple/protocols/msn/Makefile.am
@@ -84,6 +84,6 @@ libmsn_la_LIBADD  = $(GLIB_LIBS)
 endif
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/libgaim \
+	-I$(top_srcdir)/libpurple \
 	$(GLIB_CFLAGS) \
 	$(DEBUG_CFLAGS)
diff --git a/libgaim/protocols/msn/Makefile.mingw b/libpurple/protocols/msn/Makefile.mingw
index 1019b2eb72..1019b2eb72 100644
--- a/libgaim/protocols/msn/Makefile.mingw
+++ b/libpurple/protocols/msn/Makefile.mingw
diff --git a/libgaim/protocols/msn/cmdproc.c b/libpurple/protocols/msn/cmdproc.c
index 3842233200..3842233200 100644
--- a/libgaim/protocols/msn/cmdproc.c
+++ b/libpurple/protocols/msn/cmdproc.c
diff --git a/libgaim/protocols/msn/cmdproc.h b/libpurple/protocols/msn/cmdproc.h
index 9d14ad0dc9..9d14ad0dc9 100644
--- a/libgaim/protocols/msn/cmdproc.h
+++ b/libpurple/protocols/msn/cmdproc.h
diff --git a/libgaim/protocols/msn/command.c b/libpurple/protocols/msn/command.c
index db427c60be..db427c60be 100644
--- a/libgaim/protocols/msn/command.c
+++ b/libpurple/protocols/msn/command.c
diff --git a/libgaim/protocols/msn/command.h b/libpurple/protocols/msn/command.h
index 438ac140f5..438ac140f5 100644
--- a/libgaim/protocols/msn/command.h
+++ b/libpurple/protocols/msn/command.h
diff --git a/libgaim/protocols/msn/dialog.c b/libpurple/protocols/msn/dialog.c
index 06b54f15b1..06b54f15b1 100644
--- a/libgaim/protocols/msn/dialog.c
+++ b/libpurple/protocols/msn/dialog.c
diff --git a/libgaim/protocols/msn/dialog.h b/libpurple/protocols/msn/dialog.h
index 6eec147460..6eec147460 100644
--- a/libgaim/protocols/msn/dialog.h
+++ b/libpurple/protocols/msn/dialog.h
diff --git a/libgaim/protocols/msn/directconn.c b/libpurple/protocols/msn/directconn.c
index 6b718cb6ad..6b718cb6ad 100644
--- a/libgaim/protocols/msn/directconn.c
+++ b/libpurple/protocols/msn/directconn.c
diff --git a/libgaim/protocols/msn/directconn.h b/libpurple/protocols/msn/directconn.h
index 4d3de2618a..4d3de2618a 100644
--- a/libgaim/protocols/msn/directconn.h
+++ b/libpurple/protocols/msn/directconn.h
diff --git a/libgaim/protocols/msn/error.c b/libpurple/protocols/msn/error.c
index 46d347db2d..46d347db2d 100644
--- a/libgaim/protocols/msn/error.c
+++ b/libpurple/protocols/msn/error.c
diff --git a/libgaim/protocols/msn/error.h b/libpurple/protocols/msn/error.h
index 3093b86b47..3093b86b47 100644
--- a/libgaim/protocols/msn/error.h
+++ b/libpurple/protocols/msn/error.h
diff --git a/libgaim/protocols/msn/group.c b/libpurple/protocols/msn/group.c
index f676c8041f..f676c8041f 100644
--- a/libgaim/protocols/msn/group.c
+++ b/libpurple/protocols/msn/group.c
diff --git a/libgaim/protocols/msn/group.h b/libpurple/protocols/msn/group.h
index 629bc38644..629bc38644 100644
--- a/libgaim/protocols/msn/group.h
+++ b/libpurple/protocols/msn/group.h
diff --git a/libgaim/protocols/msn/history.c b/libpurple/protocols/msn/history.c
index e148fdd77f..e148fdd77f 100644
--- a/libgaim/protocols/msn/history.c
+++ b/libpurple/protocols/msn/history.c
diff --git a/libgaim/protocols/msn/history.h b/libpurple/protocols/msn/history.h
index 1474092979..1474092979 100644
--- a/libgaim/protocols/msn/history.h
+++ b/libpurple/protocols/msn/history.h
diff --git a/libgaim/protocols/msn/httpconn.c b/libpurple/protocols/msn/httpconn.c
index bf2d3991e0..bf2d3991e0 100644
--- a/libgaim/protocols/msn/httpconn.c
+++ b/libpurple/protocols/msn/httpconn.c
diff --git a/libgaim/protocols/msn/httpconn.h b/libpurple/protocols/msn/httpconn.h
index 7813d8c638..7813d8c638 100644
--- a/libgaim/protocols/msn/httpconn.h
+++ b/libpurple/protocols/msn/httpconn.h
diff --git a/libgaim/protocols/msn/msg.c b/libpurple/protocols/msn/msg.c
index b45237aac9..b45237aac9 100644
--- a/libgaim/protocols/msn/msg.c
+++ b/libpurple/protocols/msn/msg.c
diff --git a/libgaim/protocols/msn/msg.h b/libpurple/protocols/msn/msg.h
index 3d2fa5de25..3d2fa5de25 100644
--- a/libgaim/protocols/msn/msg.h
+++ b/libpurple/protocols/msn/msg.h
diff --git a/libgaim/protocols/msn/msn-utils.c b/libpurple/protocols/msn/msn-utils.c
index 5c4e60c9ce..5c4e60c9ce 100644
--- a/libgaim/protocols/msn/msn-utils.c
+++ b/libpurple/protocols/msn/msn-utils.c
diff --git a/libgaim/protocols/msn/msn-utils.h b/libpurple/protocols/msn/msn-utils.h
index cbf09edef4..cbf09edef4 100644
--- a/libgaim/protocols/msn/msn-utils.h
+++ b/libpurple/protocols/msn/msn-utils.h
diff --git a/libgaim/protocols/msn/msn.c b/libpurple/protocols/msn/msn.c
index 8ef07f4419..8ef07f4419 100644
--- a/libgaim/protocols/msn/msn.c
+++ b/libpurple/protocols/msn/msn.c
diff --git a/libgaim/protocols/msn/msn.h b/libpurple/protocols/msn/msn.h
index d922273544..d922273544 100644
--- a/libgaim/protocols/msn/msn.h
+++ b/libpurple/protocols/msn/msn.h
diff --git a/libgaim/protocols/msn/nexus.c b/libpurple/protocols/msn/nexus.c
index ae523ca040..ae523ca040 100644
--- a/libgaim/protocols/msn/nexus.c
+++ b/libpurple/protocols/msn/nexus.c
diff --git a/libgaim/protocols/msn/nexus.h b/libpurple/protocols/msn/nexus.h
index 9148e179d0..9148e179d0 100644
--- a/libgaim/protocols/msn/nexus.h
+++ b/libpurple/protocols/msn/nexus.h
diff --git a/libgaim/protocols/msn/notification.c b/libpurple/protocols/msn/notification.c
index b0a9e8cc09..b0a9e8cc09 100644
--- a/libgaim/protocols/msn/notification.c
+++ b/libpurple/protocols/msn/notification.c
diff --git a/libgaim/protocols/msn/notification.h b/libpurple/protocols/msn/notification.h
index 4b5be602a9..4b5be602a9 100644
--- a/libgaim/protocols/msn/notification.h
+++ b/libpurple/protocols/msn/notification.h
diff --git a/libgaim/protocols/msn/object.c b/libpurple/protocols/msn/object.c
index 15ba5b3b0f..15ba5b3b0f 100644
--- a/libgaim/protocols/msn/object.c
+++ b/libpurple/protocols/msn/object.c
diff --git a/libgaim/protocols/msn/object.h b/libpurple/protocols/msn/object.h
index 4ff3289a79..4ff3289a79 100644
--- a/libgaim/protocols/msn/object.h
+++ b/libpurple/protocols/msn/object.h
diff --git a/libgaim/protocols/msn/page.c b/libpurple/protocols/msn/page.c
index d549ace29c..d549ace29c 100644
--- a/libgaim/protocols/msn/page.c
+++ b/libpurple/protocols/msn/page.c
diff --git a/libgaim/protocols/msn/page.h b/libpurple/protocols/msn/page.h
index 8c70d35617..8c70d35617 100644
--- a/libgaim/protocols/msn/page.h
+++ b/libpurple/protocols/msn/page.h
diff --git a/libgaim/protocols/msn/servconn.c b/libpurple/protocols/msn/servconn.c
index 15975bdd47..15975bdd47 100644
--- a/libgaim/protocols/msn/servconn.c
+++ b/libpurple/protocols/msn/servconn.c
diff --git a/libgaim/protocols/msn/servconn.h b/libpurple/protocols/msn/servconn.h
index 59bfd6c826..59bfd6c826 100644
--- a/libgaim/protocols/msn/servconn.h
+++ b/libpurple/protocols/msn/servconn.h
diff --git a/libgaim/protocols/msn/session.c b/libpurple/protocols/msn/session.c
index 61a7423dbf..61a7423dbf 100644
--- a/libgaim/protocols/msn/session.c
+++ b/libpurple/protocols/msn/session.c
diff --git a/libgaim/protocols/msn/session.h b/libpurple/protocols/msn/session.h
index 1809bdfb3e..1809bdfb3e 100644
--- a/libgaim/protocols/msn/session.h
+++ b/libpurple/protocols/msn/session.h
diff --git a/libgaim/protocols/msn/slp.c b/libpurple/protocols/msn/slp.c
index 5d988cf6dd..5d988cf6dd 100644
--- a/libgaim/protocols/msn/slp.c
+++ b/libpurple/protocols/msn/slp.c
diff --git a/libgaim/protocols/msn/slp.h b/libpurple/protocols/msn/slp.h
index 8033328af6..8033328af6 100644
--- a/libgaim/protocols/msn/slp.h
+++ b/libpurple/protocols/msn/slp.h
diff --git a/libgaim/protocols/msn/slpcall.c b/libpurple/protocols/msn/slpcall.c
index a314b538d1..a314b538d1 100644
--- a/libgaim/protocols/msn/slpcall.c
+++ b/libpurple/protocols/msn/slpcall.c
diff --git a/libgaim/protocols/msn/slpcall.h b/libpurple/protocols/msn/slpcall.h
index 9237de2a04..9237de2a04 100644
--- a/libgaim/protocols/msn/slpcall.h
+++ b/libpurple/protocols/msn/slpcall.h
diff --git a/libgaim/protocols/msn/slplink.c b/libpurple/protocols/msn/slplink.c
index 86cc768105..86cc768105 100644
--- a/libgaim/protocols/msn/slplink.c
+++ b/libpurple/protocols/msn/slplink.c
diff --git a/libgaim/protocols/msn/slplink.h b/libpurple/protocols/msn/slplink.h
index f5bc3cb7e6..f5bc3cb7e6 100644
--- a/libgaim/protocols/msn/slplink.h
+++ b/libpurple/protocols/msn/slplink.h
diff --git a/libgaim/protocols/msn/slpmsg.c b/libpurple/protocols/msn/slpmsg.c
index a3819a2a3e..a3819a2a3e 100644
--- a/libgaim/protocols/msn/slpmsg.c
+++ b/libpurple/protocols/msn/slpmsg.c
diff --git a/libgaim/protocols/msn/slpmsg.h b/libpurple/protocols/msn/slpmsg.h
index 9d45efea7d..9d45efea7d 100644
--- a/libgaim/protocols/msn/slpmsg.h
+++ b/libpurple/protocols/msn/slpmsg.h
diff --git a/libgaim/protocols/msn/slpsession.c b/libpurple/protocols/msn/slpsession.c
index a62f38ae60..a62f38ae60 100644
--- a/libgaim/protocols/msn/slpsession.c
+++ b/libpurple/protocols/msn/slpsession.c
diff --git a/libgaim/protocols/msn/slpsession.h b/libpurple/protocols/msn/slpsession.h
index e1c9aa5875..e1c9aa5875 100644
--- a/libgaim/protocols/msn/slpsession.h
+++ b/libpurple/protocols/msn/slpsession.h
diff --git a/libgaim/protocols/msn/state.c b/libpurple/protocols/msn/state.c
index c8a70b99d3..c8a70b99d3 100644
--- a/libgaim/protocols/msn/state.c
+++ b/libpurple/protocols/msn/state.c
diff --git a/libgaim/protocols/msn/state.h b/libpurple/protocols/msn/state.h
index 3f9a1d35db..3f9a1d35db 100644
--- a/libgaim/protocols/msn/state.h
+++ b/libpurple/protocols/msn/state.h
diff --git a/libgaim/protocols/msn/switchboard.c b/libpurple/protocols/msn/switchboard.c
index 9de3e70d34..9de3e70d34 100644
--- a/libgaim/protocols/msn/switchboard.c
+++ b/libpurple/protocols/msn/switchboard.c
diff --git a/libgaim/protocols/msn/switchboard.h b/libpurple/protocols/msn/switchboard.h
index da71d09eb2..da71d09eb2 100644
--- a/libgaim/protocols/msn/switchboard.h
+++ b/libpurple/protocols/msn/switchboard.h
diff --git a/libgaim/protocols/msn/sync.c b/libpurple/protocols/msn/sync.c
index 93dcc6aedd..93dcc6aedd 100644
--- a/libgaim/protocols/msn/sync.c
+++ b/libpurple/protocols/msn/sync.c
diff --git a/libgaim/protocols/msn/sync.h b/libpurple/protocols/msn/sync.h
index f7d1548232..f7d1548232 100644
--- a/libgaim/protocols/msn/sync.h
+++ b/libpurple/protocols/msn/sync.h
diff --git a/libgaim/protocols/msn/table.c b/libpurple/protocols/msn/table.c
index 8d5d5780b2..8d5d5780b2 100644
--- a/libgaim/protocols/msn/table.c
+++ b/libpurple/protocols/msn/table.c
diff --git a/libgaim/protocols/msn/table.h b/libpurple/protocols/msn/table.h
index 8d265eea2c..8d265eea2c 100644
--- a/libgaim/protocols/msn/table.h
+++ b/libpurple/protocols/msn/table.h
diff --git a/libgaim/protocols/msn/transaction.c b/libpurple/protocols/msn/transaction.c
index e3a9068efd..e3a9068efd 100644
--- a/libgaim/protocols/msn/transaction.c
+++ b/libpurple/protocols/msn/transaction.c
diff --git a/libgaim/protocols/msn/transaction.h b/libpurple/protocols/msn/transaction.h
index 3f0ec2057a..3f0ec2057a 100644
--- a/libgaim/protocols/msn/transaction.h
+++ b/libpurple/protocols/msn/transaction.h
diff --git a/libgaim/protocols/msn/user.c b/libpurple/protocols/msn/user.c
index d7d60e40f0..d7d60e40f0 100644
--- a/libgaim/protocols/msn/user.c
+++ b/libpurple/protocols/msn/user.c
diff --git a/libgaim/protocols/msn/user.h b/libpurple/protocols/msn/user.h
index 06cb4d500f..06cb4d500f 100644
--- a/libgaim/protocols/msn/user.h
+++ b/libpurple/protocols/msn/user.h
diff --git a/libgaim/protocols/msn/userlist.c b/libpurple/protocols/msn/userlist.c
index 253b76f0a7..253b76f0a7 100644
--- a/libgaim/protocols/msn/userlist.c
+++ b/libpurple/protocols/msn/userlist.c
diff --git a/libgaim/protocols/msn/userlist.h b/libpurple/protocols/msn/userlist.h
index f363cb008c..f363cb008c 100644
--- a/libgaim/protocols/msn/userlist.h
+++ b/libpurple/protocols/msn/userlist.h
diff --git a/libgaim/protocols/novell/Makefile.am b/libpurple/protocols/novell/Makefile.am
index 40075df231..9bc39baba3 100644
--- a/libgaim/protocols/novell/Makefile.am
+++ b/libpurple/protocols/novell/Makefile.am
@@ -51,6 +51,6 @@ libnovell_la_LIBADD  = $(GLIB_LIBS)
 endif
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/libgaim \
+	-I$(top_srcdir)/libpurple \
 	$(DEBUG_CFLAGS) \
 	$(GLIB_CFLAGS)
diff --git a/libgaim/protocols/novell/Makefile.mingw b/libpurple/protocols/novell/Makefile.mingw
index 373aab81fe..373aab81fe 100644
--- a/libgaim/protocols/novell/Makefile.mingw
+++ b/libpurple/protocols/novell/Makefile.mingw
diff --git a/libgaim/protocols/novell/nmconference.c b/libpurple/protocols/novell/nmconference.c
index faf624c504..faf624c504 100644
--- a/libgaim/protocols/novell/nmconference.c
+++ b/libpurple/protocols/novell/nmconference.c
diff --git a/libgaim/protocols/novell/nmconference.h b/libpurple/protocols/novell/nmconference.h
index b667c6751d..b667c6751d 100644
--- a/libgaim/protocols/novell/nmconference.h
+++ b/libpurple/protocols/novell/nmconference.h
diff --git a/libgaim/protocols/novell/nmconn.c b/libpurple/protocols/novell/nmconn.c
index 7eb9ee367b..7eb9ee367b 100644
--- a/libgaim/protocols/novell/nmconn.c
+++ b/libpurple/protocols/novell/nmconn.c
diff --git a/libgaim/protocols/novell/nmconn.h b/libpurple/protocols/novell/nmconn.h
index a646317e78..a646317e78 100644
--- a/libgaim/protocols/novell/nmconn.h
+++ b/libpurple/protocols/novell/nmconn.h
diff --git a/libgaim/protocols/novell/nmcontact.c b/libpurple/protocols/novell/nmcontact.c
index 458db4705f..458db4705f 100644
--- a/libgaim/protocols/novell/nmcontact.c
+++ b/libpurple/protocols/novell/nmcontact.c
diff --git a/libgaim/protocols/novell/nmcontact.h b/libpurple/protocols/novell/nmcontact.h
index c52baa216b..c52baa216b 100644
--- a/libgaim/protocols/novell/nmcontact.h
+++ b/libpurple/protocols/novell/nmcontact.h
diff --git a/libgaim/protocols/novell/nmevent.c b/libpurple/protocols/novell/nmevent.c
index d785005c29..d785005c29 100644
--- a/libgaim/protocols/novell/nmevent.c
+++ b/libpurple/protocols/novell/nmevent.c
diff --git a/libgaim/protocols/novell/nmevent.h b/libpurple/protocols/novell/nmevent.h
index 588694c4fb..588694c4fb 100644
--- a/libgaim/protocols/novell/nmevent.h
+++ b/libpurple/protocols/novell/nmevent.h
diff --git a/libgaim/protocols/novell/nmfield.c b/libpurple/protocols/novell/nmfield.c
index 0dce6de7f6..0dce6de7f6 100644
--- a/libgaim/protocols/novell/nmfield.c
+++ b/libpurple/protocols/novell/nmfield.c
diff --git a/libgaim/protocols/novell/nmfield.h b/libpurple/protocols/novell/nmfield.h
index 4b1cf08bc7..4b1cf08bc7 100644
--- a/libgaim/protocols/novell/nmfield.h
+++ b/libpurple/protocols/novell/nmfield.h
diff --git a/libgaim/protocols/novell/nmmessage.c b/libpurple/protocols/novell/nmmessage.c
index 46ba512502..46ba512502 100644
--- a/libgaim/protocols/novell/nmmessage.c
+++ b/libpurple/protocols/novell/nmmessage.c
diff --git a/libgaim/protocols/novell/nmmessage.h b/libpurple/protocols/novell/nmmessage.h
index 75a558cc5e..75a558cc5e 100644
--- a/libgaim/protocols/novell/nmmessage.h
+++ b/libpurple/protocols/novell/nmmessage.h
diff --git a/libgaim/protocols/novell/nmrequest.c b/libpurple/protocols/novell/nmrequest.c
index 6e8d004ee8..6e8d004ee8 100644
--- a/libgaim/protocols/novell/nmrequest.c
+++ b/libpurple/protocols/novell/nmrequest.c
diff --git a/libgaim/protocols/novell/nmrequest.h b/libpurple/protocols/novell/nmrequest.h
index 863e6d8751..863e6d8751 100644
--- a/libgaim/protocols/novell/nmrequest.h
+++ b/libpurple/protocols/novell/nmrequest.h
diff --git a/libgaim/protocols/novell/nmrtf.c b/libpurple/protocols/novell/nmrtf.c
index 063bae8a07..063bae8a07 100644
--- a/libgaim/protocols/novell/nmrtf.c
+++ b/libpurple/protocols/novell/nmrtf.c
diff --git a/libgaim/protocols/novell/nmrtf.h b/libpurple/protocols/novell/nmrtf.h
index d09130191c..d09130191c 100644
--- a/libgaim/protocols/novell/nmrtf.h
+++ b/libpurple/protocols/novell/nmrtf.h
diff --git a/libgaim/protocols/novell/nmuser.c b/libpurple/protocols/novell/nmuser.c
index d796d48f6d..d796d48f6d 100644
--- a/libgaim/protocols/novell/nmuser.c
+++ b/libpurple/protocols/novell/nmuser.c
diff --git a/libgaim/protocols/novell/nmuser.h b/libpurple/protocols/novell/nmuser.h
index 21101a0114..21101a0114 100644
--- a/libgaim/protocols/novell/nmuser.h
+++ b/libpurple/protocols/novell/nmuser.h
diff --git a/libgaim/protocols/novell/nmuserrecord.c b/libpurple/protocols/novell/nmuserrecord.c
index 1fbf8fd510..1fbf8fd510 100644
--- a/libgaim/protocols/novell/nmuserrecord.c
+++ b/libpurple/protocols/novell/nmuserrecord.c
diff --git a/libgaim/protocols/novell/nmuserrecord.h b/libpurple/protocols/novell/nmuserrecord.h
index 41e87de66c..41e87de66c 100644
--- a/libgaim/protocols/novell/nmuserrecord.h
+++ b/libpurple/protocols/novell/nmuserrecord.h
diff --git a/libgaim/protocols/novell/novell.c b/libpurple/protocols/novell/novell.c
index cc47a22290..cc47a22290 100644
--- a/libgaim/protocols/novell/novell.c
+++ b/libpurple/protocols/novell/novell.c
diff --git a/libgaim/protocols/oscar/.todo b/libpurple/protocols/oscar/.todo
index b43ecd530d..b43ecd530d 100644
--- a/libgaim/protocols/oscar/.todo
+++ b/libpurple/protocols/oscar/.todo
diff --git a/libgaim/protocols/oscar/AUTHORS b/libpurple/protocols/oscar/AUTHORS
index f0a3a76cb1..f0a3a76cb1 100644
--- a/libgaim/protocols/oscar/AUTHORS
+++ b/libpurple/protocols/oscar/AUTHORS
diff --git a/libgaim/protocols/oscar/COPYING b/libpurple/protocols/oscar/COPYING
index 223ede7de3..223ede7de3 100644
--- a/libgaim/protocols/oscar/COPYING
+++ b/libpurple/protocols/oscar/COPYING
diff --git a/libgaim/protocols/oscar/Makefile.am b/libpurple/protocols/oscar/Makefile.am
index 2709c0c9a7..a2da367ccd 100644
--- a/libgaim/protocols/oscar/Makefile.am
+++ b/libpurple/protocols/oscar/Makefile.am
@@ -78,6 +78,6 @@ libicq_la_LIBADD = liboscar.la
 endif
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/libgaim \
+	-I$(top_srcdir)/libpurple \
 	$(GLIB_CFLAGS) \
 	$(DEBUG_CFLAGS)
diff --git a/libgaim/protocols/oscar/Makefile.mingw b/libpurple/protocols/oscar/Makefile.mingw
index b04421f73b..b04421f73b 100644
--- a/libgaim/protocols/oscar/Makefile.mingw
+++ b/libpurple/protocols/oscar/Makefile.mingw
diff --git a/libgaim/protocols/oscar/bstream.c b/libpurple/protocols/oscar/bstream.c
index cc7d1eeb55..cc7d1eeb55 100644
--- a/libgaim/protocols/oscar/bstream.c
+++ b/libpurple/protocols/oscar/bstream.c
diff --git a/libgaim/protocols/oscar/family_admin.c b/libpurple/protocols/oscar/family_admin.c
index 96740e8345..96740e8345 100644
--- a/libgaim/protocols/oscar/family_admin.c
+++ b/libpurple/protocols/oscar/family_admin.c
diff --git a/libgaim/protocols/oscar/family_advert.c b/libpurple/protocols/oscar/family_advert.c
index b5c31abc75..b5c31abc75 100644
--- a/libgaim/protocols/oscar/family_advert.c
+++ b/libpurple/protocols/oscar/family_advert.c
diff --git a/libgaim/protocols/oscar/family_alert.c b/libpurple/protocols/oscar/family_alert.c
index 1121c4f9d5..1121c4f9d5 100644
--- a/libgaim/protocols/oscar/family_alert.c
+++ b/libpurple/protocols/oscar/family_alert.c
diff --git a/libgaim/protocols/oscar/family_auth.c b/libpurple/protocols/oscar/family_auth.c
index 41d2fd5066..41d2fd5066 100644
--- a/libgaim/protocols/oscar/family_auth.c
+++ b/libpurple/protocols/oscar/family_auth.c
diff --git a/libgaim/protocols/oscar/family_bart.c b/libpurple/protocols/oscar/family_bart.c
index d6c29cdf95..d6c29cdf95 100644
--- a/libgaim/protocols/oscar/family_bart.c
+++ b/libpurple/protocols/oscar/family_bart.c
diff --git a/libgaim/protocols/oscar/family_bos.c b/libpurple/protocols/oscar/family_bos.c
index 8ce6fdcbb1..8ce6fdcbb1 100644
--- a/libgaim/protocols/oscar/family_bos.c
+++ b/libpurple/protocols/oscar/family_bos.c
diff --git a/libgaim/protocols/oscar/family_buddy.c b/libpurple/protocols/oscar/family_buddy.c
index 2740876048..2740876048 100644
--- a/libgaim/protocols/oscar/family_buddy.c
+++ b/libpurple/protocols/oscar/family_buddy.c
diff --git a/libgaim/protocols/oscar/family_chat.c b/libpurple/protocols/oscar/family_chat.c
index 107bab4235..107bab4235 100644
--- a/libgaim/protocols/oscar/family_chat.c
+++ b/libpurple/protocols/oscar/family_chat.c
diff --git a/libgaim/protocols/oscar/family_chatnav.c b/libpurple/protocols/oscar/family_chatnav.c
index cffb398fe8..cffb398fe8 100644
--- a/libgaim/protocols/oscar/family_chatnav.c
+++ b/libpurple/protocols/oscar/family_chatnav.c
diff --git a/libgaim/protocols/oscar/family_feedbag.c b/libpurple/protocols/oscar/family_feedbag.c
index 2f9053e8f7..2f9053e8f7 100644
--- a/libgaim/protocols/oscar/family_feedbag.c
+++ b/libpurple/protocols/oscar/family_feedbag.c
diff --git a/libgaim/protocols/oscar/family_icbm.c b/libpurple/protocols/oscar/family_icbm.c
index b9db86caf2..b9db86caf2 100644
--- a/libgaim/protocols/oscar/family_icbm.c
+++ b/libpurple/protocols/oscar/family_icbm.c
diff --git a/libgaim/protocols/oscar/family_icq.c b/libpurple/protocols/oscar/family_icq.c
index 7778bf8377..7778bf8377 100644
--- a/libgaim/protocols/oscar/family_icq.c
+++ b/libpurple/protocols/oscar/family_icq.c
diff --git a/libgaim/protocols/oscar/family_invite.c b/libpurple/protocols/oscar/family_invite.c
index 2b08e252f2..2b08e252f2 100644
--- a/libgaim/protocols/oscar/family_invite.c
+++ b/libpurple/protocols/oscar/family_invite.c
diff --git a/libgaim/protocols/oscar/family_locate.c b/libpurple/protocols/oscar/family_locate.c
index ba7b614893..ba7b614893 100644
--- a/libgaim/protocols/oscar/family_locate.c
+++ b/libpurple/protocols/oscar/family_locate.c
diff --git a/libgaim/protocols/oscar/family_odir.c b/libpurple/protocols/oscar/family_odir.c
index 52f65ec970..52f65ec970 100644
--- a/libgaim/protocols/oscar/family_odir.c
+++ b/libpurple/protocols/oscar/family_odir.c
diff --git a/libgaim/protocols/oscar/family_oservice.c b/libpurple/protocols/oscar/family_oservice.c
index 4e9d8e30fb..4e9d8e30fb 100644
--- a/libgaim/protocols/oscar/family_oservice.c
+++ b/libpurple/protocols/oscar/family_oservice.c
diff --git a/libgaim/protocols/oscar/family_popup.c b/libpurple/protocols/oscar/family_popup.c
index ed0aa05ee4..ed0aa05ee4 100644
--- a/libgaim/protocols/oscar/family_popup.c
+++ b/libpurple/protocols/oscar/family_popup.c
diff --git a/libgaim/protocols/oscar/family_stats.c b/libpurple/protocols/oscar/family_stats.c
index b2b20bce34..b2b20bce34 100644
--- a/libgaim/protocols/oscar/family_stats.c
+++ b/libpurple/protocols/oscar/family_stats.c
diff --git a/libgaim/protocols/oscar/family_translate.c b/libpurple/protocols/oscar/family_translate.c
index 0ba8b5698b..0ba8b5698b 100644
--- a/libgaim/protocols/oscar/family_translate.c
+++ b/libpurple/protocols/oscar/family_translate.c
diff --git a/libgaim/protocols/oscar/family_userlookup.c b/libpurple/protocols/oscar/family_userlookup.c
index 67f26f7028..67f26f7028 100644
--- a/libgaim/protocols/oscar/family_userlookup.c
+++ b/libpurple/protocols/oscar/family_userlookup.c
diff --git a/libgaim/protocols/oscar/flap_connection.c b/libpurple/protocols/oscar/flap_connection.c
index 6d1207d449..6d1207d449 100644
--- a/libgaim/protocols/oscar/flap_connection.c
+++ b/libpurple/protocols/oscar/flap_connection.c
diff --git a/libgaim/protocols/oscar/libaim.c b/libpurple/protocols/oscar/libaim.c
index 4fe710b59b..4fe710b59b 100644
--- a/libgaim/protocols/oscar/libaim.c
+++ b/libpurple/protocols/oscar/libaim.c
diff --git a/libgaim/protocols/oscar/libicq.c b/libpurple/protocols/oscar/libicq.c
index 5629752698..5629752698 100644
--- a/libgaim/protocols/oscar/libicq.c
+++ b/libpurple/protocols/oscar/libicq.c
diff --git a/libgaim/protocols/oscar/misc.c b/libpurple/protocols/oscar/misc.c
index 4d897a0fba..4d897a0fba 100644
--- a/libgaim/protocols/oscar/misc.c
+++ b/libpurple/protocols/oscar/misc.c
diff --git a/libgaim/protocols/oscar/msgcookie.c b/libpurple/protocols/oscar/msgcookie.c
index deaae8d5a2..deaae8d5a2 100644
--- a/libgaim/protocols/oscar/msgcookie.c
+++ b/libpurple/protocols/oscar/msgcookie.c
diff --git a/libgaim/protocols/oscar/odc.c b/libpurple/protocols/oscar/odc.c
index 160cfb418c..160cfb418c 100644
--- a/libgaim/protocols/oscar/odc.c
+++ b/libpurple/protocols/oscar/odc.c
diff --git a/libgaim/protocols/oscar/oft.c b/libpurple/protocols/oscar/oft.c
index c33a8cdb5f..c33a8cdb5f 100644
--- a/libgaim/protocols/oscar/oft.c
+++ b/libpurple/protocols/oscar/oft.c
diff --git a/libgaim/protocols/oscar/oscar.c b/libpurple/protocols/oscar/oscar.c
index 2ef6e1c0fe..2ef6e1c0fe 100644
--- a/libgaim/protocols/oscar/oscar.c
+++ b/libpurple/protocols/oscar/oscar.c
diff --git a/libgaim/protocols/oscar/oscar.h b/libpurple/protocols/oscar/oscar.h
index a9eaab1b63..a9eaab1b63 100644
--- a/libgaim/protocols/oscar/oscar.h
+++ b/libpurple/protocols/oscar/oscar.h
diff --git a/libgaim/protocols/oscar/oscar_data.c b/libpurple/protocols/oscar/oscar_data.c
index 0916dd5845..0916dd5845 100644
--- a/libgaim/protocols/oscar/oscar_data.c
+++ b/libpurple/protocols/oscar/oscar_data.c
diff --git a/libgaim/protocols/oscar/oscarcommon.h b/libpurple/protocols/oscar/oscarcommon.h
index 7c8ffec077..7c8ffec077 100644
--- a/libgaim/protocols/oscar/oscarcommon.h
+++ b/libpurple/protocols/oscar/oscarcommon.h
diff --git a/libgaim/protocols/oscar/peer.c b/libpurple/protocols/oscar/peer.c
index 74f33c95a7..74f33c95a7 100644
--- a/libgaim/protocols/oscar/peer.c
+++ b/libpurple/protocols/oscar/peer.c
diff --git a/libgaim/protocols/oscar/peer.h b/libpurple/protocols/oscar/peer.h
index 8e7fdcd399..8e7fdcd399 100644
--- a/libgaim/protocols/oscar/peer.h
+++ b/libpurple/protocols/oscar/peer.h
diff --git a/libgaim/protocols/oscar/peer_proxy.c b/libpurple/protocols/oscar/peer_proxy.c
index a62b7b2559..a62b7b2559 100644
--- a/libgaim/protocols/oscar/peer_proxy.c
+++ b/libpurple/protocols/oscar/peer_proxy.c
diff --git a/libgaim/protocols/oscar/rxhandlers.c b/libpurple/protocols/oscar/rxhandlers.c
index 995b926135..995b926135 100644
--- a/libgaim/protocols/oscar/rxhandlers.c
+++ b/libpurple/protocols/oscar/rxhandlers.c
diff --git a/libgaim/protocols/oscar/snac.c b/libpurple/protocols/oscar/snac.c
index 82af41b78d..82af41b78d 100644
--- a/libgaim/protocols/oscar/snac.c
+++ b/libpurple/protocols/oscar/snac.c
diff --git a/libgaim/protocols/oscar/snactypes.h b/libpurple/protocols/oscar/snactypes.h
index 5604304b17..5604304b17 100644
--- a/libgaim/protocols/oscar/snactypes.h
+++ b/libpurple/protocols/oscar/snactypes.h
diff --git a/libgaim/protocols/oscar/tlv.c b/libpurple/protocols/oscar/tlv.c
index 44d1b32b07..44d1b32b07 100644
--- a/libgaim/protocols/oscar/tlv.c
+++ b/libpurple/protocols/oscar/tlv.c
diff --git a/libgaim/protocols/oscar/util.c b/libpurple/protocols/oscar/util.c
index 9f44dd302b..9f44dd302b 100644
--- a/libgaim/protocols/oscar/util.c
+++ b/libpurple/protocols/oscar/util.c
diff --git a/libgaim/protocols/qq/AUTHORS b/libpurple/protocols/qq/AUTHORS
index 58b48aa58f..58b48aa58f 100644
--- a/libgaim/protocols/qq/AUTHORS
+++ b/libpurple/protocols/qq/AUTHORS
diff --git a/libgaim/protocols/qq/Makefile.am b/libpurple/protocols/qq/Makefile.am
index 7eb4625e6f..0834f2cefd 100644
--- a/libgaim/protocols/qq/Makefile.am
+++ b/libpurple/protocols/qq/Makefile.am
@@ -92,7 +92,7 @@ libqq_la_LIBADD  = $(GLIB_LIBS)
 endif
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/libgaim \
+	-I$(top_srcdir)/libpurple \
 	-DVERSION=\"$(VERSION)\" \
 	-DQQ_BUDDY_ICON_DIR=\"$(datadir)/pixmaps/gaim/buddy_icons/qq\" \
 	$(DEBUG_CFLAGS) \
diff --git a/libgaim/protocols/qq/Makefile.mingw b/libpurple/protocols/qq/Makefile.mingw
index 1896fe3d42..1896fe3d42 100644
--- a/libgaim/protocols/qq/Makefile.mingw
+++ b/libpurple/protocols/qq/Makefile.mingw
diff --git a/libgaim/protocols/qq/buddy_info.c b/libpurple/protocols/qq/buddy_info.c
index b26d3834e5..b26d3834e5 100644
--- a/libgaim/protocols/qq/buddy_info.c
+++ b/libpurple/protocols/qq/buddy_info.c
diff --git a/libgaim/protocols/qq/buddy_info.h b/libpurple/protocols/qq/buddy_info.h
index f999a81230..f999a81230 100644
--- a/libgaim/protocols/qq/buddy_info.h
+++ b/libpurple/protocols/qq/buddy_info.h
diff --git a/libgaim/protocols/qq/buddy_list.c b/libpurple/protocols/qq/buddy_list.c
index 59a4ceae89..59a4ceae89 100644
--- a/libgaim/protocols/qq/buddy_list.c
+++ b/libpurple/protocols/qq/buddy_list.c
diff --git a/libgaim/protocols/qq/buddy_list.h b/libpurple/protocols/qq/buddy_list.h
index 721fb70929..721fb70929 100644
--- a/libgaim/protocols/qq/buddy_list.h
+++ b/libpurple/protocols/qq/buddy_list.h
diff --git a/libgaim/protocols/qq/buddy_opt.c b/libpurple/protocols/qq/buddy_opt.c
index 667d5c9e96..667d5c9e96 100644
--- a/libgaim/protocols/qq/buddy_opt.c
+++ b/libpurple/protocols/qq/buddy_opt.c
diff --git a/libgaim/protocols/qq/buddy_opt.h b/libpurple/protocols/qq/buddy_opt.h
index 6d218b79ca..6d218b79ca 100644
--- a/libgaim/protocols/qq/buddy_opt.h
+++ b/libpurple/protocols/qq/buddy_opt.h
diff --git a/libgaim/protocols/qq/buddy_status.c b/libpurple/protocols/qq/buddy_status.c
index 167c6de5ed..167c6de5ed 100644
--- a/libgaim/protocols/qq/buddy_status.c
+++ b/libpurple/protocols/qq/buddy_status.c
diff --git a/libgaim/protocols/qq/buddy_status.h b/libpurple/protocols/qq/buddy_status.h
index 971340b805..971340b805 100644
--- a/libgaim/protocols/qq/buddy_status.h
+++ b/libpurple/protocols/qq/buddy_status.h
diff --git a/libgaim/protocols/qq/char_conv.c b/libpurple/protocols/qq/char_conv.c
index 0057c742d2..0057c742d2 100644
--- a/libgaim/protocols/qq/char_conv.c
+++ b/libpurple/protocols/qq/char_conv.c
diff --git a/libgaim/protocols/qq/char_conv.h b/libpurple/protocols/qq/char_conv.h
index dd0e9f7e5b..dd0e9f7e5b 100644
--- a/libgaim/protocols/qq/char_conv.h
+++ b/libpurple/protocols/qq/char_conv.h
diff --git a/libgaim/protocols/qq/crypt.c b/libpurple/protocols/qq/crypt.c
index 54d6217b71..54d6217b71 100644
--- a/libgaim/protocols/qq/crypt.c
+++ b/libpurple/protocols/qq/crypt.c
diff --git a/libgaim/protocols/qq/crypt.h b/libpurple/protocols/qq/crypt.h
index ae7e4527f3..ae7e4527f3 100644
--- a/libgaim/protocols/qq/crypt.h
+++ b/libpurple/protocols/qq/crypt.h
diff --git a/libgaim/protocols/qq/file_trans.c b/libpurple/protocols/qq/file_trans.c
index fa7087030f..fa7087030f 100644
--- a/libgaim/protocols/qq/file_trans.c
+++ b/libpurple/protocols/qq/file_trans.c
diff --git a/libgaim/protocols/qq/file_trans.h b/libpurple/protocols/qq/file_trans.h
index 822c67902c..822c67902c 100644
--- a/libgaim/protocols/qq/file_trans.h
+++ b/libpurple/protocols/qq/file_trans.h
diff --git a/libgaim/protocols/qq/group.c b/libpurple/protocols/qq/group.c
index 6e8dd6e0c1..6e8dd6e0c1 100644
--- a/libgaim/protocols/qq/group.c
+++ b/libpurple/protocols/qq/group.c
diff --git a/libgaim/protocols/qq/group.h b/libpurple/protocols/qq/group.h
index b17b8dd76e..b17b8dd76e 100644
--- a/libgaim/protocols/qq/group.h
+++ b/libpurple/protocols/qq/group.h
diff --git a/libgaim/protocols/qq/group_conv.c b/libpurple/protocols/qq/group_conv.c
index 4f26872728..4f26872728 100644
--- a/libgaim/protocols/qq/group_conv.c
+++ b/libpurple/protocols/qq/group_conv.c
diff --git a/libgaim/protocols/qq/group_conv.h b/libpurple/protocols/qq/group_conv.h
index af5c65328e..af5c65328e 100644
--- a/libgaim/protocols/qq/group_conv.h
+++ b/libpurple/protocols/qq/group_conv.h
diff --git a/libgaim/protocols/qq/group_find.c b/libpurple/protocols/qq/group_find.c
index ef81c4682c..ef81c4682c 100644
--- a/libgaim/protocols/qq/group_find.c
+++ b/libpurple/protocols/qq/group_find.c
diff --git a/libgaim/protocols/qq/group_find.h b/libpurple/protocols/qq/group_find.h
index d3f0091d28..d3f0091d28 100644
--- a/libgaim/protocols/qq/group_find.h
+++ b/libpurple/protocols/qq/group_find.h
diff --git a/libgaim/protocols/qq/group_free.c b/libpurple/protocols/qq/group_free.c
index 7035b0b4fc..7035b0b4fc 100644
--- a/libgaim/protocols/qq/group_free.c
+++ b/libpurple/protocols/qq/group_free.c
diff --git a/libgaim/protocols/qq/group_free.h b/libpurple/protocols/qq/group_free.h
index 2207874351..2207874351 100644
--- a/libgaim/protocols/qq/group_free.h
+++ b/libpurple/protocols/qq/group_free.h
diff --git a/libgaim/protocols/qq/group_im.c b/libpurple/protocols/qq/group_im.c
index 025261aee8..025261aee8 100644
--- a/libgaim/protocols/qq/group_im.c
+++ b/libpurple/protocols/qq/group_im.c
diff --git a/libgaim/protocols/qq/group_im.h b/libpurple/protocols/qq/group_im.h
index c451bbe061..c451bbe061 100644
--- a/libgaim/protocols/qq/group_im.h
+++ b/libpurple/protocols/qq/group_im.h
diff --git a/libgaim/protocols/qq/group_info.c b/libpurple/protocols/qq/group_info.c
index 4e4c0a93ea..4e4c0a93ea 100644
--- a/libgaim/protocols/qq/group_info.c
+++ b/libpurple/protocols/qq/group_info.c
diff --git a/libgaim/protocols/qq/group_info.h b/libpurple/protocols/qq/group_info.h
index 9cbf22679c..9cbf22679c 100644
--- a/libgaim/protocols/qq/group_info.h
+++ b/libpurple/protocols/qq/group_info.h
diff --git a/libgaim/protocols/qq/group_internal.c b/libpurple/protocols/qq/group_internal.c
index 95bbf12ca6..95bbf12ca6 100644
--- a/libgaim/protocols/qq/group_internal.c
+++ b/libpurple/protocols/qq/group_internal.c
diff --git a/libgaim/protocols/qq/group_internal.h b/libpurple/protocols/qq/group_internal.h
index 790a878226..790a878226 100644
--- a/libgaim/protocols/qq/group_internal.h
+++ b/libpurple/protocols/qq/group_internal.h
diff --git a/libgaim/protocols/qq/group_join.c b/libpurple/protocols/qq/group_join.c
index 360c44b7b0..360c44b7b0 100644
--- a/libgaim/protocols/qq/group_join.c
+++ b/libpurple/protocols/qq/group_join.c
diff --git a/libgaim/protocols/qq/group_join.h b/libpurple/protocols/qq/group_join.h
index e27b7476c5..e27b7476c5 100644
--- a/libgaim/protocols/qq/group_join.h
+++ b/libpurple/protocols/qq/group_join.h
diff --git a/libgaim/protocols/qq/group_misc.c b/libpurple/protocols/qq/group_misc.c
index 994863e136..994863e136 100644
--- a/libgaim/protocols/qq/group_misc.c
+++ b/libpurple/protocols/qq/group_misc.c
diff --git a/libgaim/protocols/qq/group_misc.h b/libpurple/protocols/qq/group_misc.h
index fa1bd19ee5..fa1bd19ee5 100644
--- a/libgaim/protocols/qq/group_misc.h
+++ b/libpurple/protocols/qq/group_misc.h
diff --git a/libgaim/protocols/qq/group_network.c b/libpurple/protocols/qq/group_network.c
index af66e23b7a..af66e23b7a 100644
--- a/libgaim/protocols/qq/group_network.c
+++ b/libpurple/protocols/qq/group_network.c
diff --git a/libgaim/protocols/qq/group_network.h b/libpurple/protocols/qq/group_network.h
index ddac882529..ddac882529 100644
--- a/libgaim/protocols/qq/group_network.h
+++ b/libpurple/protocols/qq/group_network.h
diff --git a/libgaim/protocols/qq/group_opt.c b/libpurple/protocols/qq/group_opt.c
index ae31eec351..ae31eec351 100644
--- a/libgaim/protocols/qq/group_opt.c
+++ b/libpurple/protocols/qq/group_opt.c
diff --git a/libgaim/protocols/qq/group_opt.h b/libpurple/protocols/qq/group_opt.h
index a154d9fb78..a154d9fb78 100644
--- a/libgaim/protocols/qq/group_opt.h
+++ b/libpurple/protocols/qq/group_opt.h
diff --git a/libgaim/protocols/qq/group_search.c b/libpurple/protocols/qq/group_search.c
index 51b9762193..51b9762193 100644
--- a/libgaim/protocols/qq/group_search.c
+++ b/libpurple/protocols/qq/group_search.c
diff --git a/libgaim/protocols/qq/group_search.h b/libpurple/protocols/qq/group_search.h
index a99adf5221..a99adf5221 100644
--- a/libgaim/protocols/qq/group_search.h
+++ b/libpurple/protocols/qq/group_search.h
diff --git a/libgaim/protocols/qq/header_info.c b/libpurple/protocols/qq/header_info.c
index 64c12a5fdf..64c12a5fdf 100644
--- a/libgaim/protocols/qq/header_info.c
+++ b/libpurple/protocols/qq/header_info.c
diff --git a/libgaim/protocols/qq/header_info.h b/libpurple/protocols/qq/header_info.h
index 154c1aafff..154c1aafff 100644
--- a/libgaim/protocols/qq/header_info.h
+++ b/libpurple/protocols/qq/header_info.h
diff --git a/libgaim/protocols/qq/im.c b/libpurple/protocols/qq/im.c
index c3f95c81cf..c3f95c81cf 100644
--- a/libgaim/protocols/qq/im.c
+++ b/libpurple/protocols/qq/im.c
diff --git a/libgaim/protocols/qq/im.h b/libpurple/protocols/qq/im.h
index 6c66bed49a..6c66bed49a 100644
--- a/libgaim/protocols/qq/im.h
+++ b/libpurple/protocols/qq/im.h
diff --git a/libgaim/protocols/qq/keep_alive.c b/libpurple/protocols/qq/keep_alive.c
index c486c25eda..c486c25eda 100644
--- a/libgaim/protocols/qq/keep_alive.c
+++ b/libpurple/protocols/qq/keep_alive.c
diff --git a/libgaim/protocols/qq/keep_alive.h b/libpurple/protocols/qq/keep_alive.h
index 766ff171c9..766ff171c9 100644
--- a/libgaim/protocols/qq/keep_alive.h
+++ b/libpurple/protocols/qq/keep_alive.h
diff --git a/libgaim/protocols/qq/login_logout.c b/libpurple/protocols/qq/login_logout.c
index bf6a6bbb72..bf6a6bbb72 100644
--- a/libgaim/protocols/qq/login_logout.c
+++ b/libpurple/protocols/qq/login_logout.c
diff --git a/libgaim/protocols/qq/login_logout.h b/libpurple/protocols/qq/login_logout.h
index 06ca15f7c2..06ca15f7c2 100644
--- a/libgaim/protocols/qq/login_logout.h
+++ b/libpurple/protocols/qq/login_logout.h
diff --git a/libgaim/protocols/qq/packet_parse.c b/libpurple/protocols/qq/packet_parse.c
index 86cd636df9..86cd636df9 100644
--- a/libgaim/protocols/qq/packet_parse.c
+++ b/libpurple/protocols/qq/packet_parse.c
diff --git a/libgaim/protocols/qq/packet_parse.h b/libpurple/protocols/qq/packet_parse.h
index 554599dfd5..554599dfd5 100644
--- a/libgaim/protocols/qq/packet_parse.h
+++ b/libpurple/protocols/qq/packet_parse.h
diff --git a/libgaim/protocols/qq/qq.c b/libpurple/protocols/qq/qq.c
index 3a54f9be3b..3a54f9be3b 100644
--- a/libgaim/protocols/qq/qq.c
+++ b/libpurple/protocols/qq/qq.c
diff --git a/libgaim/protocols/qq/qq.h b/libpurple/protocols/qq/qq.h
index 421e3bc08b..421e3bc08b 100644
--- a/libgaim/protocols/qq/qq.h
+++ b/libpurple/protocols/qq/qq.h
diff --git a/libgaim/protocols/qq/qq_proxy.c b/libpurple/protocols/qq/qq_proxy.c
index 5eb1bc243b..5eb1bc243b 100644
--- a/libgaim/protocols/qq/qq_proxy.c
+++ b/libpurple/protocols/qq/qq_proxy.c
diff --git a/libgaim/protocols/qq/qq_proxy.h b/libpurple/protocols/qq/qq_proxy.h
index 5f23089344..5f23089344 100644
--- a/libgaim/protocols/qq/qq_proxy.h
+++ b/libpurple/protocols/qq/qq_proxy.h
diff --git a/libgaim/protocols/qq/recv_core.c b/libpurple/protocols/qq/recv_core.c
index 20405a9674..20405a9674 100644
--- a/libgaim/protocols/qq/recv_core.c
+++ b/libpurple/protocols/qq/recv_core.c
diff --git a/libgaim/protocols/qq/recv_core.h b/libpurple/protocols/qq/recv_core.h
index 7d120b7e94..7d120b7e94 100644
--- a/libgaim/protocols/qq/recv_core.h
+++ b/libpurple/protocols/qq/recv_core.h
diff --git a/libgaim/protocols/qq/send_core.c b/libpurple/protocols/qq/send_core.c
index 77897969b1..77897969b1 100644
--- a/libgaim/protocols/qq/send_core.c
+++ b/libpurple/protocols/qq/send_core.c
diff --git a/libgaim/protocols/qq/send_core.h b/libpurple/protocols/qq/send_core.h
index c3e0f7acb7..c3e0f7acb7 100644
--- a/libgaim/protocols/qq/send_core.h
+++ b/libpurple/protocols/qq/send_core.h
diff --git a/libgaim/protocols/qq/send_file.c b/libpurple/protocols/qq/send_file.c
index 56ad86c9b4..56ad86c9b4 100644
--- a/libgaim/protocols/qq/send_file.c
+++ b/libpurple/protocols/qq/send_file.c
diff --git a/libgaim/protocols/qq/send_file.h b/libpurple/protocols/qq/send_file.h
index a905894092..a905894092 100644
--- a/libgaim/protocols/qq/send_file.h
+++ b/libpurple/protocols/qq/send_file.h
diff --git a/libgaim/protocols/qq/sendqueue.c b/libpurple/protocols/qq/sendqueue.c
index c2eb2445b1..c2eb2445b1 100644
--- a/libgaim/protocols/qq/sendqueue.c
+++ b/libpurple/protocols/qq/sendqueue.c
diff --git a/libgaim/protocols/qq/sendqueue.h b/libpurple/protocols/qq/sendqueue.h
index ab3f465e5c..ab3f465e5c 100644
--- a/libgaim/protocols/qq/sendqueue.h
+++ b/libpurple/protocols/qq/sendqueue.h
diff --git a/libgaim/protocols/qq/sys_msg.c b/libpurple/protocols/qq/sys_msg.c
index c680682faa..c680682faa 100644
--- a/libgaim/protocols/qq/sys_msg.c
+++ b/libpurple/protocols/qq/sys_msg.c
diff --git a/libgaim/protocols/qq/sys_msg.h b/libpurple/protocols/qq/sys_msg.h
index eada6ddee5..eada6ddee5 100644
--- a/libgaim/protocols/qq/sys_msg.h
+++ b/libpurple/protocols/qq/sys_msg.h
diff --git a/libgaim/protocols/qq/udp_proxy_s5.c b/libpurple/protocols/qq/udp_proxy_s5.c
index f140c62df1..f140c62df1 100644
--- a/libgaim/protocols/qq/udp_proxy_s5.c
+++ b/libpurple/protocols/qq/udp_proxy_s5.c
diff --git a/libgaim/protocols/qq/udp_proxy_s5.h b/libpurple/protocols/qq/udp_proxy_s5.h
index f1c8f1e52c..f1c8f1e52c 100644
--- a/libgaim/protocols/qq/udp_proxy_s5.h
+++ b/libpurple/protocols/qq/udp_proxy_s5.h
diff --git a/libgaim/protocols/qq/utils.c b/libpurple/protocols/qq/utils.c
index c49bcba806..c49bcba806 100644
--- a/libgaim/protocols/qq/utils.c
+++ b/libpurple/protocols/qq/utils.c
diff --git a/libgaim/protocols/qq/utils.h b/libpurple/protocols/qq/utils.h
index 8d6ee59bfa..8d6ee59bfa 100644
--- a/libgaim/protocols/qq/utils.h
+++ b/libpurple/protocols/qq/utils.h
diff --git a/libgaim/protocols/sametime/Makefile.am b/libpurple/protocols/sametime/Makefile.am
index 79dae48af8..9463f6e05d 100644
--- a/libgaim/protocols/sametime/Makefile.am
+++ b/libpurple/protocols/sametime/Makefile.am
@@ -34,7 +34,7 @@ libsametime_la_LIBADD = $(GLIB_LIBS) $(MEANWHILE_LIBS)
 AM_CFLAGS = \
 	$(GLIB_CFLAGS) $(MEANWHILE_CFLAGS) \
 	$(DEBUG_CFLAGS) \
-	-I$(top_srcdir)/libgaim
+	-I$(top_srcdir)/libpurple
 
 
 AM_CPPFLAGS = \
diff --git a/libgaim/protocols/sametime/Makefile.mingw b/libpurple/protocols/sametime/Makefile.mingw
index 7e9ff417b1..7e9ff417b1 100644
--- a/libgaim/protocols/sametime/Makefile.mingw
+++ b/libpurple/protocols/sametime/Makefile.mingw
diff --git a/libgaim/protocols/sametime/sametime.c b/libpurple/protocols/sametime/sametime.c
index aa16d0e833..aa16d0e833 100644
--- a/libgaim/protocols/sametime/sametime.c
+++ b/libpurple/protocols/sametime/sametime.c
diff --git a/libgaim/protocols/sametime/sametime.h b/libpurple/protocols/sametime/sametime.h
index 88863387a1..88863387a1 100644
--- a/libgaim/protocols/sametime/sametime.h
+++ b/libpurple/protocols/sametime/sametime.h
diff --git a/libgaim/protocols/silc/Makefile.am b/libpurple/protocols/silc/Makefile.am
index 8a4755123c..8a4755123c 100644
--- a/libgaim/protocols/silc/Makefile.am
+++ b/libpurple/protocols/silc/Makefile.am
diff --git a/libgaim/protocols/silc/Makefile.mingw b/libpurple/protocols/silc/Makefile.mingw
index 42fcc55025..42fcc55025 100644
--- a/libgaim/protocols/silc/Makefile.mingw
+++ b/libpurple/protocols/silc/Makefile.mingw
diff --git a/libgaim/protocols/silc/README b/libpurple/protocols/silc/README
index c29087c6ac..c29087c6ac 100644
--- a/libgaim/protocols/silc/README
+++ b/libpurple/protocols/silc/README
diff --git a/libgaim/protocols/silc/TODO b/libpurple/protocols/silc/TODO
index b4b6c9ac5c..b4b6c9ac5c 100644
--- a/libgaim/protocols/silc/TODO
+++ b/libpurple/protocols/silc/TODO
diff --git a/libgaim/protocols/silc/buddy.c b/libpurple/protocols/silc/buddy.c
index f9c208a6b1..f9c208a6b1 100644
--- a/libgaim/protocols/silc/buddy.c
+++ b/libpurple/protocols/silc/buddy.c
diff --git a/libgaim/protocols/silc/chat.c b/libpurple/protocols/silc/chat.c
index 6c555f30c9..6c555f30c9 100644
--- a/libgaim/protocols/silc/chat.c
+++ b/libpurple/protocols/silc/chat.c
diff --git a/libgaim/protocols/silc/ft.c b/libpurple/protocols/silc/ft.c
index 3a1c936025..3a1c936025 100644
--- a/libgaim/protocols/silc/ft.c
+++ b/libpurple/protocols/silc/ft.c
diff --git a/libgaim/protocols/silc/ops.c b/libpurple/protocols/silc/ops.c
index b7a8b5832a..b7a8b5832a 100644
--- a/libgaim/protocols/silc/ops.c
+++ b/libpurple/protocols/silc/ops.c
diff --git a/libgaim/protocols/silc/pk.c b/libpurple/protocols/silc/pk.c
index b628c82fe4..b628c82fe4 100644
--- a/libgaim/protocols/silc/pk.c
+++ b/libpurple/protocols/silc/pk.c
diff --git a/libgaim/protocols/silc/silc.c b/libpurple/protocols/silc/silc.c
index cb3f6c409e..cb3f6c409e 100644
--- a/libgaim/protocols/silc/silc.c
+++ b/libpurple/protocols/silc/silc.c
diff --git a/libgaim/protocols/silc/silcgaim.h b/libpurple/protocols/silc/silcgaim.h
index dc95699640..dc95699640 100644
--- a/libgaim/protocols/silc/silcgaim.h
+++ b/libpurple/protocols/silc/silcgaim.h
diff --git a/libgaim/protocols/silc/util.c b/libpurple/protocols/silc/util.c
index 82b2aa8fc1..82b2aa8fc1 100644
--- a/libgaim/protocols/silc/util.c
+++ b/libpurple/protocols/silc/util.c
diff --git a/libgaim/protocols/silc/wb.c b/libpurple/protocols/silc/wb.c
index bca52a11d5..bca52a11d5 100644
--- a/libgaim/protocols/silc/wb.c
+++ b/libpurple/protocols/silc/wb.c
diff --git a/libgaim/protocols/silc/wb.h b/libpurple/protocols/silc/wb.h
index 4cbf5e6405..4cbf5e6405 100644
--- a/libgaim/protocols/silc/wb.h
+++ b/libpurple/protocols/silc/wb.h
diff --git a/libgaim/protocols/simple/Makefile.am b/libpurple/protocols/simple/Makefile.am
index d945dc903c..61932cee67 100644
--- a/libgaim/protocols/simple/Makefile.am
+++ b/libpurple/protocols/simple/Makefile.am
@@ -30,6 +30,6 @@ libsimple_la_LIBADD  = $(GLIB_LIBS)
 endif
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/libgaim \
+	-I$(top_srcdir)/libpurple \
 	$(GLIB_CFLAGS) \
 	$(DEBUG_CFLAGS)
diff --git a/libgaim/protocols/simple/Makefile.mingw b/libpurple/protocols/simple/Makefile.mingw
index 50d0207946..50d0207946 100644
--- a/libgaim/protocols/simple/Makefile.mingw
+++ b/libpurple/protocols/simple/Makefile.mingw
diff --git a/libgaim/protocols/simple/simple.c b/libpurple/protocols/simple/simple.c
index 6634c58e84..6634c58e84 100644
--- a/libgaim/protocols/simple/simple.c
+++ b/libpurple/protocols/simple/simple.c
diff --git a/libgaim/protocols/simple/simple.h b/libpurple/protocols/simple/simple.h
index 2f3a945f33..2f3a945f33 100644
--- a/libgaim/protocols/simple/simple.h
+++ b/libpurple/protocols/simple/simple.h
diff --git a/libgaim/protocols/simple/sipmsg.c b/libpurple/protocols/simple/sipmsg.c
index eeddbe2e7e..eeddbe2e7e 100644
--- a/libgaim/protocols/simple/sipmsg.c
+++ b/libpurple/protocols/simple/sipmsg.c
diff --git a/libgaim/protocols/simple/sipmsg.h b/libpurple/protocols/simple/sipmsg.h
index 0a28dcbd8c..0a28dcbd8c 100644
--- a/libgaim/protocols/simple/sipmsg.h
+++ b/libpurple/protocols/simple/sipmsg.h
diff --git a/libgaim/protocols/toc/Makefile.am b/libpurple/protocols/toc/Makefile.am
index cafc43f818..8206664791 100644
--- a/libgaim/protocols/toc/Makefile.am
+++ b/libpurple/protocols/toc/Makefile.am
@@ -26,6 +26,6 @@ libtoc_la_SOURCES = $(TOCSOURCES)
 endif
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/libgaim \
+	-I$(top_srcdir)/libpurple \
 	$(GLIB_CFLAGS) \
 	$(DEBUG_CFLAGS)
diff --git a/libgaim/protocols/toc/Makefile.mingw b/libpurple/protocols/toc/Makefile.mingw
index 316a767f8f..316a767f8f 100644
--- a/libgaim/protocols/toc/Makefile.mingw
+++ b/libpurple/protocols/toc/Makefile.mingw
diff --git a/libgaim/protocols/toc/PROTOCOL b/libpurple/protocols/toc/PROTOCOL
index 31046027dc..31046027dc 100644
--- a/libgaim/protocols/toc/PROTOCOL
+++ b/libpurple/protocols/toc/PROTOCOL
diff --git a/libgaim/protocols/toc/toc.c b/libpurple/protocols/toc/toc.c
index d02c51746a..d02c51746a 100644
--- a/libgaim/protocols/toc/toc.c
+++ b/libpurple/protocols/toc/toc.c
diff --git a/libgaim/protocols/yahoo/.todo b/libpurple/protocols/yahoo/.todo
index 57fe898f74..57fe898f74 100644
--- a/libgaim/protocols/yahoo/.todo
+++ b/libpurple/protocols/yahoo/.todo
diff --git a/libgaim/protocols/yahoo/Makefile.am b/libpurple/protocols/yahoo/Makefile.am
index 1d3f60cfaa..36a4860ba3 100644
--- a/libgaim/protocols/yahoo/Makefile.am
+++ b/libpurple/protocols/yahoo/Makefile.am
@@ -48,6 +48,6 @@ libyahoo_la_LIBADD  = $(GLIB_LIBS)
 endif
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/libgaim \
+	-I$(top_srcdir)/libpurple \
 	$(GLIB_CFLAGS) \
 	$(DEBUG_CFLAGS)
diff --git a/libgaim/protocols/yahoo/Makefile.mingw b/libpurple/protocols/yahoo/Makefile.mingw
index 5db429ef06..5db429ef06 100644
--- a/libgaim/protocols/yahoo/Makefile.mingw
+++ b/libpurple/protocols/yahoo/Makefile.mingw
diff --git a/libgaim/protocols/yahoo/util.c b/libpurple/protocols/yahoo/util.c
index efb86c7978..efb86c7978 100644
--- a/libgaim/protocols/yahoo/util.c
+++ b/libpurple/protocols/yahoo/util.c
diff --git a/libgaim/protocols/yahoo/yahoo.c b/libpurple/protocols/yahoo/yahoo.c
index 39b34a8aaa..39b34a8aaa 100644
--- a/libgaim/protocols/yahoo/yahoo.c
+++ b/libpurple/protocols/yahoo/yahoo.c
diff --git a/libgaim/protocols/yahoo/yahoo.h b/libpurple/protocols/yahoo/yahoo.h
index c1b3c55d68..c1b3c55d68 100644
--- a/libgaim/protocols/yahoo/yahoo.h
+++ b/libpurple/protocols/yahoo/yahoo.h
diff --git a/libgaim/protocols/yahoo/yahoo_auth.c b/libpurple/protocols/yahoo/yahoo_auth.c
index 3e8ca716d6..3e8ca716d6 100755
--- a/libgaim/protocols/yahoo/yahoo_auth.c
+++ b/libpurple/protocols/yahoo/yahoo_auth.c
diff --git a/libgaim/protocols/yahoo/yahoo_auth.h b/libpurple/protocols/yahoo/yahoo_auth.h
index fd5a94c1eb..fd5a94c1eb 100755
--- a/libgaim/protocols/yahoo/yahoo_auth.h
+++ b/libpurple/protocols/yahoo/yahoo_auth.h
diff --git a/libgaim/protocols/yahoo/yahoo_crypt.c b/libpurple/protocols/yahoo/yahoo_crypt.c
index c971662457..c971662457 100644
--- a/libgaim/protocols/yahoo/yahoo_crypt.c
+++ b/libpurple/protocols/yahoo/yahoo_crypt.c
diff --git a/libgaim/protocols/yahoo/yahoo_crypt.h b/libpurple/protocols/yahoo/yahoo_crypt.h
index 489760434e..489760434e 100644
--- a/libgaim/protocols/yahoo/yahoo_crypt.h
+++ b/libpurple/protocols/yahoo/yahoo_crypt.h
diff --git a/libgaim/protocols/yahoo/yahoo_doodle.c b/libpurple/protocols/yahoo/yahoo_doodle.c
index aa2b2343e1..aa2b2343e1 100644
--- a/libgaim/protocols/yahoo/yahoo_doodle.c
+++ b/libpurple/protocols/yahoo/yahoo_doodle.c
diff --git a/libgaim/protocols/yahoo/yahoo_doodle.h b/libpurple/protocols/yahoo/yahoo_doodle.h
index 1b6dfe182f..1b6dfe182f 100644
--- a/libgaim/protocols/yahoo/yahoo_doodle.h
+++ b/libpurple/protocols/yahoo/yahoo_doodle.h
diff --git a/libgaim/protocols/yahoo/yahoo_filexfer.c b/libpurple/protocols/yahoo/yahoo_filexfer.c
index 37f3ce2432..37f3ce2432 100644
--- a/libgaim/protocols/yahoo/yahoo_filexfer.c
+++ b/libpurple/protocols/yahoo/yahoo_filexfer.c
diff --git a/libgaim/protocols/yahoo/yahoo_filexfer.h b/libpurple/protocols/yahoo/yahoo_filexfer.h
index 04068c7884..04068c7884 100644
--- a/libgaim/protocols/yahoo/yahoo_filexfer.h
+++ b/libpurple/protocols/yahoo/yahoo_filexfer.h
diff --git a/libgaim/protocols/yahoo/yahoo_friend.c b/libpurple/protocols/yahoo/yahoo_friend.c
index 4f672cdd07..4f672cdd07 100644
--- a/libgaim/protocols/yahoo/yahoo_friend.c
+++ b/libpurple/protocols/yahoo/yahoo_friend.c
diff --git a/libgaim/protocols/yahoo/yahoo_friend.h b/libpurple/protocols/yahoo/yahoo_friend.h
index 959f090585..959f090585 100644
--- a/libgaim/protocols/yahoo/yahoo_friend.h
+++ b/libpurple/protocols/yahoo/yahoo_friend.h
diff --git a/libgaim/protocols/yahoo/yahoo_packet.c b/libpurple/protocols/yahoo/yahoo_packet.c
index cedad47cec..cedad47cec 100644
--- a/libgaim/protocols/yahoo/yahoo_packet.c
+++ b/libpurple/protocols/yahoo/yahoo_packet.c
diff --git a/libgaim/protocols/yahoo/yahoo_packet.h b/libpurple/protocols/yahoo/yahoo_packet.h
index 8857c35d53..8857c35d53 100644
--- a/libgaim/protocols/yahoo/yahoo_packet.h
+++ b/libpurple/protocols/yahoo/yahoo_packet.h
diff --git a/libgaim/protocols/yahoo/yahoo_picture.c b/libpurple/protocols/yahoo/yahoo_picture.c
index 5ee05e048d..5ee05e048d 100644
--- a/libgaim/protocols/yahoo/yahoo_picture.c
+++ b/libpurple/protocols/yahoo/yahoo_picture.c
diff --git a/libgaim/protocols/yahoo/yahoo_picture.h b/libpurple/protocols/yahoo/yahoo_picture.h
index c40ba98df6..c40ba98df6 100644
--- a/libgaim/protocols/yahoo/yahoo_picture.h
+++ b/libpurple/protocols/yahoo/yahoo_picture.h
diff --git a/libgaim/protocols/yahoo/yahoo_profile.c b/libpurple/protocols/yahoo/yahoo_profile.c
index 6a3843ff1d..6a3843ff1d 100644
--- a/libgaim/protocols/yahoo/yahoo_profile.c
+++ b/libpurple/protocols/yahoo/yahoo_profile.c
diff --git a/libgaim/protocols/yahoo/yahoochat.c b/libpurple/protocols/yahoo/yahoochat.c
index 929045c526..929045c526 100644
--- a/libgaim/protocols/yahoo/yahoochat.c
+++ b/libpurple/protocols/yahoo/yahoochat.c
diff --git a/libgaim/protocols/yahoo/yahoochat.h b/libpurple/protocols/yahoo/yahoochat.h
index b13dc480fc..b13dc480fc 100644
--- a/libgaim/protocols/yahoo/yahoochat.h
+++ b/libpurple/protocols/yahoo/yahoochat.h
diff --git a/libgaim/protocols/yahoo/ycht.c b/libpurple/protocols/yahoo/ycht.c
index 45486479f3..45486479f3 100644
--- a/libgaim/protocols/yahoo/ycht.c
+++ b/libpurple/protocols/yahoo/ycht.c
diff --git a/libgaim/protocols/yahoo/ycht.h b/libpurple/protocols/yahoo/ycht.h
index 25a733818a..25a733818a 100644
--- a/libgaim/protocols/yahoo/ycht.h
+++ b/libpurple/protocols/yahoo/ycht.h
diff --git a/libgaim/protocols/zephyr/.todo b/libpurple/protocols/zephyr/.todo
index 79dec052d0..79dec052d0 100644
--- a/libgaim/protocols/zephyr/.todo
+++ b/libpurple/protocols/zephyr/.todo
diff --git a/libgaim/protocols/zephyr/Makefile.am b/libpurple/protocols/zephyr/Makefile.am
index 5479334318..deb7e195b4 100644
--- a/libgaim/protocols/zephyr/Makefile.am
+++ b/libpurple/protocols/zephyr/Makefile.am
@@ -101,8 +101,8 @@ endif
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir) \
-	-I$(top_srcdir)/libgaim \
-	-I$(top_srcdir)/libgaim/protocols \
+	-I$(top_srcdir)/libpurple \
+	-I$(top_srcdir)/libpurple/protocols \
 	-DCONFDIR=\"$(confdir)\" \
 	$(GLIB_CFLAGS) \
 	$(KRB4_CFLAGS) \
diff --git a/libgaim/protocols/zephyr/Makefile.mingw b/libpurple/protocols/zephyr/Makefile.mingw
index 95e0b634ed..95e0b634ed 100644
--- a/libgaim/protocols/zephyr/Makefile.mingw
+++ b/libpurple/protocols/zephyr/Makefile.mingw
diff --git a/libgaim/protocols/zephyr/ZAsyncLocate.c b/libpurple/protocols/zephyr/ZAsyncLocate.c
index 4177cf224d..4177cf224d 100644
--- a/libgaim/protocols/zephyr/ZAsyncLocate.c
+++ b/libpurple/protocols/zephyr/ZAsyncLocate.c
diff --git a/libgaim/protocols/zephyr/ZCkAuth.c b/libpurple/protocols/zephyr/ZCkAuth.c
index b87332b624..b87332b624 100644
--- a/libgaim/protocols/zephyr/ZCkAuth.c
+++ b/libpurple/protocols/zephyr/ZCkAuth.c
diff --git a/libgaim/protocols/zephyr/ZCkIfNot.c b/libpurple/protocols/zephyr/ZCkIfNot.c
index 9f5a42071b..9f5a42071b 100644
--- a/libgaim/protocols/zephyr/ZCkIfNot.c
+++ b/libpurple/protocols/zephyr/ZCkIfNot.c
diff --git a/libgaim/protocols/zephyr/ZClosePort.c b/libpurple/protocols/zephyr/ZClosePort.c
index 07b33b4def..07b33b4def 100644
--- a/libgaim/protocols/zephyr/ZClosePort.c
+++ b/libpurple/protocols/zephyr/ZClosePort.c
diff --git a/libgaim/protocols/zephyr/ZCmpUID.c b/libpurple/protocols/zephyr/ZCmpUID.c
index b647d16433..b647d16433 100644
--- a/libgaim/protocols/zephyr/ZCmpUID.c
+++ b/libpurple/protocols/zephyr/ZCmpUID.c
diff --git a/libgaim/protocols/zephyr/ZCmpUIDP.c b/libpurple/protocols/zephyr/ZCmpUIDP.c
index 05140899a5..05140899a5 100644
--- a/libgaim/protocols/zephyr/ZCmpUIDP.c
+++ b/libpurple/protocols/zephyr/ZCmpUIDP.c
diff --git a/libgaim/protocols/zephyr/ZFlsLocs.c b/libpurple/protocols/zephyr/ZFlsLocs.c
index 8d00fde7da..8d00fde7da 100644
--- a/libgaim/protocols/zephyr/ZFlsLocs.c
+++ b/libpurple/protocols/zephyr/ZFlsLocs.c
diff --git a/libgaim/protocols/zephyr/ZFlsSubs.c b/libpurple/protocols/zephyr/ZFlsSubs.c
index c5c9829535..c5c9829535 100644
--- a/libgaim/protocols/zephyr/ZFlsSubs.c
+++ b/libpurple/protocols/zephyr/ZFlsSubs.c
diff --git a/libgaim/protocols/zephyr/ZFmtAuth.c b/libpurple/protocols/zephyr/ZFmtAuth.c
index 910200334a..910200334a 100644
--- a/libgaim/protocols/zephyr/ZFmtAuth.c
+++ b/libpurple/protocols/zephyr/ZFmtAuth.c
diff --git a/libgaim/protocols/zephyr/ZFmtList.c b/libpurple/protocols/zephyr/ZFmtList.c
index db40d505be..db40d505be 100644
--- a/libgaim/protocols/zephyr/ZFmtList.c
+++ b/libpurple/protocols/zephyr/ZFmtList.c
diff --git a/libgaim/protocols/zephyr/ZFmtNotice.c b/libpurple/protocols/zephyr/ZFmtNotice.c
index b47ea81613..b47ea81613 100644
--- a/libgaim/protocols/zephyr/ZFmtNotice.c
+++ b/libpurple/protocols/zephyr/ZFmtNotice.c
diff --git a/libgaim/protocols/zephyr/ZFmtRaw.c b/libpurple/protocols/zephyr/ZFmtRaw.c
index 3b28f51b6b..3b28f51b6b 100644
--- a/libgaim/protocols/zephyr/ZFmtRaw.c
+++ b/libpurple/protocols/zephyr/ZFmtRaw.c
diff --git a/libgaim/protocols/zephyr/ZFmtRawLst.c b/libpurple/protocols/zephyr/ZFmtRawLst.c
index 809bbba506..809bbba506 100644
--- a/libgaim/protocols/zephyr/ZFmtRawLst.c
+++ b/libpurple/protocols/zephyr/ZFmtRawLst.c
diff --git a/libgaim/protocols/zephyr/ZFmtSmRLst.c b/libpurple/protocols/zephyr/ZFmtSmRLst.c
index fed1981fb8..fed1981fb8 100644
--- a/libgaim/protocols/zephyr/ZFmtSmRLst.c
+++ b/libpurple/protocols/zephyr/ZFmtSmRLst.c
diff --git a/libgaim/protocols/zephyr/ZFmtSmRaw.c b/libpurple/protocols/zephyr/ZFmtSmRaw.c
index 26e01d27c4..26e01d27c4 100644
--- a/libgaim/protocols/zephyr/ZFmtSmRaw.c
+++ b/libpurple/protocols/zephyr/ZFmtSmRaw.c
diff --git a/libgaim/protocols/zephyr/ZFreeNot.c b/libpurple/protocols/zephyr/ZFreeNot.c
index b5655625a2..b5655625a2 100644
--- a/libgaim/protocols/zephyr/ZFreeNot.c
+++ b/libpurple/protocols/zephyr/ZFreeNot.c
diff --git a/libgaim/protocols/zephyr/ZGetLocs.c b/libpurple/protocols/zephyr/ZGetLocs.c
index 41b3cf5003..41b3cf5003 100644
--- a/libgaim/protocols/zephyr/ZGetLocs.c
+++ b/libpurple/protocols/zephyr/ZGetLocs.c
diff --git a/libgaim/protocols/zephyr/ZGetSender.c b/libpurple/protocols/zephyr/ZGetSender.c
index f9739d559e..f9739d559e 100644
--- a/libgaim/protocols/zephyr/ZGetSender.c
+++ b/libpurple/protocols/zephyr/ZGetSender.c
diff --git a/libgaim/protocols/zephyr/ZGetSubs.c b/libpurple/protocols/zephyr/ZGetSubs.c
index 4d1a6569be..4d1a6569be 100644
--- a/libgaim/protocols/zephyr/ZGetSubs.c
+++ b/libpurple/protocols/zephyr/ZGetSubs.c
diff --git a/libgaim/protocols/zephyr/ZGetWGPort.c b/libpurple/protocols/zephyr/ZGetWGPort.c
index d1a7a98f3e..d1a7a98f3e 100644
--- a/libgaim/protocols/zephyr/ZGetWGPort.c
+++ b/libpurple/protocols/zephyr/ZGetWGPort.c
diff --git a/libgaim/protocols/zephyr/ZIfNotice.c b/libpurple/protocols/zephyr/ZIfNotice.c
index 05d06785ee..05d06785ee 100644
--- a/libgaim/protocols/zephyr/ZIfNotice.c
+++ b/libpurple/protocols/zephyr/ZIfNotice.c
diff --git a/libgaim/protocols/zephyr/ZInit.c b/libpurple/protocols/zephyr/ZInit.c
index e0fdcefa5c..e0fdcefa5c 100644
--- a/libgaim/protocols/zephyr/ZInit.c
+++ b/libpurple/protocols/zephyr/ZInit.c
diff --git a/libgaim/protocols/zephyr/ZLocations.c b/libpurple/protocols/zephyr/ZLocations.c
index 06043b6f96..06043b6f96 100644
--- a/libgaim/protocols/zephyr/ZLocations.c
+++ b/libpurple/protocols/zephyr/ZLocations.c
diff --git a/libgaim/protocols/zephyr/ZMakeAscii.c b/libpurple/protocols/zephyr/ZMakeAscii.c
index 784c7f228e..784c7f228e 100644
--- a/libgaim/protocols/zephyr/ZMakeAscii.c
+++ b/libpurple/protocols/zephyr/ZMakeAscii.c
diff --git a/libgaim/protocols/zephyr/ZMkAuth.c b/libpurple/protocols/zephyr/ZMkAuth.c
index b06536e9cc..b06536e9cc 100644
--- a/libgaim/protocols/zephyr/ZMkAuth.c
+++ b/libpurple/protocols/zephyr/ZMkAuth.c
diff --git a/libgaim/protocols/zephyr/ZNewLocU.c b/libpurple/protocols/zephyr/ZNewLocU.c
index 10d33e5ac1..10d33e5ac1 100644
--- a/libgaim/protocols/zephyr/ZNewLocU.c
+++ b/libpurple/protocols/zephyr/ZNewLocU.c
diff --git a/libgaim/protocols/zephyr/ZOpenPort.c b/libpurple/protocols/zephyr/ZOpenPort.c
index 936b255edf..936b255edf 100644
--- a/libgaim/protocols/zephyr/ZOpenPort.c
+++ b/libpurple/protocols/zephyr/ZOpenPort.c
diff --git a/libgaim/protocols/zephyr/ZParseNot.c b/libpurple/protocols/zephyr/ZParseNot.c
index a03b3ecb81..a03b3ecb81 100644
--- a/libgaim/protocols/zephyr/ZParseNot.c
+++ b/libpurple/protocols/zephyr/ZParseNot.c
diff --git a/libgaim/protocols/zephyr/ZPeekIfNot.c b/libpurple/protocols/zephyr/ZPeekIfNot.c
index 6fbd43bbf4..6fbd43bbf4 100644
--- a/libgaim/protocols/zephyr/ZPeekIfNot.c
+++ b/libpurple/protocols/zephyr/ZPeekIfNot.c
diff --git a/libgaim/protocols/zephyr/ZPeekNot.c b/libpurple/protocols/zephyr/ZPeekNot.c
index ea5373bfb9..ea5373bfb9 100644
--- a/libgaim/protocols/zephyr/ZPeekNot.c
+++ b/libpurple/protocols/zephyr/ZPeekNot.c
diff --git a/libgaim/protocols/zephyr/ZPeekPkt.c b/libpurple/protocols/zephyr/ZPeekPkt.c
index 9e7037fc5d..9e7037fc5d 100644
--- a/libgaim/protocols/zephyr/ZPeekPkt.c
+++ b/libpurple/protocols/zephyr/ZPeekPkt.c
diff --git a/libgaim/protocols/zephyr/ZPending.c b/libpurple/protocols/zephyr/ZPending.c
index 25f93f212a..25f93f212a 100644
--- a/libgaim/protocols/zephyr/ZPending.c
+++ b/libpurple/protocols/zephyr/ZPending.c
diff --git a/libgaim/protocols/zephyr/ZReadAscii.c b/libpurple/protocols/zephyr/ZReadAscii.c
index b079090ea5..b079090ea5 100644
--- a/libgaim/protocols/zephyr/ZReadAscii.c
+++ b/libpurple/protocols/zephyr/ZReadAscii.c
diff --git a/libgaim/protocols/zephyr/ZRecvNot.c b/libpurple/protocols/zephyr/ZRecvNot.c
index 11141f642d..11141f642d 100644
--- a/libgaim/protocols/zephyr/ZRecvNot.c
+++ b/libpurple/protocols/zephyr/ZRecvNot.c
diff --git a/libgaim/protocols/zephyr/ZRecvPkt.c b/libpurple/protocols/zephyr/ZRecvPkt.c
index 37c9b9afa1..37c9b9afa1 100644
--- a/libgaim/protocols/zephyr/ZRecvPkt.c
+++ b/libpurple/protocols/zephyr/ZRecvPkt.c
diff --git a/libgaim/protocols/zephyr/ZRetSubs.c b/libpurple/protocols/zephyr/ZRetSubs.c
index 287b5f0639..287b5f0639 100644
--- a/libgaim/protocols/zephyr/ZRetSubs.c
+++ b/libpurple/protocols/zephyr/ZRetSubs.c
diff --git a/libgaim/protocols/zephyr/ZSendList.c b/libpurple/protocols/zephyr/ZSendList.c
index 50bc46dc39..50bc46dc39 100644
--- a/libgaim/protocols/zephyr/ZSendList.c
+++ b/libpurple/protocols/zephyr/ZSendList.c
diff --git a/libgaim/protocols/zephyr/ZSendNot.c b/libpurple/protocols/zephyr/ZSendNot.c
index 52e8e3b900..52e8e3b900 100644
--- a/libgaim/protocols/zephyr/ZSendNot.c
+++ b/libpurple/protocols/zephyr/ZSendNot.c
diff --git a/libgaim/protocols/zephyr/ZSendPkt.c b/libpurple/protocols/zephyr/ZSendPkt.c
index e4d19a37d4..e4d19a37d4 100644
--- a/libgaim/protocols/zephyr/ZSendPkt.c
+++ b/libpurple/protocols/zephyr/ZSendPkt.c
diff --git a/libgaim/protocols/zephyr/ZSendRLst.c b/libpurple/protocols/zephyr/ZSendRLst.c
index 999147ccae..999147ccae 100644
--- a/libgaim/protocols/zephyr/ZSendRLst.c
+++ b/libpurple/protocols/zephyr/ZSendRLst.c
diff --git a/libgaim/protocols/zephyr/ZSendRaw.c b/libpurple/protocols/zephyr/ZSendRaw.c
index 635615a5d6..635615a5d6 100644
--- a/libgaim/protocols/zephyr/ZSendRaw.c
+++ b/libpurple/protocols/zephyr/ZSendRaw.c
diff --git a/libgaim/protocols/zephyr/ZSetDest.c b/libpurple/protocols/zephyr/ZSetDest.c
index 0bcf6061f8..0bcf6061f8 100644
--- a/libgaim/protocols/zephyr/ZSetDest.c
+++ b/libpurple/protocols/zephyr/ZSetDest.c
diff --git a/libgaim/protocols/zephyr/ZSetFD.c b/libpurple/protocols/zephyr/ZSetFD.c
index 0858b63c07..0858b63c07 100644
--- a/libgaim/protocols/zephyr/ZSetFD.c
+++ b/libpurple/protocols/zephyr/ZSetFD.c
diff --git a/libgaim/protocols/zephyr/ZSetSrv.c b/libpurple/protocols/zephyr/ZSetSrv.c
index 25b43622df..25b43622df 100644
--- a/libgaim/protocols/zephyr/ZSetSrv.c
+++ b/libpurple/protocols/zephyr/ZSetSrv.c
diff --git a/libgaim/protocols/zephyr/ZSubs.c b/libpurple/protocols/zephyr/ZSubs.c
index 559b335ac3..559b335ac3 100644
--- a/libgaim/protocols/zephyr/ZSubs.c
+++ b/libpurple/protocols/zephyr/ZSubs.c
diff --git a/libgaim/protocols/zephyr/ZVariables.c b/libpurple/protocols/zephyr/ZVariables.c
index eafa90ec8f..eafa90ec8f 100644
--- a/libgaim/protocols/zephyr/ZVariables.c
+++ b/libpurple/protocols/zephyr/ZVariables.c
diff --git a/libgaim/protocols/zephyr/ZWait4Not.c b/libpurple/protocols/zephyr/ZWait4Not.c
index 94a5c127a3..94a5c127a3 100644
--- a/libgaim/protocols/zephyr/ZWait4Not.c
+++ b/libpurple/protocols/zephyr/ZWait4Not.c
diff --git a/libgaim/protocols/zephyr/ZhmStat.c b/libpurple/protocols/zephyr/ZhmStat.c
index f92d28099d..f92d28099d 100644
--- a/libgaim/protocols/zephyr/ZhmStat.c
+++ b/libpurple/protocols/zephyr/ZhmStat.c
diff --git a/libgaim/protocols/zephyr/Zinternal.c b/libpurple/protocols/zephyr/Zinternal.c
index ff363958d9..ff363958d9 100644
--- a/libgaim/protocols/zephyr/Zinternal.c
+++ b/libpurple/protocols/zephyr/Zinternal.c
diff --git a/libgaim/protocols/zephyr/com_err.h b/libpurple/protocols/zephyr/com_err.h
index 33c2681b44..33c2681b44 100644
--- a/libgaim/protocols/zephyr/com_err.h
+++ b/libpurple/protocols/zephyr/com_err.h
diff --git a/libgaim/protocols/zephyr/error_message.c b/libpurple/protocols/zephyr/error_message.c
index af7fe2176a..af7fe2176a 100644
--- a/libgaim/protocols/zephyr/error_message.c
+++ b/libpurple/protocols/zephyr/error_message.c
diff --git a/libgaim/protocols/zephyr/error_table.h b/libpurple/protocols/zephyr/error_table.h
index 1bb5720263..1bb5720263 100644
--- a/libgaim/protocols/zephyr/error_table.h
+++ b/libpurple/protocols/zephyr/error_table.h
diff --git a/libgaim/protocols/zephyr/et_name.c b/libpurple/protocols/zephyr/et_name.c
index 52d503a921..52d503a921 100644
--- a/libgaim/protocols/zephyr/et_name.c
+++ b/libpurple/protocols/zephyr/et_name.c
diff --git a/libgaim/protocols/zephyr/init_et.c b/libpurple/protocols/zephyr/init_et.c
index fad0fe2818..fad0fe2818 100644
--- a/libgaim/protocols/zephyr/init_et.c
+++ b/libpurple/protocols/zephyr/init_et.c
diff --git a/libgaim/protocols/zephyr/internal.h b/libpurple/protocols/zephyr/internal.h
index 3c952d97cc..3c952d97cc 100644
--- a/libgaim/protocols/zephyr/internal.h
+++ b/libpurple/protocols/zephyr/internal.h
diff --git a/libgaim/protocols/zephyr/mit-copyright.h b/libpurple/protocols/zephyr/mit-copyright.h
index 73059b35e2..73059b35e2 100644
--- a/libgaim/protocols/zephyr/mit-copyright.h
+++ b/libpurple/protocols/zephyr/mit-copyright.h
diff --git a/libgaim/protocols/zephyr/mit-sipb-copyright.h b/libpurple/protocols/zephyr/mit-sipb-copyright.h
index e0d1572248..e0d1572248 100644
--- a/libgaim/protocols/zephyr/mit-sipb-copyright.h
+++ b/libpurple/protocols/zephyr/mit-sipb-copyright.h
diff --git a/libgaim/protocols/zephyr/sysdep.h b/libpurple/protocols/zephyr/sysdep.h
index f96a705491..f96a705491 100644
--- a/libgaim/protocols/zephyr/sysdep.h
+++ b/libpurple/protocols/zephyr/sysdep.h
diff --git a/libgaim/protocols/zephyr/zephyr.c b/libpurple/protocols/zephyr/zephyr.c
index cdc16d2eb5..19cd6fda70 100644
--- a/libgaim/protocols/zephyr/zephyr.c
+++ b/libpurple/protocols/zephyr/zephyr.c
@@ -26,8 +26,7 @@
  *
 
 */
-/* XXX eww */
-#include "libgaim/internal.h"
+#include "libpurple/internal.h"
 
 #include "accountopt.h"
 #include "debug.h"
diff --git a/libgaim/protocols/zephyr/zephyr.h b/libpurple/protocols/zephyr/zephyr.h
index 3a1886f6a6..3a1886f6a6 100644
--- a/libgaim/protocols/zephyr/zephyr.h
+++ b/libpurple/protocols/zephyr/zephyr.h
diff --git a/libgaim/protocols/zephyr/zephyr_err.c b/libpurple/protocols/zephyr/zephyr_err.c
index 529e7b57b1..529e7b57b1 100644
--- a/libgaim/protocols/zephyr/zephyr_err.c
+++ b/libpurple/protocols/zephyr/zephyr_err.c
diff --git a/libgaim/protocols/zephyr/zephyr_err.h b/libpurple/protocols/zephyr/zephyr_err.h
index 8ed6c31565..8ed6c31565 100644
--- a/libgaim/protocols/zephyr/zephyr_err.h
+++ b/libpurple/protocols/zephyr/zephyr_err.h
diff --git a/libgaim/proxy.c b/libpurple/proxy.c
index 7d67cbe3dd..7d67cbe3dd 100644
--- a/libgaim/proxy.c
+++ b/libpurple/proxy.c
diff --git a/libgaim/proxy.h b/libpurple/proxy.h
index 57493a2492..57493a2492 100644
--- a/libgaim/proxy.h
+++ b/libpurple/proxy.h
diff --git a/libgaim/prpl.c b/libpurple/prpl.c
index 361fd7b15d..361fd7b15d 100644
--- a/libgaim/prpl.c
+++ b/libpurple/prpl.c
diff --git a/libgaim/prpl.h b/libpurple/prpl.h
index bb30c494c6..bb30c494c6 100644
--- a/libgaim/prpl.h
+++ b/libpurple/prpl.h
diff --git a/libgaim/request.c b/libpurple/request.c
index 46c026dba2..46c026dba2 100644
--- a/libgaim/request.c
+++ b/libpurple/request.c
diff --git a/libgaim/request.h b/libpurple/request.h
index 19e95185d4..19e95185d4 100644
--- a/libgaim/request.h
+++ b/libpurple/request.h
diff --git a/libgaim/roomlist.c b/libpurple/roomlist.c
index 63f090111d..63f090111d 100644
--- a/libgaim/roomlist.c
+++ b/libpurple/roomlist.c
diff --git a/libgaim/roomlist.h b/libpurple/roomlist.h
index 89966251c1..89966251c1 100644
--- a/libgaim/roomlist.h
+++ b/libpurple/roomlist.h
diff --git a/libgaim/savedstatuses.c b/libpurple/savedstatuses.c
index 1c12a5038d..1c12a5038d 100644
--- a/libgaim/savedstatuses.c
+++ b/libpurple/savedstatuses.c
diff --git a/libgaim/savedstatuses.h b/libpurple/savedstatuses.h
index 52df626d8f..52df626d8f 100644
--- a/libgaim/savedstatuses.h
+++ b/libpurple/savedstatuses.h
diff --git a/libgaim/server.c b/libpurple/server.c
index 6950651273..6950651273 100644
--- a/libgaim/server.c
+++ b/libpurple/server.c
diff --git a/libgaim/server.h b/libpurple/server.h
index 96810173f6..96810173f6 100644
--- a/libgaim/server.h
+++ b/libpurple/server.h
diff --git a/libgaim/signals.c b/libpurple/signals.c
index 97023f709c..97023f709c 100644
--- a/libgaim/signals.c
+++ b/libpurple/signals.c
diff --git a/libgaim/signals.h b/libpurple/signals.h
index d26081c406..d26081c406 100644
--- a/libgaim/signals.h
+++ b/libpurple/signals.h
diff --git a/libgaim/sound.c b/libpurple/sound.c
index f9cc26bfdf..f9cc26bfdf 100644
--- a/libgaim/sound.c
+++ b/libpurple/sound.c
diff --git a/libgaim/sound.h b/libpurple/sound.h
index 7ef9ddc769..7ef9ddc769 100644
--- a/libgaim/sound.h
+++ b/libpurple/sound.h
diff --git a/libgaim/sslconn.c b/libpurple/sslconn.c
index 58fc7e8ff1..58fc7e8ff1 100644
--- a/libgaim/sslconn.c
+++ b/libpurple/sslconn.c
diff --git a/libgaim/sslconn.h b/libpurple/sslconn.h
index 7875a69db8..7875a69db8 100644
--- a/libgaim/sslconn.h
+++ b/libpurple/sslconn.h
diff --git a/libgaim/status.c b/libpurple/status.c
index 43ef29236c..43ef29236c 100644
--- a/libgaim/status.c
+++ b/libpurple/status.c
diff --git a/libgaim/status.h b/libpurple/status.h
index a5439fcc51..a5439fcc51 100644
--- a/libgaim/status.h
+++ b/libpurple/status.h
diff --git a/libgaim/stringref.c b/libpurple/stringref.c
index 9a1c408cac..9a1c408cac 100644
--- a/libgaim/stringref.c
+++ b/libpurple/stringref.c
diff --git a/libgaim/stringref.h b/libpurple/stringref.h
index 596bb994f8..596bb994f8 100644
--- a/libgaim/stringref.h
+++ b/libpurple/stringref.h
diff --git a/libgaim/stun.c b/libpurple/stun.c
index 0730f73fd6..0730f73fd6 100644
--- a/libgaim/stun.c
+++ b/libpurple/stun.c
diff --git a/libgaim/stun.h b/libpurple/stun.h
index c426588c09..c426588c09 100644
--- a/libgaim/stun.h
+++ b/libpurple/stun.h
diff --git a/libgaim/tests/Makefile.am b/libpurple/tests/Makefile.am
index 306c8902ca..306c8902ca 100644
--- a/libgaim/tests/Makefile.am
+++ b/libpurple/tests/Makefile.am
diff --git a/libgaim/tests/check_libgaim.c b/libpurple/tests/check_libgaim.c
index a489d965be..a489d965be 100644
--- a/libgaim/tests/check_libgaim.c
+++ b/libpurple/tests/check_libgaim.c
diff --git a/libgaim/tests/test_cipher.c b/libpurple/tests/test_cipher.c
index b26680bbea..b26680bbea 100644
--- a/libgaim/tests/test_cipher.c
+++ b/libpurple/tests/test_cipher.c
diff --git a/libgaim/tests/test_jabber_jutil.c b/libpurple/tests/test_jabber_jutil.c
index e10dfc04eb..e10dfc04eb 100644
--- a/libgaim/tests/test_jabber_jutil.c
+++ b/libpurple/tests/test_jabber_jutil.c
diff --git a/libgaim/tests/test_util.c b/libpurple/tests/test_util.c
index e10206c4bf..e10206c4bf 100644
--- a/libgaim/tests/test_util.c
+++ b/libpurple/tests/test_util.c
diff --git a/libgaim/tests/tests.h b/libpurple/tests/tests.h
index 5e36d7eb83..5e36d7eb83 100644
--- a/libgaim/tests/tests.h
+++ b/libpurple/tests/tests.h
diff --git a/libgaim/upnp.c b/libpurple/upnp.c
index 99125e5571..99125e5571 100644
--- a/libgaim/upnp.c
+++ b/libpurple/upnp.c
diff --git a/libgaim/upnp.h b/libpurple/upnp.h
index c25dabc254..c25dabc254 100644
--- a/libgaim/upnp.h
+++ b/libpurple/upnp.h
diff --git a/libgaim/util.c b/libpurple/util.c
index 470861d563..470861d563 100644
--- a/libgaim/util.c
+++ b/libpurple/util.c
diff --git a/libgaim/util.h b/libpurple/util.h
index b8e2c22b48..b8e2c22b48 100644
--- a/libgaim/util.h
+++ b/libpurple/util.h
diff --git a/libgaim/value.c b/libpurple/value.c
index cfcb69220f..cfcb69220f 100644
--- a/libgaim/value.c
+++ b/libpurple/value.c
diff --git a/libgaim/value.h b/libpurple/value.h
index 1f90b1c4fd..1f90b1c4fd 100644
--- a/libgaim/value.h
+++ b/libpurple/value.h
diff --git a/libgaim/version.h b/libpurple/version.h
index d7cd042ea0..d7cd042ea0 100644
--- a/libgaim/version.h
+++ b/libpurple/version.h
diff --git a/libgaim/whiteboard.c b/libpurple/whiteboard.c
index f910084298..f910084298 100644
--- a/libgaim/whiteboard.c
+++ b/libpurple/whiteboard.c
diff --git a/libgaim/whiteboard.h b/libpurple/whiteboard.h
index dc150c547a..dc150c547a 100644
--- a/libgaim/whiteboard.h
+++ b/libpurple/whiteboard.h
diff --git a/libgaim/win32/giowin32.c b/libpurple/win32/giowin32.c
index e94cb4e751..e94cb4e751 100644
--- a/libgaim/win32/giowin32.c
+++ b/libpurple/win32/giowin32.c
diff --git a/libgaim/win32/global.mak b/libpurple/win32/global.mak
index 181932f903..181932f903 100644
--- a/libgaim/win32/global.mak
+++ b/libpurple/win32/global.mak
diff --git a/libgaim/win32/libc_interface.c b/libpurple/win32/libc_interface.c
index 9e02e2059c..9e02e2059c 100644
--- a/libgaim/win32/libc_interface.c
+++ b/libpurple/win32/libc_interface.c
diff --git a/libgaim/win32/libc_interface.h b/libpurple/win32/libc_interface.h
index 798f134e2e..798f134e2e 100644
--- a/libgaim/win32/libc_interface.h
+++ b/libpurple/win32/libc_interface.h
diff --git a/libgaim/win32/libc_internal.h b/libpurple/win32/libc_internal.h
index 4239798cca..4239798cca 100644
--- a/libgaim/win32/libc_internal.h
+++ b/libpurple/win32/libc_internal.h
diff --git a/libgaim/win32/libgaimrc.rc.in b/libpurple/win32/libgaimrc.rc.in
index b3efb16fd5..b3efb16fd5 100644
--- a/libgaim/win32/libgaimrc.rc.in
+++ b/libpurple/win32/libgaimrc.rc.in
diff --git a/libgaim/win32/rules.mak b/libpurple/win32/rules.mak
index 282ae4b7e1..282ae4b7e1 100644
--- a/libgaim/win32/rules.mak
+++ b/libpurple/win32/rules.mak
diff --git a/libgaim/win32/targets.mak b/libpurple/win32/targets.mak
index 069ce468ba..069ce468ba 100644
--- a/libgaim/win32/targets.mak
+++ b/libpurple/win32/targets.mak
diff --git a/libgaim/win32/wgaimerror.h b/libpurple/win32/wgaimerror.h
index adce3a2203..adce3a2203 100644
--- a/libgaim/win32/wgaimerror.h
+++ b/libpurple/win32/wgaimerror.h
diff --git a/libgaim/win32/win32dep.c b/libpurple/win32/win32dep.c
index 391035bf72..391035bf72 100644
--- a/libgaim/win32/win32dep.c
+++ b/libpurple/win32/win32dep.c
diff --git a/libgaim/win32/win32dep.h b/libpurple/win32/win32dep.h
index 99661aa216..99661aa216 100644
--- a/libgaim/win32/win32dep.h
+++ b/libpurple/win32/win32dep.h
diff --git a/libgaim/xmlnode.c b/libpurple/xmlnode.c
index 0e30593939..0e30593939 100644
--- a/libgaim/xmlnode.c
+++ b/libpurple/xmlnode.c
diff --git a/libgaim/xmlnode.h b/libpurple/xmlnode.h
index 607585fa56..607585fa56 100644
--- a/libgaim/xmlnode.h
+++ b/libpurple/xmlnode.h
diff --git a/gtk/Makefile.am b/pidgin/Makefile.am
index 86e3682122..d2781b5632 100644
--- a/gtk/Makefile.am
+++ b/pidgin/Makefile.am
@@ -172,7 +172,7 @@ gaim_LDADD = \
 	$(STARTUP_NOTIFICATION_LIBS) \
 	$(LIBXML_LIBS) \
 	$(GTK_LIBS) \
-	$(top_builddir)/libgaim/libgaim.la
+	$(top_builddir)/libpurple/libgaim.la
 
 if USE_INTERNAL_LIBGADU
 INTGG_CFLAGS = -DUSE_INTERNAL_LIBGADU
@@ -184,7 +184,7 @@ AM_CPPFLAGS = \
 	-DLIBDIR=\"$(libdir)/gaim/\" \
 	-DLOCALEDIR=\"$(datadir)/locale\" \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-I$(top_srcdir)/libgaim/ \
+	-I$(top_srcdir)/libpurple/ \
 	$(GLIB_CFLAGS) \
 	$(GSTREAMER_CFLAGS) \
 	$(DEBUG_CFLAGS) \
diff --git a/gtk/Makefile.mingw b/pidgin/Makefile.mingw
index b53535486c..b53535486c 100644
--- a/gtk/Makefile.mingw
+++ b/pidgin/Makefile.mingw
diff --git a/gtk/eggtrayicon.c b/pidgin/eggtrayicon.c
index 6bf20cc8d5..6bf20cc8d5 100644
--- a/gtk/eggtrayicon.c
+++ b/pidgin/eggtrayicon.c
diff --git a/gtk/eggtrayicon.h b/pidgin/eggtrayicon.h
index 7a140f6b27..7a140f6b27 100644
--- a/gtk/eggtrayicon.h
+++ b/pidgin/eggtrayicon.h
diff --git a/gtk/gaimcombobox.c b/pidgin/gaimcombobox.c
index 21e4ea01cb..21e4ea01cb 100644
--- a/gtk/gaimcombobox.c
+++ b/pidgin/gaimcombobox.c
diff --git a/gtk/gaimcombobox.h b/pidgin/gaimcombobox.h
index 1b61352fb4..1b61352fb4 100644
--- a/gtk/gaimcombobox.h
+++ b/pidgin/gaimcombobox.h
diff --git a/gtk/gaimstock.c b/pidgin/gaimstock.c
index 683ac34628..683ac34628 100644
--- a/gtk/gaimstock.c
+++ b/pidgin/gaimstock.c
diff --git a/gtk/gaimstock.h b/pidgin/gaimstock.h
index d4f2de6307..d4f2de6307 100644
--- a/gtk/gaimstock.h
+++ b/pidgin/gaimstock.h
diff --git a/gtk/getopt.c b/pidgin/getopt.c
index 39214e7bd8..39214e7bd8 100644
--- a/gtk/getopt.c
+++ b/pidgin/getopt.c
diff --git a/gtk/getopt.h b/pidgin/getopt.h
index 63b159e74c..63b159e74c 100644
--- a/gtk/getopt.h
+++ b/pidgin/getopt.h
diff --git a/gtk/getopt1.c b/pidgin/getopt1.c
index 08e76371b2..08e76371b2 100644
--- a/gtk/getopt1.c
+++ b/pidgin/getopt1.c
diff --git a/gtk/gtkaccount.c b/pidgin/gtkaccount.c
index 473eae0941..473eae0941 100644
--- a/gtk/gtkaccount.c
+++ b/pidgin/gtkaccount.c
diff --git a/gtk/gtkaccount.h b/pidgin/gtkaccount.h
index 0fd2caa1cf..0fd2caa1cf 100644
--- a/gtk/gtkaccount.h
+++ b/pidgin/gtkaccount.h
diff --git a/gtk/gtkblist.c b/pidgin/gtkblist.c
index 3b5830c856..3b5830c856 100644
--- a/gtk/gtkblist.c
+++ b/pidgin/gtkblist.c
diff --git a/gtk/gtkblist.h b/pidgin/gtkblist.h
index 17e5490e5b..17e5490e5b 100644
--- a/gtk/gtkblist.h
+++ b/pidgin/gtkblist.h
diff --git a/gtk/gtkcelllayout.c b/pidgin/gtkcelllayout.c
index 99942c3831..99942c3831 100644
--- a/gtk/gtkcelllayout.c
+++ b/pidgin/gtkcelllayout.c
diff --git a/gtk/gtkcelllayout.h b/pidgin/gtkcelllayout.h
index 2458df3a76..2458df3a76 100644
--- a/gtk/gtkcelllayout.h
+++ b/pidgin/gtkcelllayout.h
diff --git a/gtk/gtkcellrendererexpander.c b/pidgin/gtkcellrendererexpander.c
index d0c485d96c..d0c485d96c 100644
--- a/gtk/gtkcellrendererexpander.c
+++ b/pidgin/gtkcellrendererexpander.c
diff --git a/gtk/gtkcellrendererexpander.h b/pidgin/gtkcellrendererexpander.h
index e93f479288..e93f479288 100644
--- a/gtk/gtkcellrendererexpander.h
+++ b/pidgin/gtkcellrendererexpander.h
diff --git a/gtk/gtkcellrendererprogress.c b/pidgin/gtkcellrendererprogress.c
index 217568915c..217568915c 100644
--- a/gtk/gtkcellrendererprogress.c
+++ b/pidgin/gtkcellrendererprogress.c
diff --git a/gtk/gtkcellrendererprogress.h b/pidgin/gtkcellrendererprogress.h
index 08db4b0b26..08db4b0b26 100644
--- a/gtk/gtkcellrendererprogress.h
+++ b/pidgin/gtkcellrendererprogress.h
diff --git a/gtk/gtkcellview.c b/pidgin/gtkcellview.c
index 396b0959f9..396b0959f9 100644
--- a/gtk/gtkcellview.c
+++ b/pidgin/gtkcellview.c
diff --git a/gtk/gtkcellview.h b/pidgin/gtkcellview.h
index 5212b351a5..5212b351a5 100644
--- a/gtk/gtkcellview.h
+++ b/pidgin/gtkcellview.h
diff --git a/gtk/gtkcellviewmenuitem.c b/pidgin/gtkcellviewmenuitem.c
index 04249d3f9b..04249d3f9b 100644
--- a/gtk/gtkcellviewmenuitem.c
+++ b/pidgin/gtkcellviewmenuitem.c
diff --git a/gtk/gtkcellviewmenuitem.h b/pidgin/gtkcellviewmenuitem.h
index 962730e71e..962730e71e 100644
--- a/gtk/gtkcellviewmenuitem.h
+++ b/pidgin/gtkcellviewmenuitem.h
diff --git a/gtk/gtkconn.c b/pidgin/gtkconn.c
index 4280e827e8..4280e827e8 100644
--- a/gtk/gtkconn.c
+++ b/pidgin/gtkconn.c
diff --git a/gtk/gtkconn.h b/pidgin/gtkconn.h
index de7cbe1595..de7cbe1595 100644
--- a/gtk/gtkconn.h
+++ b/pidgin/gtkconn.h
diff --git a/gtk/gtkconv.c b/pidgin/gtkconv.c
index cc49f9659b..cc49f9659b 100644
--- a/gtk/gtkconv.c
+++ b/pidgin/gtkconv.c
diff --git a/gtk/gtkconv.h b/pidgin/gtkconv.h
index eb57b4a34b..eb57b4a34b 100644
--- a/gtk/gtkconv.h
+++ b/pidgin/gtkconv.h
diff --git a/gtk/gtkconvwin.h b/pidgin/gtkconvwin.h
index aef5de04a1..aef5de04a1 100644
--- a/gtk/gtkconvwin.h
+++ b/pidgin/gtkconvwin.h
diff --git a/gtk/gtkdebug.c b/pidgin/gtkdebug.c
index 33cef715a1..33cef715a1 100644
--- a/gtk/gtkdebug.c
+++ b/pidgin/gtkdebug.c
diff --git a/gtk/gtkdebug.h b/pidgin/gtkdebug.h
index 20b50a7d04..20b50a7d04 100644
--- a/gtk/gtkdebug.h
+++ b/pidgin/gtkdebug.h
diff --git a/gtk/gtkdialogs.c b/pidgin/gtkdialogs.c
index d24c0211f9..d24c0211f9 100644
--- a/gtk/gtkdialogs.c
+++ b/pidgin/gtkdialogs.c
diff --git a/gtk/gtkdialogs.h b/pidgin/gtkdialogs.h
index 500dc3ef9c..500dc3ef9c 100644
--- a/gtk/gtkdialogs.h
+++ b/pidgin/gtkdialogs.h
diff --git a/gtk/gtkdnd-hints.c b/pidgin/gtkdnd-hints.c
index 3696168838..3696168838 100644
--- a/gtk/gtkdnd-hints.c
+++ b/pidgin/gtkdnd-hints.c
diff --git a/gtk/gtkdnd-hints.h b/pidgin/gtkdnd-hints.h
index 303a2d93a8..303a2d93a8 100644
--- a/gtk/gtkdnd-hints.h
+++ b/pidgin/gtkdnd-hints.h
diff --git a/gtk/gtkdocklet-x11.c b/pidgin/gtkdocklet-x11.c
index 67515ee364..67515ee364 100644
--- a/gtk/gtkdocklet-x11.c
+++ b/pidgin/gtkdocklet-x11.c
diff --git a/gtk/gtkdocklet.c b/pidgin/gtkdocklet.c
index ffca5bf960..ffca5bf960 100644
--- a/gtk/gtkdocklet.c
+++ b/pidgin/gtkdocklet.c
diff --git a/gtk/gtkdocklet.h b/pidgin/gtkdocklet.h
index 833cda0299..833cda0299 100644
--- a/gtk/gtkdocklet.h
+++ b/pidgin/gtkdocklet.h
diff --git a/gtk/gtkeventloop.c b/pidgin/gtkeventloop.c
index a08852687a..a08852687a 100644
--- a/gtk/gtkeventloop.c
+++ b/pidgin/gtkeventloop.c
diff --git a/gtk/gtkeventloop.h b/pidgin/gtkeventloop.h
index 6c648a7faf..6c648a7faf 100644
--- a/gtk/gtkeventloop.h
+++ b/pidgin/gtkeventloop.h
diff --git a/gtk/gtkexpander.c b/pidgin/gtkexpander.c
index b4bbd8076f..b4bbd8076f 100644
--- a/gtk/gtkexpander.c
+++ b/pidgin/gtkexpander.c
diff --git a/gtk/gtkexpander.h b/pidgin/gtkexpander.h
index e5bfa45440..e5bfa45440 100644
--- a/gtk/gtkexpander.h
+++ b/pidgin/gtkexpander.h
diff --git a/gtk/gtkft.c b/pidgin/gtkft.c
index f0babd97b6..f0babd97b6 100644
--- a/gtk/gtkft.c
+++ b/pidgin/gtkft.c
diff --git a/gtk/gtkft.h b/pidgin/gtkft.h
index e3ef7e4db0..e3ef7e4db0 100644
--- a/gtk/gtkft.h
+++ b/pidgin/gtkft.h
diff --git a/gtk/gtkgaim.h b/pidgin/gtkgaim.h
index 2aa7607eaf..2aa7607eaf 100644
--- a/gtk/gtkgaim.h
+++ b/pidgin/gtkgaim.h
diff --git a/gtk/gtkidle.c b/pidgin/gtkidle.c
index 4e4a9c1576..4e4a9c1576 100644
--- a/gtk/gtkidle.c
+++ b/pidgin/gtkidle.c
diff --git a/gtk/gtkidle.h b/pidgin/gtkidle.h
index 1f96cf75e3..1f96cf75e3 100644
--- a/gtk/gtkidle.h
+++ b/pidgin/gtkidle.h
diff --git a/gtk/gtkimhtml.c b/pidgin/gtkimhtml.c
index 0ccfcc5713..0ccfcc5713 100644
--- a/gtk/gtkimhtml.c
+++ b/pidgin/gtkimhtml.c
diff --git a/gtk/gtkimhtml.h b/pidgin/gtkimhtml.h
index 26c4e068d5..26c4e068d5 100644
--- a/gtk/gtkimhtml.h
+++ b/pidgin/gtkimhtml.h
diff --git a/gtk/gtkimhtmltoolbar.c b/pidgin/gtkimhtmltoolbar.c
index 7b1d077356..7b1d077356 100644
--- a/gtk/gtkimhtmltoolbar.c
+++ b/pidgin/gtkimhtmltoolbar.c
diff --git a/gtk/gtkimhtmltoolbar.h b/pidgin/gtkimhtmltoolbar.h
index c567211aac..c567211aac 100644
--- a/gtk/gtkimhtmltoolbar.h
+++ b/pidgin/gtkimhtmltoolbar.h
diff --git a/gtk/gtklog.c b/pidgin/gtklog.c
index 10232abe1d..10232abe1d 100644
--- a/gtk/gtklog.c
+++ b/pidgin/gtklog.c
diff --git a/gtk/gtklog.h b/pidgin/gtklog.h
index 9243a69c7e..9243a69c7e 100644
--- a/gtk/gtklog.h
+++ b/pidgin/gtklog.h
diff --git a/gtk/gtkmain.c b/pidgin/gtkmain.c
index 7829c0b980..7829c0b980 100644
--- a/gtk/gtkmain.c
+++ b/pidgin/gtkmain.c
diff --git a/gtk/gtkmenutray.c b/pidgin/gtkmenutray.c
index 85aa5d3f6d..85aa5d3f6d 100644
--- a/gtk/gtkmenutray.c
+++ b/pidgin/gtkmenutray.c
diff --git a/gtk/gtkmenutray.h b/pidgin/gtkmenutray.h
index bd0a44cbe5..bd0a44cbe5 100644
--- a/gtk/gtkmenutray.h
+++ b/pidgin/gtkmenutray.h
diff --git a/gtk/gtknickcolors.h b/pidgin/gtknickcolors.h
index abecb04d07..abecb04d07 100644
--- a/gtk/gtknickcolors.h
+++ b/pidgin/gtknickcolors.h
diff --git a/gtk/gtknotify.c b/pidgin/gtknotify.c
index 6bec1537b3..6bec1537b3 100644
--- a/gtk/gtknotify.c
+++ b/pidgin/gtknotify.c
diff --git a/gtk/gtknotify.h b/pidgin/gtknotify.h
index a7990f0831..a7990f0831 100644
--- a/gtk/gtknotify.h
+++ b/pidgin/gtknotify.h
diff --git a/gtk/gtkplugin.c b/pidgin/gtkplugin.c
index 1513c45612..1513c45612 100644
--- a/gtk/gtkplugin.c
+++ b/pidgin/gtkplugin.c
diff --git a/gtk/gtkplugin.h b/pidgin/gtkplugin.h
index c8714b97a5..c8714b97a5 100644
--- a/gtk/gtkplugin.h
+++ b/pidgin/gtkplugin.h
diff --git a/gtk/gtkpluginpref.c b/pidgin/gtkpluginpref.c
index cc874ea41a..cc874ea41a 100644
--- a/gtk/gtkpluginpref.c
+++ b/pidgin/gtkpluginpref.c
diff --git a/gtk/gtkpluginpref.h b/pidgin/gtkpluginpref.h
index 5cc6c22b9c..5cc6c22b9c 100644
--- a/gtk/gtkpluginpref.h
+++ b/pidgin/gtkpluginpref.h
diff --git a/gtk/gtkpounce.c b/pidgin/gtkpounce.c
index 4eb7095401..4eb7095401 100644
--- a/gtk/gtkpounce.c
+++ b/pidgin/gtkpounce.c
diff --git a/gtk/gtkpounce.h b/pidgin/gtkpounce.h
index 2c1f05bee9..2c1f05bee9 100644
--- a/gtk/gtkpounce.h
+++ b/pidgin/gtkpounce.h
diff --git a/gtk/gtkprefs.c b/pidgin/gtkprefs.c
index 51288c942b..51288c942b 100644
--- a/gtk/gtkprefs.c
+++ b/pidgin/gtkprefs.c
diff --git a/gtk/gtkprefs.h b/pidgin/gtkprefs.h
index 2459df7cd0..2459df7cd0 100644
--- a/gtk/gtkprefs.h
+++ b/pidgin/gtkprefs.h
diff --git a/gtk/gtkprivacy.c b/pidgin/gtkprivacy.c
index ee4782e312..ee4782e312 100644
--- a/gtk/gtkprivacy.c
+++ b/pidgin/gtkprivacy.c
diff --git a/gtk/gtkprivacy.h b/pidgin/gtkprivacy.h
index be5aaa33e0..be5aaa33e0 100644
--- a/gtk/gtkprivacy.h
+++ b/pidgin/gtkprivacy.h
diff --git a/gtk/gtkrequest.c b/pidgin/gtkrequest.c
index a2657a02ff..a2657a02ff 100644
--- a/gtk/gtkrequest.c
+++ b/pidgin/gtkrequest.c
diff --git a/gtk/gtkrequest.h b/pidgin/gtkrequest.h
index d34154f283..d34154f283 100644
--- a/gtk/gtkrequest.h
+++ b/pidgin/gtkrequest.h
diff --git a/gtk/gtkroomlist.c b/pidgin/gtkroomlist.c
index b1bdfe0098..b1bdfe0098 100644
--- a/gtk/gtkroomlist.c
+++ b/pidgin/gtkroomlist.c
diff --git a/gtk/gtkroomlist.h b/pidgin/gtkroomlist.h
index 88b178034f..88b178034f 100644
--- a/gtk/gtkroomlist.h
+++ b/pidgin/gtkroomlist.h
diff --git a/gtk/gtksavedstatuses.c b/pidgin/gtksavedstatuses.c
index 4a757325ff..4a757325ff 100644
--- a/gtk/gtksavedstatuses.c
+++ b/pidgin/gtksavedstatuses.c
diff --git a/gtk/gtksavedstatuses.h b/pidgin/gtksavedstatuses.h
index 6921d69365..6921d69365 100644
--- a/gtk/gtksavedstatuses.h
+++ b/pidgin/gtksavedstatuses.h
diff --git a/gtk/gtkscrollbook.c b/pidgin/gtkscrollbook.c
index d6455a5c6f..d6455a5c6f 100644
--- a/gtk/gtkscrollbook.c
+++ b/pidgin/gtkscrollbook.c
diff --git a/gtk/gtkscrollbook.h b/pidgin/gtkscrollbook.h
index 422b8ce14f..422b8ce14f 100644
--- a/gtk/gtkscrollbook.h
+++ b/pidgin/gtkscrollbook.h
diff --git a/gtk/gtksession.c b/pidgin/gtksession.c
index ebd2fd1894..ebd2fd1894 100644
--- a/gtk/gtksession.c
+++ b/pidgin/gtksession.c
diff --git a/gtk/gtksession.h b/pidgin/gtksession.h
index 20acbdb1ca..20acbdb1ca 100644
--- a/gtk/gtksession.h
+++ b/pidgin/gtksession.h
diff --git a/gtk/gtksound.c b/pidgin/gtksound.c
index 1ae0a7e148..1ae0a7e148 100644
--- a/gtk/gtksound.c
+++ b/pidgin/gtksound.c
diff --git a/gtk/gtksound.h b/pidgin/gtksound.h
index 9675ce92ee..9675ce92ee 100644
--- a/gtk/gtksound.h
+++ b/pidgin/gtksound.h
diff --git a/gtk/gtksourceiter.c b/pidgin/gtksourceiter.c
index 60bc7cff84..60bc7cff84 100644
--- a/gtk/gtksourceiter.c
+++ b/pidgin/gtksourceiter.c
diff --git a/gtk/gtksourceiter.h b/pidgin/gtksourceiter.h
index 947e04abf7..947e04abf7 100644
--- a/gtk/gtksourceiter.h
+++ b/pidgin/gtksourceiter.h
diff --git a/gtk/gtkstatusbox.c b/pidgin/gtkstatusbox.c
index 683977c44e..683977c44e 100644
--- a/gtk/gtkstatusbox.c
+++ b/pidgin/gtkstatusbox.c
diff --git a/gtk/gtkstatusbox.h b/pidgin/gtkstatusbox.h
index dcd971513e..dcd971513e 100644
--- a/gtk/gtkstatusbox.h
+++ b/pidgin/gtkstatusbox.h
diff --git a/gtk/gtkthemes.c b/pidgin/gtkthemes.c
index 8deb55c7eb..8deb55c7eb 100644
--- a/gtk/gtkthemes.c
+++ b/pidgin/gtkthemes.c
diff --git a/gtk/gtkthemes.h b/pidgin/gtkthemes.h
index b7cdb4e222..b7cdb4e222 100644
--- a/gtk/gtkthemes.h
+++ b/pidgin/gtkthemes.h
diff --git a/gtk/gtkutils.c b/pidgin/gtkutils.c
index acc8b88610..acc8b88610 100644
--- a/gtk/gtkutils.c
+++ b/pidgin/gtkutils.c
diff --git a/gtk/gtkutils.h b/pidgin/gtkutils.h
index c715f51fbd..c715f51fbd 100644
--- a/gtk/gtkutils.h
+++ b/pidgin/gtkutils.h
diff --git a/gtk/gtkwhiteboard.c b/pidgin/gtkwhiteboard.c
index 2c507ea428..2c507ea428 100644
--- a/gtk/gtkwhiteboard.c
+++ b/pidgin/gtkwhiteboard.c
diff --git a/gtk/gtkwhiteboard.h b/pidgin/gtkwhiteboard.h
index 4e306d0158..4e306d0158 100644
--- a/gtk/gtkwhiteboard.h
+++ b/pidgin/gtkwhiteboard.h
diff --git a/gtk/pixmaps/Makefile.am b/pidgin/pixmaps/Makefile.am
index b127a4c6bc..b127a4c6bc 100644
--- a/gtk/pixmaps/Makefile.am
+++ b/pidgin/pixmaps/Makefile.am
diff --git a/gtk/pixmaps/Makefile.mingw b/pidgin/pixmaps/Makefile.mingw
index a92518df3e..a92518df3e 100644
--- a/gtk/pixmaps/Makefile.mingw
+++ b/pidgin/pixmaps/Makefile.mingw
diff --git a/gtk/pixmaps/about_menu.png b/pidgin/pixmaps/about_menu.png
index d66bfd7b02..d66bfd7b02 100644
--- a/gtk/pixmaps/about_menu.png
+++ b/pidgin/pixmaps/about_menu.png
diff --git a/gtk/pixmaps/accounts.png b/pidgin/pixmaps/accounts.png
index 3eb2b85ba7..3eb2b85ba7 100644
--- a/gtk/pixmaps/accounts.png
+++ b/pidgin/pixmaps/accounts.png
diff --git a/gtk/pixmaps/away.png b/pidgin/pixmaps/away.png
index e0592352d3..e0592352d3 100644
--- a/gtk/pixmaps/away.png
+++ b/pidgin/pixmaps/away.png
diff --git a/gtk/pixmaps/buddy_icons/Makefile.am b/pidgin/pixmaps/buddy_icons/Makefile.am
index 0daf1bac4a..0daf1bac4a 100644
--- a/gtk/pixmaps/buddy_icons/Makefile.am
+++ b/pidgin/pixmaps/buddy_icons/Makefile.am
diff --git a/gtk/pixmaps/buddy_icons/Makefile.mingw b/pidgin/pixmaps/buddy_icons/Makefile.mingw
index fd5466a6ba..fd5466a6ba 100644
--- a/gtk/pixmaps/buddy_icons/Makefile.mingw
+++ b/pidgin/pixmaps/buddy_icons/Makefile.mingw
diff --git a/gtk/pixmaps/buddy_icons/qq/Makefile.am b/pidgin/pixmaps/buddy_icons/qq/Makefile.am
index b9485b7925..b9485b7925 100644
--- a/gtk/pixmaps/buddy_icons/qq/Makefile.am
+++ b/pidgin/pixmaps/buddy_icons/qq/Makefile.am
diff --git a/gtk/pixmaps/buddy_icons/qq/Makefile.mingw b/pidgin/pixmaps/buddy_icons/qq/Makefile.mingw
index 547d965188..547d965188 100644
--- a/gtk/pixmaps/buddy_icons/qq/Makefile.mingw
+++ b/pidgin/pixmaps/buddy_icons/qq/Makefile.mingw
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_1.png b/pidgin/pixmaps/buddy_icons/qq/qq_1.png
index 74d0b68477..74d0b68477 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_1.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_1.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_10.png b/pidgin/pixmaps/buddy_icons/qq/qq_10.png
index d13c350c18..d13c350c18 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_10.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_10.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_100.png b/pidgin/pixmaps/buddy_icons/qq/qq_100.png
index 5def02b293..5def02b293 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_100.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_100.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_11.png b/pidgin/pixmaps/buddy_icons/qq/qq_11.png
index 8d68673a94..8d68673a94 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_11.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_11.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_12.png b/pidgin/pixmaps/buddy_icons/qq/qq_12.png
index e35b306760..e35b306760 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_12.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_12.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_13.png b/pidgin/pixmaps/buddy_icons/qq/qq_13.png
index a68159d8df..a68159d8df 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_13.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_13.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_14.png b/pidgin/pixmaps/buddy_icons/qq/qq_14.png
index bdb07e845a..bdb07e845a 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_14.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_14.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_15.png b/pidgin/pixmaps/buddy_icons/qq/qq_15.png
index 78205604a5..78205604a5 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_15.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_15.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_16.png b/pidgin/pixmaps/buddy_icons/qq/qq_16.png
index 9a1890c4cf..9a1890c4cf 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_16.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_16.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_17.png b/pidgin/pixmaps/buddy_icons/qq/qq_17.png
index 75415cfe0e..75415cfe0e 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_17.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_17.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_18.png b/pidgin/pixmaps/buddy_icons/qq/qq_18.png
index c21ca2eb4b..c21ca2eb4b 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_18.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_18.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_19.png b/pidgin/pixmaps/buddy_icons/qq/qq_19.png
index 4654ad5890..4654ad5890 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_19.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_19.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_2.png b/pidgin/pixmaps/buddy_icons/qq/qq_2.png
index c576b371aa..c576b371aa 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_2.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_2.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_20.png b/pidgin/pixmaps/buddy_icons/qq/qq_20.png
index 17dbad64d0..17dbad64d0 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_20.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_20.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_21.png b/pidgin/pixmaps/buddy_icons/qq/qq_21.png
index 81b4fedab1..81b4fedab1 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_21.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_21.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_22.png b/pidgin/pixmaps/buddy_icons/qq/qq_22.png
index e51db4cc49..e51db4cc49 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_22.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_22.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_23.png b/pidgin/pixmaps/buddy_icons/qq/qq_23.png
index be34b503ba..be34b503ba 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_23.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_23.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_24.png b/pidgin/pixmaps/buddy_icons/qq/qq_24.png
index 3cc05f29d4..3cc05f29d4 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_24.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_24.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_25.png b/pidgin/pixmaps/buddy_icons/qq/qq_25.png
index 603ead99bd..603ead99bd 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_25.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_25.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_26.png b/pidgin/pixmaps/buddy_icons/qq/qq_26.png
index 074877a778..074877a778 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_26.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_26.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_27.png b/pidgin/pixmaps/buddy_icons/qq/qq_27.png
index 91a0d9b210..91a0d9b210 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_27.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_27.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_28.png b/pidgin/pixmaps/buddy_icons/qq/qq_28.png
index 1394b0e934..1394b0e934 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_28.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_28.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_29.png b/pidgin/pixmaps/buddy_icons/qq/qq_29.png
index 3633f51abc..3633f51abc 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_29.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_29.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_3.png b/pidgin/pixmaps/buddy_icons/qq/qq_3.png
index 7eaafbac2a..7eaafbac2a 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_3.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_3.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_30.png b/pidgin/pixmaps/buddy_icons/qq/qq_30.png
index 14221d0768..14221d0768 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_30.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_30.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_31.png b/pidgin/pixmaps/buddy_icons/qq/qq_31.png
index 2b3bf11050..2b3bf11050 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_31.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_31.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_32.png b/pidgin/pixmaps/buddy_icons/qq/qq_32.png
index 538ac4706f..538ac4706f 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_32.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_32.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_33.png b/pidgin/pixmaps/buddy_icons/qq/qq_33.png
index 336b368378..336b368378 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_33.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_33.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_34.png b/pidgin/pixmaps/buddy_icons/qq/qq_34.png
index d87b7c8df1..d87b7c8df1 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_34.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_34.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_35.png b/pidgin/pixmaps/buddy_icons/qq/qq_35.png
index 4905204c8f..4905204c8f 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_35.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_35.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_36.png b/pidgin/pixmaps/buddy_icons/qq/qq_36.png
index 1350fd6c57..1350fd6c57 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_36.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_36.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_37.png b/pidgin/pixmaps/buddy_icons/qq/qq_37.png
index 39361a8648..39361a8648 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_37.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_37.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_38.png b/pidgin/pixmaps/buddy_icons/qq/qq_38.png
index 26ee52ba73..26ee52ba73 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_38.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_38.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_39.png b/pidgin/pixmaps/buddy_icons/qq/qq_39.png
index 109486809a..109486809a 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_39.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_39.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_4.png b/pidgin/pixmaps/buddy_icons/qq/qq_4.png
index be4b8b9bba..be4b8b9bba 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_4.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_4.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_40.png b/pidgin/pixmaps/buddy_icons/qq/qq_40.png
index 21ce4abf6c..21ce4abf6c 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_40.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_40.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_41.png b/pidgin/pixmaps/buddy_icons/qq/qq_41.png
index d0b9926b1e..d0b9926b1e 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_41.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_41.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_42.png b/pidgin/pixmaps/buddy_icons/qq/qq_42.png
index 83a0e62173..83a0e62173 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_42.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_42.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_43.png b/pidgin/pixmaps/buddy_icons/qq/qq_43.png
index 940c69c12f..940c69c12f 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_43.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_43.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_44.png b/pidgin/pixmaps/buddy_icons/qq/qq_44.png
index 33f0c9918c..33f0c9918c 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_44.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_44.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_45.png b/pidgin/pixmaps/buddy_icons/qq/qq_45.png
index ea66c20898..ea66c20898 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_45.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_45.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_46.png b/pidgin/pixmaps/buddy_icons/qq/qq_46.png
index 4ac37db20a..4ac37db20a 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_46.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_46.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_47.png b/pidgin/pixmaps/buddy_icons/qq/qq_47.png
index 19b5b756c0..19b5b756c0 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_47.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_47.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_48.png b/pidgin/pixmaps/buddy_icons/qq/qq_48.png
index 1827779a4a..1827779a4a 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_48.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_48.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_49.png b/pidgin/pixmaps/buddy_icons/qq/qq_49.png
index 516427db97..516427db97 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_49.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_49.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_5.png b/pidgin/pixmaps/buddy_icons/qq/qq_5.png
index 31a42e2a76..31a42e2a76 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_5.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_5.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_50.png b/pidgin/pixmaps/buddy_icons/qq/qq_50.png
index fe7f0a12c2..fe7f0a12c2 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_50.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_50.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_51.png b/pidgin/pixmaps/buddy_icons/qq/qq_51.png
index 565eda4d07..565eda4d07 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_51.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_51.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_52.png b/pidgin/pixmaps/buddy_icons/qq/qq_52.png
index 8ae009e49e..8ae009e49e 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_52.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_52.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_53.png b/pidgin/pixmaps/buddy_icons/qq/qq_53.png
index 653a3dd1a7..653a3dd1a7 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_53.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_53.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_54.png b/pidgin/pixmaps/buddy_icons/qq/qq_54.png
index 9ac58f82e8..9ac58f82e8 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_54.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_54.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_55.png b/pidgin/pixmaps/buddy_icons/qq/qq_55.png
index c4aafd99bb..c4aafd99bb 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_55.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_55.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_56.png b/pidgin/pixmaps/buddy_icons/qq/qq_56.png
index 67a87b8acf..67a87b8acf 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_56.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_56.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_57.png b/pidgin/pixmaps/buddy_icons/qq/qq_57.png
index 65b4eb9b22..65b4eb9b22 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_57.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_57.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_58.png b/pidgin/pixmaps/buddy_icons/qq/qq_58.png
index e263eec036..e263eec036 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_58.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_58.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_59.png b/pidgin/pixmaps/buddy_icons/qq/qq_59.png
index dd68c0d435..dd68c0d435 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_59.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_59.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_6.png b/pidgin/pixmaps/buddy_icons/qq/qq_6.png
index 3026360a91..3026360a91 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_6.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_6.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_60.png b/pidgin/pixmaps/buddy_icons/qq/qq_60.png
index f8a668d6ed..f8a668d6ed 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_60.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_60.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_61.png b/pidgin/pixmaps/buddy_icons/qq/qq_61.png
index 4ece88a2d4..4ece88a2d4 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_61.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_61.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_62.png b/pidgin/pixmaps/buddy_icons/qq/qq_62.png
index b6edcc1138..b6edcc1138 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_62.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_62.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_63.png b/pidgin/pixmaps/buddy_icons/qq/qq_63.png
index 9c7b7389a2..9c7b7389a2 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_63.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_63.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_64.png b/pidgin/pixmaps/buddy_icons/qq/qq_64.png
index d87d4785ef..d87d4785ef 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_64.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_64.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_65.png b/pidgin/pixmaps/buddy_icons/qq/qq_65.png
index 8300028378..8300028378 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_65.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_65.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_66.png b/pidgin/pixmaps/buddy_icons/qq/qq_66.png
index 39c6e91a42..39c6e91a42 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_66.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_66.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_67.png b/pidgin/pixmaps/buddy_icons/qq/qq_67.png
index 687ffd2838..687ffd2838 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_67.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_67.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_68.png b/pidgin/pixmaps/buddy_icons/qq/qq_68.png
index fd56e74cc7..fd56e74cc7 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_68.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_68.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_69.png b/pidgin/pixmaps/buddy_icons/qq/qq_69.png
index f0fc53c468..f0fc53c468 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_69.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_69.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_7.png b/pidgin/pixmaps/buddy_icons/qq/qq_7.png
index b5fb783030..b5fb783030 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_7.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_7.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_70.png b/pidgin/pixmaps/buddy_icons/qq/qq_70.png
index 4dd2e45bd2..4dd2e45bd2 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_70.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_70.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_71.png b/pidgin/pixmaps/buddy_icons/qq/qq_71.png
index 2c973c996e..2c973c996e 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_71.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_71.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_72.png b/pidgin/pixmaps/buddy_icons/qq/qq_72.png
index e9a4e9f655..e9a4e9f655 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_72.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_72.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_73.png b/pidgin/pixmaps/buddy_icons/qq/qq_73.png
index f258a407a9..f258a407a9 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_73.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_73.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_74.png b/pidgin/pixmaps/buddy_icons/qq/qq_74.png
index 2e818001fa..2e818001fa 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_74.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_74.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_75.png b/pidgin/pixmaps/buddy_icons/qq/qq_75.png
index 27213e33f7..27213e33f7 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_75.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_75.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_76.png b/pidgin/pixmaps/buddy_icons/qq/qq_76.png
index 7aca88e08d..7aca88e08d 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_76.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_76.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_77.png b/pidgin/pixmaps/buddy_icons/qq/qq_77.png
index 4fa44dc3d0..4fa44dc3d0 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_77.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_77.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_78.png b/pidgin/pixmaps/buddy_icons/qq/qq_78.png
index bc9d4ead8f..bc9d4ead8f 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_78.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_78.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_79.png b/pidgin/pixmaps/buddy_icons/qq/qq_79.png
index e67b8ca8a9..e67b8ca8a9 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_79.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_79.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_8.png b/pidgin/pixmaps/buddy_icons/qq/qq_8.png
index 64c13b6dea..64c13b6dea 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_8.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_8.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_80.png b/pidgin/pixmaps/buddy_icons/qq/qq_80.png
index ab20c3c5f0..ab20c3c5f0 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_80.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_80.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_81.png b/pidgin/pixmaps/buddy_icons/qq/qq_81.png
index 38ee0aa64d..38ee0aa64d 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_81.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_81.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_82.png b/pidgin/pixmaps/buddy_icons/qq/qq_82.png
index ce3faf52fd..ce3faf52fd 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_82.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_82.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_83.png b/pidgin/pixmaps/buddy_icons/qq/qq_83.png
index d8d2ecf9c1..d8d2ecf9c1 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_83.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_83.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_84.png b/pidgin/pixmaps/buddy_icons/qq/qq_84.png
index a0f6961ab4..a0f6961ab4 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_84.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_84.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_85.png b/pidgin/pixmaps/buddy_icons/qq/qq_85.png
index 0494ca3562..0494ca3562 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_85.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_85.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_86.png b/pidgin/pixmaps/buddy_icons/qq/qq_86.png
index 5c4004387e..5c4004387e 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_86.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_86.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_87.png b/pidgin/pixmaps/buddy_icons/qq/qq_87.png
index c62d3ca0d5..c62d3ca0d5 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_87.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_87.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_88.png b/pidgin/pixmaps/buddy_icons/qq/qq_88.png
index 35839619ab..35839619ab 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_88.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_88.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_89.png b/pidgin/pixmaps/buddy_icons/qq/qq_89.png
index cb27540ea3..cb27540ea3 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_89.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_89.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_9.png b/pidgin/pixmaps/buddy_icons/qq/qq_9.png
index a85648742d..a85648742d 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_9.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_9.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_90.png b/pidgin/pixmaps/buddy_icons/qq/qq_90.png
index bee9955a24..bee9955a24 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_90.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_90.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_91.png b/pidgin/pixmaps/buddy_icons/qq/qq_91.png
index 7c5ca4c7b3..7c5ca4c7b3 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_91.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_91.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_92.png b/pidgin/pixmaps/buddy_icons/qq/qq_92.png
index c45977ab68..c45977ab68 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_92.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_92.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_93.png b/pidgin/pixmaps/buddy_icons/qq/qq_93.png
index 578148f9ac..578148f9ac 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_93.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_93.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_94.png b/pidgin/pixmaps/buddy_icons/qq/qq_94.png
index e7b1394c4b..e7b1394c4b 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_94.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_94.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_95.png b/pidgin/pixmaps/buddy_icons/qq/qq_95.png
index 70b7ae65bf..70b7ae65bf 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_95.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_95.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_96.png b/pidgin/pixmaps/buddy_icons/qq/qq_96.png
index 2268619548..2268619548 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_96.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_96.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_97.png b/pidgin/pixmaps/buddy_icons/qq/qq_97.png
index 68979d94bf..68979d94bf 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_97.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_97.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_98.png b/pidgin/pixmaps/buddy_icons/qq/qq_98.png
index 5d280cf982..5d280cf982 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_98.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_98.png
diff --git a/gtk/pixmaps/buddy_icons/qq/qq_99.png b/pidgin/pixmaps/buddy_icons/qq/qq_99.png
index e2ad6890b4..e2ad6890b4 100644
--- a/gtk/pixmaps/buddy_icons/qq/qq_99.png
+++ b/pidgin/pixmaps/buddy_icons/qq/qq_99.png
diff --git a/gtk/pixmaps/change-bgcolor-small.png b/pidgin/pixmaps/change-bgcolor-small.png
index 71dd076b55..71dd076b55 100644
--- a/gtk/pixmaps/change-bgcolor-small.png
+++ b/pidgin/pixmaps/change-bgcolor-small.png
diff --git a/gtk/pixmaps/change-fgcolor-small.png b/pidgin/pixmaps/change-fgcolor-small.png
index 8cc6b37f5b..8cc6b37f5b 100644
--- a/gtk/pixmaps/change-fgcolor-small.png
+++ b/pidgin/pixmaps/change-fgcolor-small.png
diff --git a/gtk/pixmaps/connect.png b/pidgin/pixmaps/connect.png
index 64590bedfc..64590bedfc 100644
--- a/gtk/pixmaps/connect.png
+++ b/pidgin/pixmaps/connect.png
diff --git a/gtk/pixmaps/edit.png b/pidgin/pixmaps/edit.png
index 36775390f1..36775390f1 100644
--- a/gtk/pixmaps/edit.png
+++ b/pidgin/pixmaps/edit.png
diff --git a/gtk/pixmaps/gaim-install.ico b/pidgin/pixmaps/gaim-install.ico
index cc156e301e..cc156e301e 100644
--- a/gtk/pixmaps/gaim-install.ico
+++ b/pidgin/pixmaps/gaim-install.ico
diff --git a/gtk/pixmaps/gaim.ico b/pidgin/pixmaps/gaim.ico
index 55ea5f25e0..55ea5f25e0 100644
--- a/gtk/pixmaps/gaim.ico
+++ b/pidgin/pixmaps/gaim.ico
diff --git a/gtk/pixmaps/gaim.png b/pidgin/pixmaps/gaim.png
index b44b969f0e..b44b969f0e 100644
--- a/gtk/pixmaps/gaim.png
+++ b/pidgin/pixmaps/gaim.png
diff --git a/gtk/pixmaps/gaim.svg b/pidgin/pixmaps/gaim.svg
index 1f8f1e7edc..1f8f1e7edc 100644
--- a/gtk/pixmaps/gaim.svg
+++ b/pidgin/pixmaps/gaim.svg
diff --git a/gtk/pixmaps/gaim_16.ico b/pidgin/pixmaps/gaim_16.ico
index 7a770d6811..7a770d6811 100644
--- a/gtk/pixmaps/gaim_16.ico
+++ b/pidgin/pixmaps/gaim_16.ico
diff --git a/gtk/pixmaps/gaim_4bit_16.ico b/pidgin/pixmaps/gaim_4bit_16.ico
index 80f82e972f..80f82e972f 100644
--- a/gtk/pixmaps/gaim_4bit_16.ico
+++ b/pidgin/pixmaps/gaim_4bit_16.ico
diff --git a/gtk/pixmaps/gaim_auth.png b/pidgin/pixmaps/gaim_auth.png
index f020437bfa..f020437bfa 100644
--- a/gtk/pixmaps/gaim_auth.png
+++ b/pidgin/pixmaps/gaim_auth.png
diff --git a/gtk/pixmaps/gaim_away.ico b/pidgin/pixmaps/gaim_away.ico
index f33de6c8d8..f33de6c8d8 100644
--- a/gtk/pixmaps/gaim_away.ico
+++ b/pidgin/pixmaps/gaim_away.ico
diff --git a/gtk/pixmaps/gaim_away_16.ico b/pidgin/pixmaps/gaim_away_16.ico
index 42969f885c..42969f885c 100644
--- a/gtk/pixmaps/gaim_away_16.ico
+++ b/pidgin/pixmaps/gaim_away_16.ico
diff --git a/gtk/pixmaps/gaim_away_4bit_16.ico b/pidgin/pixmaps/gaim_away_4bit_16.ico
index e29b4655c8..e29b4655c8 100644
--- a/gtk/pixmaps/gaim_away_4bit_16.ico
+++ b/pidgin/pixmaps/gaim_away_4bit_16.ico
diff --git a/gtk/pixmaps/gaim_blank_4bit_16.ico b/pidgin/pixmaps/gaim_blank_4bit_16.ico
index 576aec9ea6..576aec9ea6 100644
--- a/gtk/pixmaps/gaim_blank_4bit_16.ico
+++ b/pidgin/pixmaps/gaim_blank_4bit_16.ico
diff --git a/gtk/pixmaps/gaim_cool.png b/pidgin/pixmaps/gaim_cool.png
index a1985e1afa..a1985e1afa 100644
--- a/gtk/pixmaps/gaim_cool.png
+++ b/pidgin/pixmaps/gaim_cool.png
diff --git a/gtk/pixmaps/gaim_error.png b/pidgin/pixmaps/gaim_error.png
index 31154d9dc4..31154d9dc4 100644
--- a/gtk/pixmaps/gaim_error.png
+++ b/pidgin/pixmaps/gaim_error.png
diff --git a/gtk/pixmaps/gaim_info.png b/pidgin/pixmaps/gaim_info.png
index 1deb1f24db..1deb1f24db 100644
--- a/gtk/pixmaps/gaim_info.png
+++ b/pidgin/pixmaps/gaim_info.png
diff --git a/gtk/pixmaps/gaim_msgpend_16.ico b/pidgin/pixmaps/gaim_msgpend_16.ico
index 9a9bc7f7da..9a9bc7f7da 100644
--- a/gtk/pixmaps/gaim_msgpend_16.ico
+++ b/pidgin/pixmaps/gaim_msgpend_16.ico
diff --git a/gtk/pixmaps/gaim_msgpend_4bit_16.ico b/pidgin/pixmaps/gaim_msgpend_4bit_16.ico
index 4c188e808f..4c188e808f 100644
--- a/gtk/pixmaps/gaim_msgpend_4bit_16.ico
+++ b/pidgin/pixmaps/gaim_msgpend_4bit_16.ico
diff --git a/gtk/pixmaps/gaim_msgunread_16.ico b/pidgin/pixmaps/gaim_msgunread_16.ico
index 8d146aa255..8d146aa255 100644
--- a/gtk/pixmaps/gaim_msgunread_16.ico
+++ b/pidgin/pixmaps/gaim_msgunread_16.ico
diff --git a/gtk/pixmaps/gaim_msgunread_4bit_16.ico b/pidgin/pixmaps/gaim_msgunread_4bit_16.ico
index a88301a48d..a88301a48d 100644
--- a/gtk/pixmaps/gaim_msgunread_4bit_16.ico
+++ b/pidgin/pixmaps/gaim_msgunread_4bit_16.ico
diff --git a/gtk/pixmaps/gaim_offline.ico b/pidgin/pixmaps/gaim_offline.ico
index c684e10dbc..c684e10dbc 100644
--- a/gtk/pixmaps/gaim_offline.ico
+++ b/pidgin/pixmaps/gaim_offline.ico
diff --git a/gtk/pixmaps/gaim_offline_16.ico b/pidgin/pixmaps/gaim_offline_16.ico
index eb16acdb39..eb16acdb39 100644
--- a/gtk/pixmaps/gaim_offline_16.ico
+++ b/pidgin/pixmaps/gaim_offline_16.ico
diff --git a/gtk/pixmaps/gaim_offline_4bit_16.ico b/pidgin/pixmaps/gaim_offline_4bit_16.ico
index 504211da36..504211da36 100644
--- a/gtk/pixmaps/gaim_offline_4bit_16.ico
+++ b/pidgin/pixmaps/gaim_offline_4bit_16.ico
diff --git a/gtk/pixmaps/gaim_question.png b/pidgin/pixmaps/gaim_question.png
index 5b38a7e4c6..5b38a7e4c6 100644
--- a/gtk/pixmaps/gaim_question.png
+++ b/pidgin/pixmaps/gaim_question.png
diff --git a/gtk/pixmaps/gaim_warning.png b/pidgin/pixmaps/gaim_warning.png
index 6744cd517c..6744cd517c 100644
--- a/gtk/pixmaps/gaim_warning.png
+++ b/pidgin/pixmaps/gaim_warning.png
diff --git a/gtk/pixmaps/info.png b/pidgin/pixmaps/info.png
index 5a2cd96561..5a2cd96561 100644
--- a/gtk/pixmaps/info.png
+++ b/pidgin/pixmaps/info.png
diff --git a/gtk/pixmaps/insert-image-small.png b/pidgin/pixmaps/insert-image-small.png
index 8f426b32d7..8f426b32d7 100644
--- a/gtk/pixmaps/insert-image-small.png
+++ b/pidgin/pixmaps/insert-image-small.png
diff --git a/gtk/pixmaps/insert-image.png b/pidgin/pixmaps/insert-image.png
index 4b00c79fd1..4b00c79fd1 100644
--- a/gtk/pixmaps/insert-image.png
+++ b/pidgin/pixmaps/insert-image.png
diff --git a/gtk/pixmaps/insert-link-small.png b/pidgin/pixmaps/insert-link-small.png
index 2c84cb98a8..2c84cb98a8 100644
--- a/gtk/pixmaps/insert-link-small.png
+++ b/pidgin/pixmaps/insert-link-small.png
diff --git a/gtk/pixmaps/insert-smiley-small.png b/pidgin/pixmaps/insert-smiley-small.png
index 1a80dfa430..1a80dfa430 100644
--- a/gtk/pixmaps/insert-smiley-small.png
+++ b/pidgin/pixmaps/insert-smiley-small.png
diff --git a/gtk/pixmaps/logo.png b/pidgin/pixmaps/logo.png
index 58c9c5aa5d..58c9c5aa5d 100644
--- a/gtk/pixmaps/logo.png
+++ b/pidgin/pixmaps/logo.png
diff --git a/gtk/pixmaps/msgpend.png b/pidgin/pixmaps/msgpend.png
index 8af439563b..8af439563b 100644
--- a/gtk/pixmaps/msgpend.png
+++ b/pidgin/pixmaps/msgpend.png
diff --git a/gtk/pixmaps/msgunread.png b/pidgin/pixmaps/msgunread.png
index 3c11cde36c..3c11cde36c 100644
--- a/gtk/pixmaps/msgunread.png
+++ b/pidgin/pixmaps/msgunread.png
diff --git a/gtk/pixmaps/offline.png b/pidgin/pixmaps/offline.png
index 5bd608b83f..5bd608b83f 100644
--- a/gtk/pixmaps/offline.png
+++ b/pidgin/pixmaps/offline.png
diff --git a/gtk/pixmaps/online.png b/pidgin/pixmaps/online.png
index b44b969f0e..b44b969f0e 100644
--- a/gtk/pixmaps/online.png
+++ b/pidgin/pixmaps/online.png
diff --git a/gtk/pixmaps/pause.png b/pidgin/pixmaps/pause.png
index 1e03ef1564..1e03ef1564 100644
--- a/gtk/pixmaps/pause.png
+++ b/pidgin/pixmaps/pause.png
diff --git a/gtk/pixmaps/phone.png b/pidgin/pixmaps/phone.png
index 5e67a785b8..5e67a785b8 100644
--- a/gtk/pixmaps/phone.png
+++ b/pidgin/pixmaps/phone.png
diff --git a/gtk/pixmaps/send-im.png b/pidgin/pixmaps/send-im.png
index 24050346a0..24050346a0 100644
--- a/gtk/pixmaps/send-im.png
+++ b/pidgin/pixmaps/send-im.png
diff --git a/gtk/pixmaps/smileys/Makefile.am b/pidgin/pixmaps/smileys/Makefile.am
index 9b5bce1b71..9b5bce1b71 100644
--- a/gtk/pixmaps/smileys/Makefile.am
+++ b/pidgin/pixmaps/smileys/Makefile.am
diff --git a/gtk/pixmaps/smileys/Makefile.mingw b/pidgin/pixmaps/smileys/Makefile.mingw
index fd5466a6ba..fd5466a6ba 100644
--- a/gtk/pixmaps/smileys/Makefile.mingw
+++ b/pidgin/pixmaps/smileys/Makefile.mingw
diff --git a/gtk/pixmaps/smileys/THEMES-HOWTO b/pidgin/pixmaps/smileys/THEMES-HOWTO
index 5a360794f2..5a360794f2 100644
--- a/gtk/pixmaps/smileys/THEMES-HOWTO
+++ b/pidgin/pixmaps/smileys/THEMES-HOWTO
diff --git a/gtk/pixmaps/smileys/default/Makefile.am b/pidgin/pixmaps/smileys/default/Makefile.am
index b935204644..b935204644 100644
--- a/gtk/pixmaps/smileys/default/Makefile.am
+++ b/pidgin/pixmaps/smileys/default/Makefile.am
diff --git a/gtk/pixmaps/smileys/default/Makefile.mingw b/pidgin/pixmaps/smileys/default/Makefile.mingw
index 41ba989fbe..41ba989fbe 100644
--- a/gtk/pixmaps/smileys/default/Makefile.mingw
+++ b/pidgin/pixmaps/smileys/default/Makefile.mingw
diff --git a/gtk/pixmaps/smileys/default/angel.png b/pidgin/pixmaps/smileys/default/angel.png
index ee133b075a..ee133b075a 100644
--- a/gtk/pixmaps/smileys/default/angel.png
+++ b/pidgin/pixmaps/smileys/default/angel.png
diff --git a/gtk/pixmaps/smileys/default/bigsmile.png b/pidgin/pixmaps/smileys/default/bigsmile.png
index 50fac8217a..50fac8217a 100644
--- a/gtk/pixmaps/smileys/default/bigsmile.png
+++ b/pidgin/pixmaps/smileys/default/bigsmile.png
diff --git a/gtk/pixmaps/smileys/default/burp.png b/pidgin/pixmaps/smileys/default/burp.png
index 7e342b8548..7e342b8548 100644
--- a/gtk/pixmaps/smileys/default/burp.png
+++ b/pidgin/pixmaps/smileys/default/burp.png
diff --git a/gtk/pixmaps/smileys/default/cool.png b/pidgin/pixmaps/smileys/default/cool.png
index 735182f3df..735182f3df 100644
--- a/gtk/pixmaps/smileys/default/cool.png
+++ b/pidgin/pixmaps/smileys/default/cool.png
diff --git a/gtk/pixmaps/smileys/default/crazy.png b/pidgin/pixmaps/smileys/default/crazy.png
index 7a5b11f519..7a5b11f519 100644
--- a/gtk/pixmaps/smileys/default/crazy.png
+++ b/pidgin/pixmaps/smileys/default/crazy.png
diff --git a/gtk/pixmaps/smileys/default/crossedlips.png b/pidgin/pixmaps/smileys/default/crossedlips.png
index c8aae8f8ae..c8aae8f8ae 100644
--- a/gtk/pixmaps/smileys/default/crossedlips.png
+++ b/pidgin/pixmaps/smileys/default/crossedlips.png
diff --git a/gtk/pixmaps/smileys/default/cry.png b/pidgin/pixmaps/smileys/default/cry.png
index c3a60cc735..c3a60cc735 100644
--- a/gtk/pixmaps/smileys/default/cry.png
+++ b/pidgin/pixmaps/smileys/default/cry.png
diff --git a/gtk/pixmaps/smileys/default/download.png b/pidgin/pixmaps/smileys/default/download.png
index 4777737311..4777737311 100644
--- a/gtk/pixmaps/smileys/default/download.png
+++ b/pidgin/pixmaps/smileys/default/download.png
diff --git a/gtk/pixmaps/smileys/default/embarrassed.png b/pidgin/pixmaps/smileys/default/embarrassed.png
index dc62b22544..dc62b22544 100644
--- a/gtk/pixmaps/smileys/default/embarrassed.png
+++ b/pidgin/pixmaps/smileys/default/embarrassed.png
diff --git a/gtk/pixmaps/smileys/default/farted.png b/pidgin/pixmaps/smileys/default/farted.png
index abcc2b376e..abcc2b376e 100644
--- a/gtk/pixmaps/smileys/default/farted.png
+++ b/pidgin/pixmaps/smileys/default/farted.png
diff --git a/gtk/pixmaps/smileys/default/kiss.png b/pidgin/pixmaps/smileys/default/kiss.png
index b1cc090072..b1cc090072 100644
--- a/gtk/pixmaps/smileys/default/kiss.png
+++ b/pidgin/pixmaps/smileys/default/kiss.png
diff --git a/gtk/pixmaps/smileys/default/luke.png b/pidgin/pixmaps/smileys/default/luke.png
index f41d99f01b..f41d99f01b 100644
--- a/gtk/pixmaps/smileys/default/luke.png
+++ b/pidgin/pixmaps/smileys/default/luke.png
diff --git a/gtk/pixmaps/smileys/default/moneymouth.png b/pidgin/pixmaps/smileys/default/moneymouth.png
index ce5687f1d4..ce5687f1d4 100644
--- a/gtk/pixmaps/smileys/default/moneymouth.png
+++ b/pidgin/pixmaps/smileys/default/moneymouth.png
diff --git a/gtk/pixmaps/smileys/default/mrt.png b/pidgin/pixmaps/smileys/default/mrt.png
index 14d8e35e4f..14d8e35e4f 100644
--- a/gtk/pixmaps/smileys/default/mrt.png
+++ b/pidgin/pixmaps/smileys/default/mrt.png
diff --git a/gtk/pixmaps/smileys/default/msn_angel.png b/pidgin/pixmaps/smileys/default/msn_angel.png
index d3ec5eb34a..d3ec5eb34a 100644
--- a/gtk/pixmaps/smileys/default/msn_angel.png
+++ b/pidgin/pixmaps/smileys/default/msn_angel.png
diff --git a/gtk/pixmaps/smileys/default/msn_angry.png b/pidgin/pixmaps/smileys/default/msn_angry.png
index eb701f987b..eb701f987b 100644
--- a/gtk/pixmaps/smileys/default/msn_angry.png
+++ b/pidgin/pixmaps/smileys/default/msn_angry.png
diff --git a/gtk/pixmaps/smileys/default/msn_away.png b/pidgin/pixmaps/smileys/default/msn_away.png
index 7423a13ff0..7423a13ff0 100644
--- a/gtk/pixmaps/smileys/default/msn_away.png
+++ b/pidgin/pixmaps/smileys/default/msn_away.png
diff --git a/gtk/pixmaps/smileys/default/msn_bat.gif b/pidgin/pixmaps/smileys/default/msn_bat.gif
index b77fa2ddf2..b77fa2ddf2 100644
--- a/gtk/pixmaps/smileys/default/msn_bat.gif
+++ b/pidgin/pixmaps/smileys/default/msn_bat.gif
diff --git a/gtk/pixmaps/smileys/default/msn_beer.png b/pidgin/pixmaps/smileys/default/msn_beer.png
index 97acf2a14e..97acf2a14e 100644
--- a/gtk/pixmaps/smileys/default/msn_beer.png
+++ b/pidgin/pixmaps/smileys/default/msn_beer.png
diff --git a/gtk/pixmaps/smileys/default/msn_bowl.png b/pidgin/pixmaps/smileys/default/msn_bowl.png
index 87dff9ce5b..87dff9ce5b 100644
--- a/gtk/pixmaps/smileys/default/msn_bowl.png
+++ b/pidgin/pixmaps/smileys/default/msn_bowl.png
diff --git a/gtk/pixmaps/smileys/default/msn_boy.png b/pidgin/pixmaps/smileys/default/msn_boy.png
index 95adfb0c94..95adfb0c94 100644
--- a/gtk/pixmaps/smileys/default/msn_boy.png
+++ b/pidgin/pixmaps/smileys/default/msn_boy.png
diff --git a/gtk/pixmaps/smileys/default/msn_brb.png b/pidgin/pixmaps/smileys/default/msn_brb.png
index 2dac30b365..2dac30b365 100644
--- a/gtk/pixmaps/smileys/default/msn_brb.png
+++ b/pidgin/pixmaps/smileys/default/msn_brb.png
diff --git a/gtk/pixmaps/smileys/default/msn_brheart.png b/pidgin/pixmaps/smileys/default/msn_brheart.png
index 5c7824188e..5c7824188e 100644
--- a/gtk/pixmaps/smileys/default/msn_brheart.png
+++ b/pidgin/pixmaps/smileys/default/msn_brheart.png
diff --git a/gtk/pixmaps/smileys/default/msn_cake.gif b/pidgin/pixmaps/smileys/default/msn_cake.gif
index 5b81ca7fa1..5b81ca7fa1 100644
--- a/gtk/pixmaps/smileys/default/msn_cake.gif
+++ b/pidgin/pixmaps/smileys/default/msn_cake.gif
diff --git a/gtk/pixmaps/smileys/default/msn_car.png b/pidgin/pixmaps/smileys/default/msn_car.png
index c2cc3f864b..c2cc3f864b 100644
--- a/gtk/pixmaps/smileys/default/msn_car.png
+++ b/pidgin/pixmaps/smileys/default/msn_car.png
diff --git a/gtk/pixmaps/smileys/default/msn_cat.png b/pidgin/pixmaps/smileys/default/msn_cat.png
index f0083d0d68..f0083d0d68 100644
--- a/gtk/pixmaps/smileys/default/msn_cat.png
+++ b/pidgin/pixmaps/smileys/default/msn_cat.png
diff --git a/gtk/pixmaps/smileys/default/msn_cellphone.png b/pidgin/pixmaps/smileys/default/msn_cellphone.png
index 3d4214a648..3d4214a648 100644
--- a/gtk/pixmaps/smileys/default/msn_cellphone.png
+++ b/pidgin/pixmaps/smileys/default/msn_cellphone.png
diff --git a/gtk/pixmaps/smileys/default/msn_cigarette.gif b/pidgin/pixmaps/smileys/default/msn_cigarette.gif
index 8e238a4908..8e238a4908 100644
--- a/gtk/pixmaps/smileys/default/msn_cigarette.gif
+++ b/pidgin/pixmaps/smileys/default/msn_cigarette.gif
diff --git a/gtk/pixmaps/smileys/default/msn_clock.png b/pidgin/pixmaps/smileys/default/msn_clock.png
index 46dfac32e2..46dfac32e2 100644
--- a/gtk/pixmaps/smileys/default/msn_clock.png
+++ b/pidgin/pixmaps/smileys/default/msn_clock.png
diff --git a/gtk/pixmaps/smileys/default/msn_coffee.png b/pidgin/pixmaps/smileys/default/msn_coffee.png
index 40c8af8212..40c8af8212 100644
--- a/gtk/pixmaps/smileys/default/msn_coffee.png
+++ b/pidgin/pixmaps/smileys/default/msn_coffee.png
diff --git a/gtk/pixmaps/smileys/default/msn_coins.png b/pidgin/pixmaps/smileys/default/msn_coins.png
index 51f5b61ff7..51f5b61ff7 100644
--- a/gtk/pixmaps/smileys/default/msn_coins.png
+++ b/pidgin/pixmaps/smileys/default/msn_coins.png
diff --git a/gtk/pixmaps/smileys/default/msn_computer.png b/pidgin/pixmaps/smileys/default/msn_computer.png
index b8739e5622..b8739e5622 100644
--- a/gtk/pixmaps/smileys/default/msn_computer.png
+++ b/pidgin/pixmaps/smileys/default/msn_computer.png
diff --git a/gtk/pixmaps/smileys/default/msn_cry.gif b/pidgin/pixmaps/smileys/default/msn_cry.gif
index dbd2f5acf7..dbd2f5acf7 100644
--- a/gtk/pixmaps/smileys/default/msn_cry.gif
+++ b/pidgin/pixmaps/smileys/default/msn_cry.gif
diff --git a/gtk/pixmaps/smileys/default/msn_deadflower.png b/pidgin/pixmaps/smileys/default/msn_deadflower.png
index e332e94ba8..e332e94ba8 100644
--- a/gtk/pixmaps/smileys/default/msn_deadflower.png
+++ b/pidgin/pixmaps/smileys/default/msn_deadflower.png
diff --git a/gtk/pixmaps/smileys/default/msn_devil.png b/pidgin/pixmaps/smileys/default/msn_devil.png
index 3d10326d81..3d10326d81 100644
--- a/gtk/pixmaps/smileys/default/msn_devil.png
+++ b/pidgin/pixmaps/smileys/default/msn_devil.png
diff --git a/gtk/pixmaps/smileys/default/msn_dog.png b/pidgin/pixmaps/smileys/default/msn_dog.png
index 09e14777d4..09e14777d4 100644
--- a/gtk/pixmaps/smileys/default/msn_dog.png
+++ b/pidgin/pixmaps/smileys/default/msn_dog.png
diff --git a/gtk/pixmaps/smileys/default/msn_dontknow.gif b/pidgin/pixmaps/smileys/default/msn_dontknow.gif
index 5934a43056..5934a43056 100644
--- a/gtk/pixmaps/smileys/default/msn_dontknow.gif
+++ b/pidgin/pixmaps/smileys/default/msn_dontknow.gif
diff --git a/gtk/pixmaps/smileys/default/msn_donttell.png b/pidgin/pixmaps/smileys/default/msn_donttell.png
index 13abbfa42b..13abbfa42b 100644
--- a/gtk/pixmaps/smileys/default/msn_donttell.png
+++ b/pidgin/pixmaps/smileys/default/msn_donttell.png
diff --git a/gtk/pixmaps/smileys/default/msn_drink.png b/pidgin/pixmaps/smileys/default/msn_drink.png
index 9fa91f33ac..9fa91f33ac 100644
--- a/gtk/pixmaps/smileys/default/msn_drink.png
+++ b/pidgin/pixmaps/smileys/default/msn_drink.png
diff --git a/gtk/pixmaps/smileys/default/msn_email.png b/pidgin/pixmaps/smileys/default/msn_email.png
index 6d5bf41d57..6d5bf41d57 100644
--- a/gtk/pixmaps/smileys/default/msn_email.png
+++ b/pidgin/pixmaps/smileys/default/msn_email.png
diff --git a/gtk/pixmaps/smileys/default/msn_embarrassed.png b/pidgin/pixmaps/smileys/default/msn_embarrassed.png
index 7a6df16b97..7a6df16b97 100644
--- a/gtk/pixmaps/smileys/default/msn_embarrassed.png
+++ b/pidgin/pixmaps/smileys/default/msn_embarrassed.png
diff --git a/gtk/pixmaps/smileys/default/msn_eyeroll.gif b/pidgin/pixmaps/smileys/default/msn_eyeroll.gif
index 559cdd3f34..559cdd3f34 100644
--- a/gtk/pixmaps/smileys/default/msn_eyeroll.gif
+++ b/pidgin/pixmaps/smileys/default/msn_eyeroll.gif
diff --git a/gtk/pixmaps/smileys/default/msn_film.png b/pidgin/pixmaps/smileys/default/msn_film.png
index 5080628de8..5080628de8 100644
--- a/gtk/pixmaps/smileys/default/msn_film.png
+++ b/pidgin/pixmaps/smileys/default/msn_film.png
diff --git a/gtk/pixmaps/smileys/default/msn_fingerscrossed.png b/pidgin/pixmaps/smileys/default/msn_fingerscrossed.png
index bbcf3868dc..bbcf3868dc 100644
--- a/gtk/pixmaps/smileys/default/msn_fingerscrossed.png
+++ b/pidgin/pixmaps/smileys/default/msn_fingerscrossed.png
diff --git a/gtk/pixmaps/smileys/default/msn_flower.png b/pidgin/pixmaps/smileys/default/msn_flower.png
index f02d0370b7..f02d0370b7 100644
--- a/gtk/pixmaps/smileys/default/msn_flower.png
+++ b/pidgin/pixmaps/smileys/default/msn_flower.png
diff --git a/gtk/pixmaps/smileys/default/msn_gift.png b/pidgin/pixmaps/smileys/default/msn_gift.png
index 623ffb1ec9..623ffb1ec9 100644
--- a/gtk/pixmaps/smileys/default/msn_gift.png
+++ b/pidgin/pixmaps/smileys/default/msn_gift.png
diff --git a/gtk/pixmaps/smileys/default/msn_girl.png b/pidgin/pixmaps/smileys/default/msn_girl.png
index 9676e8c1e1..9676e8c1e1 100644
--- a/gtk/pixmaps/smileys/default/msn_girl.png
+++ b/pidgin/pixmaps/smileys/default/msn_girl.png
diff --git a/gtk/pixmaps/smileys/default/msn_handcuffs.png b/pidgin/pixmaps/smileys/default/msn_handcuffs.png
index bb4ea35980..bb4ea35980 100644
--- a/gtk/pixmaps/smileys/default/msn_handcuffs.png
+++ b/pidgin/pixmaps/smileys/default/msn_handcuffs.png
diff --git a/gtk/pixmaps/smileys/default/msn_heart.png b/pidgin/pixmaps/smileys/default/msn_heart.png
index 876ebdc3d3..876ebdc3d3 100644
--- a/gtk/pixmaps/smileys/default/msn_heart.png
+++ b/pidgin/pixmaps/smileys/default/msn_heart.png
diff --git a/gtk/pixmaps/smileys/default/msn_highfive.png b/pidgin/pixmaps/smileys/default/msn_highfive.png
index 700301f4a8..700301f4a8 100644
--- a/gtk/pixmaps/smileys/default/msn_highfive.png
+++ b/pidgin/pixmaps/smileys/default/msn_highfive.png
diff --git a/gtk/pixmaps/smileys/default/msn_hot.png b/pidgin/pixmaps/smileys/default/msn_hot.png
index f5f86fe392..f5f86fe392 100644
--- a/gtk/pixmaps/smileys/default/msn_hot.png
+++ b/pidgin/pixmaps/smileys/default/msn_hot.png
diff --git a/gtk/pixmaps/smileys/default/msn_icon.png b/pidgin/pixmaps/smileys/default/msn_icon.png
index e9fb4a590d..e9fb4a590d 100644
--- a/gtk/pixmaps/smileys/default/msn_icon.png
+++ b/pidgin/pixmaps/smileys/default/msn_icon.png
diff --git a/gtk/pixmaps/smileys/default/msn_idea.png b/pidgin/pixmaps/smileys/default/msn_idea.png
index 0929d84cc4..0929d84cc4 100644
--- a/gtk/pixmaps/smileys/default/msn_idea.png
+++ b/pidgin/pixmaps/smileys/default/msn_idea.png
diff --git a/gtk/pixmaps/smileys/default/msn_island.png b/pidgin/pixmaps/smileys/default/msn_island.png
index 45527e2b30..45527e2b30 100644
--- a/gtk/pixmaps/smileys/default/msn_island.png
+++ b/pidgin/pixmaps/smileys/default/msn_island.png
diff --git a/gtk/pixmaps/smileys/default/msn_kiss.png b/pidgin/pixmaps/smileys/default/msn_kiss.png
index 1746db6fa7..1746db6fa7 100644
--- a/gtk/pixmaps/smileys/default/msn_kiss.png
+++ b/pidgin/pixmaps/smileys/default/msn_kiss.png
diff --git a/gtk/pixmaps/smileys/default/msn_laugh.png b/pidgin/pixmaps/smileys/default/msn_laugh.png
index 33eed13830..33eed13830 100644
--- a/gtk/pixmaps/smileys/default/msn_laugh.png
+++ b/pidgin/pixmaps/smileys/default/msn_laugh.png
diff --git a/gtk/pixmaps/smileys/default/msn_lightning.gif b/pidgin/pixmaps/smileys/default/msn_lightning.gif
index 4f69f0f03d..4f69f0f03d 100644
--- a/gtk/pixmaps/smileys/default/msn_lightning.gif
+++ b/pidgin/pixmaps/smileys/default/msn_lightning.gif
diff --git a/gtk/pixmaps/smileys/default/msn_nerd.png b/pidgin/pixmaps/smileys/default/msn_nerd.png
index 5ffec1d454..5ffec1d454 100644
--- a/gtk/pixmaps/smileys/default/msn_nerd.png
+++ b/pidgin/pixmaps/smileys/default/msn_nerd.png
diff --git a/gtk/pixmaps/smileys/default/msn_neutral.png b/pidgin/pixmaps/smileys/default/msn_neutral.png
index 1aefc666c5..1aefc666c5 100644
--- a/gtk/pixmaps/smileys/default/msn_neutral.png
+++ b/pidgin/pixmaps/smileys/default/msn_neutral.png
diff --git a/gtk/pixmaps/smileys/default/msn_note.png b/pidgin/pixmaps/smileys/default/msn_note.png
index e5a0309124..e5a0309124 100644
--- a/gtk/pixmaps/smileys/default/msn_note.png
+++ b/pidgin/pixmaps/smileys/default/msn_note.png
diff --git a/gtk/pixmaps/smileys/default/msn_occ.png b/pidgin/pixmaps/smileys/default/msn_occ.png
index daf84f648f..daf84f648f 100644
--- a/gtk/pixmaps/smileys/default/msn_occ.png
+++ b/pidgin/pixmaps/smileys/default/msn_occ.png
diff --git a/gtk/pixmaps/smileys/default/msn_online.png b/pidgin/pixmaps/smileys/default/msn_online.png
index 2cf5bbaabd..2cf5bbaabd 100644
--- a/gtk/pixmaps/smileys/default/msn_online.png
+++ b/pidgin/pixmaps/smileys/default/msn_online.png
diff --git a/gtk/pixmaps/smileys/default/msn_ooooh.png b/pidgin/pixmaps/smileys/default/msn_ooooh.png
index 2e2b7cab9b..2e2b7cab9b 100644
--- a/gtk/pixmaps/smileys/default/msn_ooooh.png
+++ b/pidgin/pixmaps/smileys/default/msn_ooooh.png
diff --git a/gtk/pixmaps/smileys/default/msn_party.gif b/pidgin/pixmaps/smileys/default/msn_party.gif
index 9336aabd50..9336aabd50 100644
--- a/gtk/pixmaps/smileys/default/msn_party.gif
+++ b/pidgin/pixmaps/smileys/default/msn_party.gif
diff --git a/gtk/pixmaps/smileys/default/msn_phone.png b/pidgin/pixmaps/smileys/default/msn_phone.png
index 0cdc41370a..0cdc41370a 100644
--- a/gtk/pixmaps/smileys/default/msn_phone.png
+++ b/pidgin/pixmaps/smileys/default/msn_phone.png
diff --git a/gtk/pixmaps/smileys/default/msn_photo.png b/pidgin/pixmaps/smileys/default/msn_photo.png
index 1c09f46c26..1c09f46c26 100644
--- a/gtk/pixmaps/smileys/default/msn_photo.png
+++ b/pidgin/pixmaps/smileys/default/msn_photo.png
diff --git a/gtk/pixmaps/smileys/default/msn_pizza.png b/pidgin/pixmaps/smileys/default/msn_pizza.png
index c3bfcfabcc..c3bfcfabcc 100644
--- a/gtk/pixmaps/smileys/default/msn_pizza.png
+++ b/pidgin/pixmaps/smileys/default/msn_pizza.png
diff --git a/gtk/pixmaps/smileys/default/msn_plane.png b/pidgin/pixmaps/smileys/default/msn_plane.png
index 5214528d99..5214528d99 100644
--- a/gtk/pixmaps/smileys/default/msn_plane.png
+++ b/pidgin/pixmaps/smileys/default/msn_plane.png
diff --git a/gtk/pixmaps/smileys/default/msn_plate.png b/pidgin/pixmaps/smileys/default/msn_plate.png
index 353f7a4969..353f7a4969 100644
--- a/gtk/pixmaps/smileys/default/msn_plate.png
+++ b/pidgin/pixmaps/smileys/default/msn_plate.png
diff --git a/gtk/pixmaps/smileys/default/msn_question.png b/pidgin/pixmaps/smileys/default/msn_question.png
index 3485197590..3485197590 100644
--- a/gtk/pixmaps/smileys/default/msn_question.png
+++ b/pidgin/pixmaps/smileys/default/msn_question.png
diff --git a/gtk/pixmaps/smileys/default/msn_rainbow.png b/pidgin/pixmaps/smileys/default/msn_rainbow.png
index a0cae1c096..a0cae1c096 100644
--- a/gtk/pixmaps/smileys/default/msn_rainbow.png
+++ b/pidgin/pixmaps/smileys/default/msn_rainbow.png
diff --git a/gtk/pixmaps/smileys/default/msn_run.png b/pidgin/pixmaps/smileys/default/msn_run.png
index f2f4a3dfb1..f2f4a3dfb1 100644
--- a/gtk/pixmaps/smileys/default/msn_run.png
+++ b/pidgin/pixmaps/smileys/default/msn_run.png
diff --git a/gtk/pixmaps/smileys/default/msn_runback.png b/pidgin/pixmaps/smileys/default/msn_runback.png
index 5caa9971d9..5caa9971d9 100644
--- a/gtk/pixmaps/smileys/default/msn_runback.png
+++ b/pidgin/pixmaps/smileys/default/msn_runback.png
diff --git a/gtk/pixmaps/smileys/default/msn_sad.png b/pidgin/pixmaps/smileys/default/msn_sad.png
index ee2e712ac9..ee2e712ac9 100644
--- a/gtk/pixmaps/smileys/default/msn_sad.png
+++ b/pidgin/pixmaps/smileys/default/msn_sad.png
diff --git a/gtk/pixmaps/smileys/default/msn_sarcastic.png b/pidgin/pixmaps/smileys/default/msn_sarcastic.png
index 2fab70b4d0..2fab70b4d0 100644
--- a/gtk/pixmaps/smileys/default/msn_sarcastic.png
+++ b/pidgin/pixmaps/smileys/default/msn_sarcastic.png
diff --git a/gtk/pixmaps/smileys/default/msn_secret.png b/pidgin/pixmaps/smileys/default/msn_secret.png
index 48900135d5..48900135d5 100644
--- a/gtk/pixmaps/smileys/default/msn_secret.png
+++ b/pidgin/pixmaps/smileys/default/msn_secret.png
diff --git a/gtk/pixmaps/smileys/default/msn_sheep.png b/pidgin/pixmaps/smileys/default/msn_sheep.png
index 9123bf0895..9123bf0895 100644
--- a/gtk/pixmaps/smileys/default/msn_sheep.png
+++ b/pidgin/pixmaps/smileys/default/msn_sheep.png
diff --git a/gtk/pixmaps/smileys/default/msn_sick.png b/pidgin/pixmaps/smileys/default/msn_sick.png
index d430dcc2ae..d430dcc2ae 100644
--- a/gtk/pixmaps/smileys/default/msn_sick.png
+++ b/pidgin/pixmaps/smileys/default/msn_sick.png
diff --git a/gtk/pixmaps/smileys/default/msn_sleep.png b/pidgin/pixmaps/smileys/default/msn_sleep.png
index 3f32a9b4ff..3f32a9b4ff 100644
--- a/gtk/pixmaps/smileys/default/msn_sleep.png
+++ b/pidgin/pixmaps/smileys/default/msn_sleep.png
diff --git a/gtk/pixmaps/smileys/default/msn_sleepy.gif b/pidgin/pixmaps/smileys/default/msn_sleepy.gif
index 6eaf9233f8..6eaf9233f8 100644
--- a/gtk/pixmaps/smileys/default/msn_sleepy.gif
+++ b/pidgin/pixmaps/smileys/default/msn_sleepy.gif
diff --git a/gtk/pixmaps/smileys/default/msn_smiley.png b/pidgin/pixmaps/smileys/default/msn_smiley.png
index 6034c246e2..6034c246e2 100644
--- a/gtk/pixmaps/smileys/default/msn_smiley.png
+++ b/pidgin/pixmaps/smileys/default/msn_smiley.png
diff --git a/gtk/pixmaps/smileys/default/msn_snail.png b/pidgin/pixmaps/smileys/default/msn_snail.png
index 6d92018f02..6d92018f02 100644
--- a/gtk/pixmaps/smileys/default/msn_snail.png
+++ b/pidgin/pixmaps/smileys/default/msn_snail.png
diff --git a/gtk/pixmaps/smileys/default/msn_soccer.png b/pidgin/pixmaps/smileys/default/msn_soccer.png
index 3060c346cc..3060c346cc 100644
--- a/gtk/pixmaps/smileys/default/msn_soccer.png
+++ b/pidgin/pixmaps/smileys/default/msn_soccer.png
diff --git a/gtk/pixmaps/smileys/default/msn_star.png b/pidgin/pixmaps/smileys/default/msn_star.png
index 83fc49aae4..83fc49aae4 100644
--- a/gtk/pixmaps/smileys/default/msn_star.png
+++ b/pidgin/pixmaps/smileys/default/msn_star.png
diff --git a/gtk/pixmaps/smileys/default/msn_stormy.png b/pidgin/pixmaps/smileys/default/msn_stormy.png
index 31faa586e9..31faa586e9 100644
--- a/gtk/pixmaps/smileys/default/msn_stormy.png
+++ b/pidgin/pixmaps/smileys/default/msn_stormy.png
diff --git a/gtk/pixmaps/smileys/default/msn_sun.png b/pidgin/pixmaps/smileys/default/msn_sun.png
index 11396089d7..11396089d7 100644
--- a/gtk/pixmaps/smileys/default/msn_sun.png
+++ b/pidgin/pixmaps/smileys/default/msn_sun.png
diff --git a/gtk/pixmaps/smileys/default/msn_sunglasses.png b/pidgin/pixmaps/smileys/default/msn_sunglasses.png
index 8738f472c0..8738f472c0 100644
--- a/gtk/pixmaps/smileys/default/msn_sunglasses.png
+++ b/pidgin/pixmaps/smileys/default/msn_sunglasses.png
diff --git a/gtk/pixmaps/smileys/default/msn_teeth.png b/pidgin/pixmaps/smileys/default/msn_teeth.png
index 39f2ee5c4a..39f2ee5c4a 100644
--- a/gtk/pixmaps/smileys/default/msn_teeth.png
+++ b/pidgin/pixmaps/smileys/default/msn_teeth.png
diff --git a/gtk/pixmaps/smileys/default/msn_think.gif b/pidgin/pixmaps/smileys/default/msn_think.gif
index 63750f7e33..63750f7e33 100644
--- a/gtk/pixmaps/smileys/default/msn_think.gif
+++ b/pidgin/pixmaps/smileys/default/msn_think.gif
diff --git a/gtk/pixmaps/smileys/default/msn_thumbdown.png b/pidgin/pixmaps/smileys/default/msn_thumbdown.png
index 3ac87efccb..3ac87efccb 100644
--- a/gtk/pixmaps/smileys/default/msn_thumbdown.png
+++ b/pidgin/pixmaps/smileys/default/msn_thumbdown.png
diff --git a/gtk/pixmaps/smileys/default/msn_thumbup.png b/pidgin/pixmaps/smileys/default/msn_thumbup.png
index 221068851b..221068851b 100644
--- a/gtk/pixmaps/smileys/default/msn_thumbup.png
+++ b/pidgin/pixmaps/smileys/default/msn_thumbup.png
diff --git a/gtk/pixmaps/smileys/default/msn_tongue.png b/pidgin/pixmaps/smileys/default/msn_tongue.png
index 6864713246..6864713246 100644
--- a/gtk/pixmaps/smileys/default/msn_tongue.png
+++ b/pidgin/pixmaps/smileys/default/msn_tongue.png
diff --git a/gtk/pixmaps/smileys/default/msn_turtle.png b/pidgin/pixmaps/smileys/default/msn_turtle.png
index 36ec86f9cd..36ec86f9cd 100644
--- a/gtk/pixmaps/smileys/default/msn_turtle.png
+++ b/pidgin/pixmaps/smileys/default/msn_turtle.png
diff --git a/gtk/pixmaps/smileys/default/msn_umbrella.png b/pidgin/pixmaps/smileys/default/msn_umbrella.png
index be6405bafd..be6405bafd 100644
--- a/gtk/pixmaps/smileys/default/msn_umbrella.png
+++ b/pidgin/pixmaps/smileys/default/msn_umbrella.png
diff --git a/gtk/pixmaps/smileys/default/msn_weird.png b/pidgin/pixmaps/smileys/default/msn_weird.png
index f0b7cbd427..f0b7cbd427 100644
--- a/gtk/pixmaps/smileys/default/msn_weird.png
+++ b/pidgin/pixmaps/smileys/default/msn_weird.png
diff --git a/gtk/pixmaps/smileys/default/msn_wink.gif b/pidgin/pixmaps/smileys/default/msn_wink.gif
index fc95fad49f..fc95fad49f 100644
--- a/gtk/pixmaps/smileys/default/msn_wink.gif
+++ b/pidgin/pixmaps/smileys/default/msn_wink.gif
diff --git a/gtk/pixmaps/smileys/default/msn_xbox.png b/pidgin/pixmaps/smileys/default/msn_xbox.png
index 7a7e13fa09..7a7e13fa09 100644
--- a/gtk/pixmaps/smileys/default/msn_xbox.png
+++ b/pidgin/pixmaps/smileys/default/msn_xbox.png
diff --git a/gtk/pixmaps/smileys/default/oneeye.png b/pidgin/pixmaps/smileys/default/oneeye.png
index 2ae98be9a6..2ae98be9a6 100644
--- a/gtk/pixmaps/smileys/default/oneeye.png
+++ b/pidgin/pixmaps/smileys/default/oneeye.png
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_0.gif b/pidgin/pixmaps/smileys/default/qq_smiley_0.gif
index b41085c5e0..b41085c5e0 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_0.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_0.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_1.gif b/pidgin/pixmaps/smileys/default/qq_smiley_1.gif
index afdb7544d8..afdb7544d8 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_1.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_1.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_10.gif b/pidgin/pixmaps/smileys/default/qq_smiley_10.gif
index 2759f7e1a5..2759f7e1a5 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_10.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_10.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_11.gif b/pidgin/pixmaps/smileys/default/qq_smiley_11.gif
index 4c6bc49bbd..4c6bc49bbd 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_11.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_11.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_12.gif b/pidgin/pixmaps/smileys/default/qq_smiley_12.gif
index 5942faadcb..5942faadcb 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_12.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_12.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_13.gif b/pidgin/pixmaps/smileys/default/qq_smiley_13.gif
index 93177dc173..93177dc173 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_13.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_13.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_14.gif b/pidgin/pixmaps/smileys/default/qq_smiley_14.gif
index bc2afe0d1d..bc2afe0d1d 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_14.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_14.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_15.gif b/pidgin/pixmaps/smileys/default/qq_smiley_15.gif
index e422fe8f22..e422fe8f22 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_15.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_15.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_16.gif b/pidgin/pixmaps/smileys/default/qq_smiley_16.gif
index 63205cbaab..63205cbaab 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_16.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_16.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_17.gif b/pidgin/pixmaps/smileys/default/qq_smiley_17.gif
index 7429c06586..7429c06586 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_17.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_17.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_18.gif b/pidgin/pixmaps/smileys/default/qq_smiley_18.gif
index 2394d7a8db..2394d7a8db 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_18.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_18.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_19.gif b/pidgin/pixmaps/smileys/default/qq_smiley_19.gif
index 5ddba663fd..5ddba663fd 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_19.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_19.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_2.gif b/pidgin/pixmaps/smileys/default/qq_smiley_2.gif
index 5551a74fd4..5551a74fd4 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_2.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_2.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_20.gif b/pidgin/pixmaps/smileys/default/qq_smiley_20.gif
index 5368a54400..5368a54400 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_20.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_20.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_21.gif b/pidgin/pixmaps/smileys/default/qq_smiley_21.gif
index 82ee7f078e..82ee7f078e 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_21.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_21.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_22.gif b/pidgin/pixmaps/smileys/default/qq_smiley_22.gif
index ebbdc87fe0..ebbdc87fe0 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_22.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_22.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_23.gif b/pidgin/pixmaps/smileys/default/qq_smiley_23.gif
index 42863bed7d..42863bed7d 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_23.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_23.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_24.gif b/pidgin/pixmaps/smileys/default/qq_smiley_24.gif
index 98d021ec2a..98d021ec2a 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_24.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_24.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_25.gif b/pidgin/pixmaps/smileys/default/qq_smiley_25.gif
index e63af3dc81..e63af3dc81 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_25.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_25.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_26.gif b/pidgin/pixmaps/smileys/default/qq_smiley_26.gif
index 3f6301608f..3f6301608f 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_26.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_26.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_27.gif b/pidgin/pixmaps/smileys/default/qq_smiley_27.gif
index 7568ea02fc..7568ea02fc 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_27.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_27.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_28.gif b/pidgin/pixmaps/smileys/default/qq_smiley_28.gif
index 96908ea515..96908ea515 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_28.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_28.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_29.gif b/pidgin/pixmaps/smileys/default/qq_smiley_29.gif
index 0ef337d7c6..0ef337d7c6 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_29.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_29.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_3.gif b/pidgin/pixmaps/smileys/default/qq_smiley_3.gif
index e5782cc58f..e5782cc58f 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_3.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_3.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_30.gif b/pidgin/pixmaps/smileys/default/qq_smiley_30.gif
index 54fd99cd3e..54fd99cd3e 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_30.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_30.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_31.gif b/pidgin/pixmaps/smileys/default/qq_smiley_31.gif
index 8ee2336567..8ee2336567 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_31.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_31.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_32.gif b/pidgin/pixmaps/smileys/default/qq_smiley_32.gif
index 984fa17d62..984fa17d62 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_32.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_32.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_33.gif b/pidgin/pixmaps/smileys/default/qq_smiley_33.gif
index e014262d34..e014262d34 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_33.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_33.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_34.gif b/pidgin/pixmaps/smileys/default/qq_smiley_34.gif
index 3b0d05680f..3b0d05680f 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_34.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_34.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_35.gif b/pidgin/pixmaps/smileys/default/qq_smiley_35.gif
index 95c5188918..95c5188918 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_35.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_35.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_36.gif b/pidgin/pixmaps/smileys/default/qq_smiley_36.gif
index 1f204cd209..1f204cd209 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_36.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_36.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_37.gif b/pidgin/pixmaps/smileys/default/qq_smiley_37.gif
index 7dcba948d6..7dcba948d6 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_37.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_37.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_38.gif b/pidgin/pixmaps/smileys/default/qq_smiley_38.gif
index 6d272102fc..6d272102fc 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_38.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_38.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_39.gif b/pidgin/pixmaps/smileys/default/qq_smiley_39.gif
index a3cd0dddb3..a3cd0dddb3 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_39.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_39.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_4.gif b/pidgin/pixmaps/smileys/default/qq_smiley_4.gif
index 2a6754d338..2a6754d338 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_4.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_4.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_40.gif b/pidgin/pixmaps/smileys/default/qq_smiley_40.gif
index 151adb16e6..151adb16e6 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_40.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_40.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_41.gif b/pidgin/pixmaps/smileys/default/qq_smiley_41.gif
index dd6f2bfbd9..dd6f2bfbd9 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_41.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_41.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_42.gif b/pidgin/pixmaps/smileys/default/qq_smiley_42.gif
index be103fc147..be103fc147 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_42.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_42.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_43.gif b/pidgin/pixmaps/smileys/default/qq_smiley_43.gif
index 17d2408aaa..17d2408aaa 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_43.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_43.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_44.gif b/pidgin/pixmaps/smileys/default/qq_smiley_44.gif
index 3df485986f..3df485986f 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_44.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_44.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_45.gif b/pidgin/pixmaps/smileys/default/qq_smiley_45.gif
index fdae019f6f..fdae019f6f 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_45.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_45.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_46.gif b/pidgin/pixmaps/smileys/default/qq_smiley_46.gif
index 8566f65a92..8566f65a92 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_46.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_46.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_47.gif b/pidgin/pixmaps/smileys/default/qq_smiley_47.gif
index 554ebe7fda..554ebe7fda 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_47.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_47.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_48.gif b/pidgin/pixmaps/smileys/default/qq_smiley_48.gif
index 490832da97..490832da97 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_48.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_48.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_49.gif b/pidgin/pixmaps/smileys/default/qq_smiley_49.gif
index ae5e2a1cc5..ae5e2a1cc5 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_49.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_49.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_5.gif b/pidgin/pixmaps/smileys/default/qq_smiley_5.gif
index 551d47b488..551d47b488 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_5.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_5.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_50.gif b/pidgin/pixmaps/smileys/default/qq_smiley_50.gif
index ae62ddbc82..ae62ddbc82 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_50.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_50.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_51.gif b/pidgin/pixmaps/smileys/default/qq_smiley_51.gif
index f478e3250d..f478e3250d 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_51.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_51.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_52.gif b/pidgin/pixmaps/smileys/default/qq_smiley_52.gif
index b12e601ad4..b12e601ad4 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_52.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_52.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_53.gif b/pidgin/pixmaps/smileys/default/qq_smiley_53.gif
index b6b686401f..b6b686401f 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_53.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_53.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_54.gif b/pidgin/pixmaps/smileys/default/qq_smiley_54.gif
index 22d1471359..22d1471359 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_54.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_54.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_55.gif b/pidgin/pixmaps/smileys/default/qq_smiley_55.gif
index 764ed05146..764ed05146 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_55.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_55.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_56.gif b/pidgin/pixmaps/smileys/default/qq_smiley_56.gif
index 6875afadfd..6875afadfd 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_56.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_56.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_57.gif b/pidgin/pixmaps/smileys/default/qq_smiley_57.gif
index 691fc062c6..691fc062c6 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_57.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_57.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_58.gif b/pidgin/pixmaps/smileys/default/qq_smiley_58.gif
index 0912cb1fd5..0912cb1fd5 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_58.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_58.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_59.gif b/pidgin/pixmaps/smileys/default/qq_smiley_59.gif
index 2f0bd6ca9c..2f0bd6ca9c 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_59.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_59.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_6.gif b/pidgin/pixmaps/smileys/default/qq_smiley_6.gif
index 449dfa9ec8..449dfa9ec8 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_6.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_6.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_60.gif b/pidgin/pixmaps/smileys/default/qq_smiley_60.gif
index 0f0bb71587..0f0bb71587 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_60.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_60.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_61.gif b/pidgin/pixmaps/smileys/default/qq_smiley_61.gif
index c641ef4025..c641ef4025 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_61.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_61.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_62.gif b/pidgin/pixmaps/smileys/default/qq_smiley_62.gif
index d9a0cadd84..d9a0cadd84 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_62.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_62.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_63.gif b/pidgin/pixmaps/smileys/default/qq_smiley_63.gif
index 7d5297572c..7d5297572c 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_63.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_63.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_64.gif b/pidgin/pixmaps/smileys/default/qq_smiley_64.gif
index ce0c1f2797..ce0c1f2797 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_64.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_64.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_65.gif b/pidgin/pixmaps/smileys/default/qq_smiley_65.gif
index d9fc3f9cb9..d9fc3f9cb9 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_65.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_65.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_66.gif b/pidgin/pixmaps/smileys/default/qq_smiley_66.gif
index 2e9cefb7b7..2e9cefb7b7 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_66.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_66.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_67.gif b/pidgin/pixmaps/smileys/default/qq_smiley_67.gif
index 2a48cd0d4b..2a48cd0d4b 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_67.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_67.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_68.gif b/pidgin/pixmaps/smileys/default/qq_smiley_68.gif
index 65607ef7bc..65607ef7bc 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_68.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_68.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_69.gif b/pidgin/pixmaps/smileys/default/qq_smiley_69.gif
index efd3260674..efd3260674 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_69.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_69.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_7.gif b/pidgin/pixmaps/smileys/default/qq_smiley_7.gif
index 729f2d77c5..729f2d77c5 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_7.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_7.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_70.gif b/pidgin/pixmaps/smileys/default/qq_smiley_70.gif
index 343b2a9e9c..343b2a9e9c 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_70.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_70.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_71.gif b/pidgin/pixmaps/smileys/default/qq_smiley_71.gif
index 13889d9175..13889d9175 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_71.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_71.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_72.gif b/pidgin/pixmaps/smileys/default/qq_smiley_72.gif
index 328c7f7601..328c7f7601 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_72.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_72.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_73.gif b/pidgin/pixmaps/smileys/default/qq_smiley_73.gif
index 2b20bc5de8..2b20bc5de8 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_73.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_73.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_74.gif b/pidgin/pixmaps/smileys/default/qq_smiley_74.gif
index 30b8fc83f5..30b8fc83f5 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_74.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_74.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_75.gif b/pidgin/pixmaps/smileys/default/qq_smiley_75.gif
index 92e13fdf06..92e13fdf06 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_75.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_75.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_76.gif b/pidgin/pixmaps/smileys/default/qq_smiley_76.gif
index 4a3efa9038..4a3efa9038 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_76.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_76.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_77.gif b/pidgin/pixmaps/smileys/default/qq_smiley_77.gif
index a911722390..a911722390 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_77.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_77.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_78.gif b/pidgin/pixmaps/smileys/default/qq_smiley_78.gif
index 877cea834b..877cea834b 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_78.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_78.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_79.gif b/pidgin/pixmaps/smileys/default/qq_smiley_79.gif
index bc54d87c18..bc54d87c18 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_79.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_79.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_8.gif b/pidgin/pixmaps/smileys/default/qq_smiley_8.gif
index a13bf7b7ec..a13bf7b7ec 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_8.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_8.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_80.gif b/pidgin/pixmaps/smileys/default/qq_smiley_80.gif
index 48b67cea25..48b67cea25 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_80.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_80.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_81.gif b/pidgin/pixmaps/smileys/default/qq_smiley_81.gif
index d788f4125b..d788f4125b 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_81.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_81.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_82.gif b/pidgin/pixmaps/smileys/default/qq_smiley_82.gif
index b499087bff..b499087bff 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_82.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_82.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_83.gif b/pidgin/pixmaps/smileys/default/qq_smiley_83.gif
index afcaf74728..afcaf74728 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_83.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_83.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_84.gif b/pidgin/pixmaps/smileys/default/qq_smiley_84.gif
index 3f2c04e8a4..3f2c04e8a4 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_84.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_84.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_85.gif b/pidgin/pixmaps/smileys/default/qq_smiley_85.gif
index c2d8e24b71..c2d8e24b71 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_85.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_85.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_86.gif b/pidgin/pixmaps/smileys/default/qq_smiley_86.gif
index 1d02da26aa..1d02da26aa 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_86.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_86.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_87.gif b/pidgin/pixmaps/smileys/default/qq_smiley_87.gif
index 196537b901..196537b901 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_87.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_87.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_88.gif b/pidgin/pixmaps/smileys/default/qq_smiley_88.gif
index 919b348c7b..919b348c7b 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_88.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_88.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_89.gif b/pidgin/pixmaps/smileys/default/qq_smiley_89.gif
index 7c7f1a1042..7c7f1a1042 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_89.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_89.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_9.gif b/pidgin/pixmaps/smileys/default/qq_smiley_9.gif
index 312b4a4950..312b4a4950 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_9.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_9.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_90.gif b/pidgin/pixmaps/smileys/default/qq_smiley_90.gif
index 4b7efe91df..4b7efe91df 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_90.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_90.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_91.gif b/pidgin/pixmaps/smileys/default/qq_smiley_91.gif
index bb60f8f0d9..bb60f8f0d9 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_91.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_91.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_92.gif b/pidgin/pixmaps/smileys/default/qq_smiley_92.gif
index d551aa0100..d551aa0100 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_92.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_92.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_93.gif b/pidgin/pixmaps/smileys/default/qq_smiley_93.gif
index ba4c247e1b..ba4c247e1b 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_93.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_93.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_94.gif b/pidgin/pixmaps/smileys/default/qq_smiley_94.gif
index f2275c73a9..f2275c73a9 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_94.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_94.gif
diff --git a/gtk/pixmaps/smileys/default/qq_smiley_95.gif b/pidgin/pixmaps/smileys/default/qq_smiley_95.gif
index d053f23db9..d053f23db9 100644
--- a/gtk/pixmaps/smileys/default/qq_smiley_95.gif
+++ b/pidgin/pixmaps/smileys/default/qq_smiley_95.gif
diff --git a/gtk/pixmaps/smileys/default/sad.png b/pidgin/pixmaps/smileys/default/sad.png
index 805436ff23..805436ff23 100644
--- a/gtk/pixmaps/smileys/default/sad.png
+++ b/pidgin/pixmaps/smileys/default/sad.png
diff --git a/gtk/pixmaps/smileys/default/scream.png b/pidgin/pixmaps/smileys/default/scream.png
index 11578af7fc..11578af7fc 100644
--- a/gtk/pixmaps/smileys/default/scream.png
+++ b/pidgin/pixmaps/smileys/default/scream.png
diff --git a/gtk/pixmaps/smileys/default/smile.png b/pidgin/pixmaps/smileys/default/smile.png
index 6051dac7f4..6051dac7f4 100644
--- a/gtk/pixmaps/smileys/default/smile.png
+++ b/pidgin/pixmaps/smileys/default/smile.png
diff --git a/gtk/pixmaps/smileys/default/theme b/pidgin/pixmaps/smileys/default/theme
index 3cc64a0f9e..3cc64a0f9e 100644
--- a/gtk/pixmaps/smileys/default/theme
+++ b/pidgin/pixmaps/smileys/default/theme
diff --git a/gtk/pixmaps/smileys/default/think.png b/pidgin/pixmaps/smileys/default/think.png
index d59445dbf4..d59445dbf4 100644
--- a/gtk/pixmaps/smileys/default/think.png
+++ b/pidgin/pixmaps/smileys/default/think.png
diff --git a/gtk/pixmaps/smileys/default/tongue.png b/pidgin/pixmaps/smileys/default/tongue.png
index af7eb6a30f..af7eb6a30f 100644
--- a/gtk/pixmaps/smileys/default/tongue.png
+++ b/pidgin/pixmaps/smileys/default/tongue.png
diff --git a/gtk/pixmaps/smileys/default/wink.png b/pidgin/pixmaps/smileys/default/wink.png
index 8f5778fd0f..8f5778fd0f 100644
--- a/gtk/pixmaps/smileys/default/wink.png
+++ b/pidgin/pixmaps/smileys/default/wink.png
diff --git a/gtk/pixmaps/smileys/default/yahoo_alien.gif b/pidgin/pixmaps/smileys/default/yahoo_alien.gif
index 085cab2b35..085cab2b35 100644
--- a/gtk/pixmaps/smileys/default/yahoo_alien.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_alien.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_alien2.gif b/pidgin/pixmaps/smileys/default/yahoo_alien2.gif
index 07ee74241f..07ee74241f 100644
--- a/gtk/pixmaps/smileys/default/yahoo_alien2.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_alien2.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_angel.gif b/pidgin/pixmaps/smileys/default/yahoo_angel.gif
index 2f4ef2a0d0..2f4ef2a0d0 100644
--- a/gtk/pixmaps/smileys/default/yahoo_angel.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_angel.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_angry.gif b/pidgin/pixmaps/smileys/default/yahoo_angry.gif
index 9db2cd9f64..9db2cd9f64 100644
--- a/gtk/pixmaps/smileys/default/yahoo_angry.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_angry.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_batting.gif b/pidgin/pixmaps/smileys/default/yahoo_batting.gif
index 32b73e09d7..32b73e09d7 100644
--- a/gtk/pixmaps/smileys/default/yahoo_batting.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_batting.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_beatup.gif b/pidgin/pixmaps/smileys/default/yahoo_beatup.gif
index c3c22c8919..c3c22c8919 100644
--- a/gtk/pixmaps/smileys/default/yahoo_beatup.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_beatup.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_bigsmile.gif b/pidgin/pixmaps/smileys/default/yahoo_bigsmile.gif
index cab160e573..cab160e573 100644
--- a/gtk/pixmaps/smileys/default/yahoo_bigsmile.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_bigsmile.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_blush.gif b/pidgin/pixmaps/smileys/default/yahoo_blush.gif
index 34e321339f..34e321339f 100644
--- a/gtk/pixmaps/smileys/default/yahoo_blush.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_blush.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_brokenheart.gif b/pidgin/pixmaps/smileys/default/yahoo_brokenheart.gif
index 1804f234b4..1804f234b4 100644
--- a/gtk/pixmaps/smileys/default/yahoo_brokenheart.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_brokenheart.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_bye.gif b/pidgin/pixmaps/smileys/default/yahoo_bye.gif
index e9d115b5cb..e9d115b5cb 100644
--- a/gtk/pixmaps/smileys/default/yahoo_bye.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_bye.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_chicken.gif b/pidgin/pixmaps/smileys/default/yahoo_chicken.gif
index c5cf7b5f62..c5cf7b5f62 100644
--- a/gtk/pixmaps/smileys/default/yahoo_chicken.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_chicken.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_clap.gif b/pidgin/pixmaps/smileys/default/yahoo_clap.gif
index d8e3a099da..d8e3a099da 100644
--- a/gtk/pixmaps/smileys/default/yahoo_clap.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_clap.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_clown.gif b/pidgin/pixmaps/smileys/default/yahoo_clown.gif
index 4f8d1bee12..4f8d1bee12 100644
--- a/gtk/pixmaps/smileys/default/yahoo_clown.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_clown.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_coffee.gif b/pidgin/pixmaps/smileys/default/yahoo_coffee.gif
index 4c6afccc11..4c6afccc11 100644
--- a/gtk/pixmaps/smileys/default/yahoo_coffee.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_coffee.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_cow.gif b/pidgin/pixmaps/smileys/default/yahoo_cow.gif
index bc81138d6e..bc81138d6e 100644
--- a/gtk/pixmaps/smileys/default/yahoo_cow.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_cow.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_cowboy.gif b/pidgin/pixmaps/smileys/default/yahoo_cowboy.gif
index 0c791d78dc..0c791d78dc 100644
--- a/gtk/pixmaps/smileys/default/yahoo_cowboy.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_cowboy.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_cry.gif b/pidgin/pixmaps/smileys/default/yahoo_cry.gif
index 2c637ed007..2c637ed007 100644
--- a/gtk/pixmaps/smileys/default/yahoo_cry.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_cry.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_dance.gif b/pidgin/pixmaps/smileys/default/yahoo_dance.gif
index dc7fe45f56..dc7fe45f56 100644
--- a/gtk/pixmaps/smileys/default/yahoo_dance.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_dance.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_devil.gif b/pidgin/pixmaps/smileys/default/yahoo_devil.gif
index c34d4a50cc..c34d4a50cc 100644
--- a/gtk/pixmaps/smileys/default/yahoo_devil.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_devil.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_doh.gif b/pidgin/pixmaps/smileys/default/yahoo_doh.gif
index d41c748c67..d41c748c67 100644
--- a/gtk/pixmaps/smileys/default/yahoo_doh.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_doh.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_drool.gif b/pidgin/pixmaps/smileys/default/yahoo_drool.gif
index 0ce01bfce7..0ce01bfce7 100644
--- a/gtk/pixmaps/smileys/default/yahoo_drool.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_drool.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_eyebrow.gif b/pidgin/pixmaps/smileys/default/yahoo_eyebrow.gif
index 7ba2db43c7..7ba2db43c7 100644
--- a/gtk/pixmaps/smileys/default/yahoo_eyebrow.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_eyebrow.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_eyeroll.gif b/pidgin/pixmaps/smileys/default/yahoo_eyeroll.gif
index 597b70bd74..597b70bd74 100644
--- a/gtk/pixmaps/smileys/default/yahoo_eyeroll.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_eyeroll.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_femalefighter.gif b/pidgin/pixmaps/smileys/default/yahoo_femalefighter.gif
index 1e00f0d3a0..1e00f0d3a0 100644
--- a/gtk/pixmaps/smileys/default/yahoo_femalefighter.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_femalefighter.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_flag.gif b/pidgin/pixmaps/smileys/default/yahoo_flag.gif
index 2972aa4ff7..2972aa4ff7 100644
--- a/gtk/pixmaps/smileys/default/yahoo_flag.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_flag.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_flower.gif b/pidgin/pixmaps/smileys/default/yahoo_flower.gif
index 7926bb97e6..7926bb97e6 100644
--- a/gtk/pixmaps/smileys/default/yahoo_flower.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_flower.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_frustrated.gif b/pidgin/pixmaps/smileys/default/yahoo_frustrated.gif
index cd510ece36..cd510ece36 100644
--- a/gtk/pixmaps/smileys/default/yahoo_frustrated.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_frustrated.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_ghost.gif b/pidgin/pixmaps/smileys/default/yahoo_ghost.gif
index ba761468c4..ba761468c4 100644
--- a/gtk/pixmaps/smileys/default/yahoo_ghost.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_ghost.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_giggle.gif b/pidgin/pixmaps/smileys/default/yahoo_giggle.gif
index a86412f6cf..a86412f6cf 100644
--- a/gtk/pixmaps/smileys/default/yahoo_giggle.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_giggle.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_glasses.gif b/pidgin/pixmaps/smileys/default/yahoo_glasses.gif
index 7e9cd0133c..7e9cd0133c 100644
--- a/gtk/pixmaps/smileys/default/yahoo_glasses.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_glasses.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_huggs.gif b/pidgin/pixmaps/smileys/default/yahoo_huggs.gif
index 018fd0dcfd..018fd0dcfd 100644
--- a/gtk/pixmaps/smileys/default/yahoo_huggs.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_huggs.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_hypnotized.gif b/pidgin/pixmaps/smileys/default/yahoo_hypnotized.gif
index e27c3b3bc3..e27c3b3bc3 100644
--- a/gtk/pixmaps/smileys/default/yahoo_hypnotized.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_hypnotized.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_idea.gif b/pidgin/pixmaps/smileys/default/yahoo_idea.gif
index 2513d08596..2513d08596 100644
--- a/gtk/pixmaps/smileys/default/yahoo_idea.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_idea.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_kiss.gif b/pidgin/pixmaps/smileys/default/yahoo_kiss.gif
index 5828d2af61..5828d2af61 100644
--- a/gtk/pixmaps/smileys/default/yahoo_kiss.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_kiss.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_laughloud.gif b/pidgin/pixmaps/smileys/default/yahoo_laughloud.gif
index 101883c4b7..101883c4b7 100644
--- a/gtk/pixmaps/smileys/default/yahoo_laughloud.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_laughloud.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_liar.gif b/pidgin/pixmaps/smileys/default/yahoo_liar.gif
index 9b12113f0e..9b12113f0e 100644
--- a/gtk/pixmaps/smileys/default/yahoo_liar.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_liar.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_loser.gif b/pidgin/pixmaps/smileys/default/yahoo_loser.gif
index eb40cc57e0..eb40cc57e0 100644
--- a/gtk/pixmaps/smileys/default/yahoo_loser.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_loser.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_love.gif b/pidgin/pixmaps/smileys/default/yahoo_love.gif
index 307632c494..307632c494 100644
--- a/gtk/pixmaps/smileys/default/yahoo_love.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_love.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_madtongue.gif b/pidgin/pixmaps/smileys/default/yahoo_madtongue.gif
index 648ca9485c..648ca9485c 100644
--- a/gtk/pixmaps/smileys/default/yahoo_madtongue.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_madtongue.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_malefighter1.gif b/pidgin/pixmaps/smileys/default/yahoo_malefighter1.gif
index e963d44fb9..e963d44fb9 100644
--- a/gtk/pixmaps/smileys/default/yahoo_malefighter1.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_malefighter1.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_malefighter2.gif b/pidgin/pixmaps/smileys/default/yahoo_malefighter2.gif
index 3270bd878d..3270bd878d 100644
--- a/gtk/pixmaps/smileys/default/yahoo_malefighter2.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_malefighter2.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_mean.gif b/pidgin/pixmaps/smileys/default/yahoo_mean.gif
index c216f4899d..c216f4899d 100644
--- a/gtk/pixmaps/smileys/default/yahoo_mean.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_mean.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_moneyeyes.gif b/pidgin/pixmaps/smileys/default/yahoo_moneyeyes.gif
index c07019c0d4..c07019c0d4 100644
--- a/gtk/pixmaps/smileys/default/yahoo_moneyeyes.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_moneyeyes.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_monkey.gif b/pidgin/pixmaps/smileys/default/yahoo_monkey.gif
index 7105469a89..7105469a89 100644
--- a/gtk/pixmaps/smileys/default/yahoo_monkey.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_monkey.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_nailbiting.gif b/pidgin/pixmaps/smileys/default/yahoo_nailbiting.gif
index 0567213144..0567213144 100644
--- a/gtk/pixmaps/smileys/default/yahoo_nailbiting.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_nailbiting.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_neutral.gif b/pidgin/pixmaps/smileys/default/yahoo_neutral.gif
index 310d6f664f..310d6f664f 100644
--- a/gtk/pixmaps/smileys/default/yahoo_neutral.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_neutral.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_ooooh.gif b/pidgin/pixmaps/smileys/default/yahoo_ooooh.gif
index 4ba29bd292..4ba29bd292 100644
--- a/gtk/pixmaps/smileys/default/yahoo_ooooh.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_ooooh.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_party.gif b/pidgin/pixmaps/smileys/default/yahoo_party.gif
index 2f72079a50..2f72079a50 100644
--- a/gtk/pixmaps/smileys/default/yahoo_party.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_party.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_peace.gif b/pidgin/pixmaps/smileys/default/yahoo_peace.gif
index 1c33f2af66..1c33f2af66 100644
--- a/gtk/pixmaps/smileys/default/yahoo_peace.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_peace.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_pig.gif b/pidgin/pixmaps/smileys/default/yahoo_pig.gif
index c38e5813b5..c38e5813b5 100644
--- a/gtk/pixmaps/smileys/default/yahoo_pig.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_pig.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_pray.gif b/pidgin/pixmaps/smileys/default/yahoo_pray.gif
index dac9b5898c..dac9b5898c 100644
--- a/gtk/pixmaps/smileys/default/yahoo_pray.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_pray.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_pumpkin.gif b/pidgin/pixmaps/smileys/default/yahoo_pumpkin.gif
index d20e13aff3..d20e13aff3 100644
--- a/gtk/pixmaps/smileys/default/yahoo_pumpkin.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_pumpkin.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_question.gif b/pidgin/pixmaps/smileys/default/yahoo_question.gif
index 109ce01a7a..109ce01a7a 100644
--- a/gtk/pixmaps/smileys/default/yahoo_question.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_question.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_rotfl.gif b/pidgin/pixmaps/smileys/default/yahoo_rotfl.gif
index fe6c15d6ae..fe6c15d6ae 100644
--- a/gtk/pixmaps/smileys/default/yahoo_rotfl.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_rotfl.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_sad.gif b/pidgin/pixmaps/smileys/default/yahoo_sad.gif
index 49c495774d..49c495774d 100644
--- a/gtk/pixmaps/smileys/default/yahoo_sad.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_sad.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_shame.gif b/pidgin/pixmaps/smileys/default/yahoo_shame.gif
index a91b90a2aa..a91b90a2aa 100644
--- a/gtk/pixmaps/smileys/default/yahoo_shame.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_shame.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_shamrock.gif b/pidgin/pixmaps/smileys/default/yahoo_shamrock.gif
index 72991ce6ba..72991ce6ba 100644
--- a/gtk/pixmaps/smileys/default/yahoo_shamrock.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_shamrock.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_shhhh.gif b/pidgin/pixmaps/smileys/default/yahoo_shhhh.gif
index 33744c36da..33744c36da 100644
--- a/gtk/pixmaps/smileys/default/yahoo_shhhh.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_shhhh.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_sick.gif b/pidgin/pixmaps/smileys/default/yahoo_sick.gif
index 9032b75bff..9032b75bff 100644
--- a/gtk/pixmaps/smileys/default/yahoo_sick.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_sick.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_sighing.gif b/pidgin/pixmaps/smileys/default/yahoo_sighing.gif
index afdf653401..afdf653401 100644
--- a/gtk/pixmaps/smileys/default/yahoo_sighing.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_sighing.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_silent.gif b/pidgin/pixmaps/smileys/default/yahoo_silent.gif
index a88f697152..a88f697152 100644
--- a/gtk/pixmaps/smileys/default/yahoo_silent.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_silent.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_silly.gif b/pidgin/pixmaps/smileys/default/yahoo_silly.gif
index b7cf7a83b2..b7cf7a83b2 100644
--- a/gtk/pixmaps/smileys/default/yahoo_silly.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_silly.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_sleep.gif b/pidgin/pixmaps/smileys/default/yahoo_sleep.gif
index a4d85078a6..a4d85078a6 100644
--- a/gtk/pixmaps/smileys/default/yahoo_sleep.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_sleep.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_smiley.gif b/pidgin/pixmaps/smileys/default/yahoo_smiley.gif
index 03ca160eb9..03ca160eb9 100644
--- a/gtk/pixmaps/smileys/default/yahoo_smiley.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_smiley.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_star.gif b/pidgin/pixmaps/smileys/default/yahoo_star.gif
index 332ea1b798..332ea1b798 100644
--- a/gtk/pixmaps/smileys/default/yahoo_star.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_star.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_sunglas.gif b/pidgin/pixmaps/smileys/default/yahoo_sunglas.gif
index 112346cafa..112346cafa 100644
--- a/gtk/pixmaps/smileys/default/yahoo_sunglas.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_sunglas.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_sweating.gif b/pidgin/pixmaps/smileys/default/yahoo_sweating.gif
index c76edd7c81..c76edd7c81 100644
--- a/gtk/pixmaps/smileys/default/yahoo_sweating.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_sweating.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_talktohand.gif b/pidgin/pixmaps/smileys/default/yahoo_talktohand.gif
index e3e76a699e..e3e76a699e 100644
--- a/gtk/pixmaps/smileys/default/yahoo_talktohand.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_talktohand.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_think.gif b/pidgin/pixmaps/smileys/default/yahoo_think.gif
index a99192c793..a99192c793 100644
--- a/gtk/pixmaps/smileys/default/yahoo_think.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_think.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_tired.gif b/pidgin/pixmaps/smileys/default/yahoo_tired.gif
index e7d2ad6bcc..e7d2ad6bcc 100644
--- a/gtk/pixmaps/smileys/default/yahoo_tired.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_tired.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_tongue.gif b/pidgin/pixmaps/smileys/default/yahoo_tongue.gif
index f6f631bae6..f6f631bae6 100644
--- a/gtk/pixmaps/smileys/default/yahoo_tongue.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_tongue.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_waiting.gif b/pidgin/pixmaps/smileys/default/yahoo_waiting.gif
index 05b8ec0e89..05b8ec0e89 100644
--- a/gtk/pixmaps/smileys/default/yahoo_waiting.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_waiting.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_waving.gif b/pidgin/pixmaps/smileys/default/yahoo_waving.gif
index 7a7fe5bb3f..7a7fe5bb3f 100644
--- a/gtk/pixmaps/smileys/default/yahoo_waving.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_waving.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_whistling.gif b/pidgin/pixmaps/smileys/default/yahoo_whistling.gif
index f71a59572e..f71a59572e 100644
--- a/gtk/pixmaps/smileys/default/yahoo_whistling.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_whistling.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_wink.gif b/pidgin/pixmaps/smileys/default/yahoo_wink.gif
index 29eec4ac9a..29eec4ac9a 100644
--- a/gtk/pixmaps/smileys/default/yahoo_wink.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_wink.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_worried.gif b/pidgin/pixmaps/smileys/default/yahoo_worried.gif
index f9edc8c91b..f9edc8c91b 100644
--- a/gtk/pixmaps/smileys/default/yahoo_worried.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_worried.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_worship.gif b/pidgin/pixmaps/smileys/default/yahoo_worship.gif
index 558e9b0240..558e9b0240 100644
--- a/gtk/pixmaps/smileys/default/yahoo_worship.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_worship.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_yingyang.gif b/pidgin/pixmaps/smileys/default/yahoo_yingyang.gif
index 15a41959e0..15a41959e0 100644
--- a/gtk/pixmaps/smileys/default/yahoo_yingyang.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_yingyang.gif
diff --git a/gtk/pixmaps/smileys/default/yahoo_youkiddingme.gif b/pidgin/pixmaps/smileys/default/yahoo_youkiddingme.gif
index 0adf11ec25..0adf11ec25 100644
--- a/gtk/pixmaps/smileys/default/yahoo_youkiddingme.gif
+++ b/pidgin/pixmaps/smileys/default/yahoo_youkiddingme.gif
diff --git a/gtk/pixmaps/smileys/default/yell.png b/pidgin/pixmaps/smileys/default/yell.png
index 3608b6cd84..3608b6cd84 100644
--- a/gtk/pixmaps/smileys/default/yell.png
+++ b/pidgin/pixmaps/smileys/default/yell.png
diff --git a/gtk/pixmaps/smileys/none/Makefile.am b/pidgin/pixmaps/smileys/none/Makefile.am
index ed38492f74..ed38492f74 100644
--- a/gtk/pixmaps/smileys/none/Makefile.am
+++ b/pidgin/pixmaps/smileys/none/Makefile.am
diff --git a/gtk/pixmaps/smileys/none/Makefile.mingw b/pidgin/pixmaps/smileys/none/Makefile.mingw
index 41ba989fbe..41ba989fbe 100755
--- a/gtk/pixmaps/smileys/none/Makefile.mingw
+++ b/pidgin/pixmaps/smileys/none/Makefile.mingw
diff --git a/gtk/pixmaps/smileys/none/theme b/pidgin/pixmaps/smileys/none/theme
index 0fe724e2be..0fe724e2be 100644
--- a/gtk/pixmaps/smileys/none/theme
+++ b/pidgin/pixmaps/smileys/none/theme
diff --git a/gtk/pixmaps/status-away.png b/pidgin/pixmaps/status-away.png
index a73c627ff2..a73c627ff2 100644
--- a/gtk/pixmaps/status-away.png
+++ b/pidgin/pixmaps/status-away.png
diff --git a/gtk/pixmaps/status-connect0.png b/pidgin/pixmaps/status-connect0.png
index 0279d5711a..0279d5711a 100644
--- a/gtk/pixmaps/status-connect0.png
+++ b/pidgin/pixmaps/status-connect0.png
diff --git a/gtk/pixmaps/status-connect1.png b/pidgin/pixmaps/status-connect1.png
index 737c4cde25..737c4cde25 100644
--- a/gtk/pixmaps/status-connect1.png
+++ b/pidgin/pixmaps/status-connect1.png
diff --git a/gtk/pixmaps/status-connect2.png b/pidgin/pixmaps/status-connect2.png
index 4340a3d1f8..4340a3d1f8 100644
--- a/gtk/pixmaps/status-connect2.png
+++ b/pidgin/pixmaps/status-connect2.png
diff --git a/gtk/pixmaps/status-connect3.png b/pidgin/pixmaps/status-connect3.png
index d81fe73669..d81fe73669 100644
--- a/gtk/pixmaps/status-connect3.png
+++ b/pidgin/pixmaps/status-connect3.png
diff --git a/gtk/pixmaps/status-invisible.png b/pidgin/pixmaps/status-invisible.png
index 111d60735d..111d60735d 100644
--- a/gtk/pixmaps/status-invisible.png
+++ b/pidgin/pixmaps/status-invisible.png
diff --git a/gtk/pixmaps/status-offline.png b/pidgin/pixmaps/status-offline.png
index b7096248db..b7096248db 100644
--- a/gtk/pixmaps/status-offline.png
+++ b/pidgin/pixmaps/status-offline.png
diff --git a/gtk/pixmaps/status-online.png b/pidgin/pixmaps/status-online.png
index 5fdc2acf30..5fdc2acf30 100644
--- a/gtk/pixmaps/status-online.png
+++ b/pidgin/pixmaps/status-online.png
diff --git a/gtk/pixmaps/status-typing0.png b/pidgin/pixmaps/status-typing0.png
index 94d16adb4b..94d16adb4b 100644
--- a/gtk/pixmaps/status-typing0.png
+++ b/pidgin/pixmaps/status-typing0.png
diff --git a/gtk/pixmaps/status-typing1.png b/pidgin/pixmaps/status-typing1.png
index f773622914..f773622914 100644
--- a/gtk/pixmaps/status-typing1.png
+++ b/pidgin/pixmaps/status-typing1.png
diff --git a/gtk/pixmaps/status-typing2.png b/pidgin/pixmaps/status-typing2.png
index 484b4fdbb5..484b4fdbb5 100644
--- a/gtk/pixmaps/status-typing2.png
+++ b/pidgin/pixmaps/status-typing2.png
diff --git a/gtk/pixmaps/status-typing3.png b/pidgin/pixmaps/status-typing3.png
index afb558071d..afb558071d 100644
--- a/gtk/pixmaps/status-typing3.png
+++ b/pidgin/pixmaps/status-typing3.png
diff --git a/gtk/pixmaps/status/Makefile.am b/pidgin/pixmaps/status/Makefile.am
index f37e66bb29..f37e66bb29 100644
--- a/gtk/pixmaps/status/Makefile.am
+++ b/pidgin/pixmaps/status/Makefile.am
diff --git a/gtk/pixmaps/status/Makefile.mingw b/pidgin/pixmaps/status/Makefile.mingw
index 931f0b17b4..931f0b17b4 100644
--- a/gtk/pixmaps/status/Makefile.mingw
+++ b/pidgin/pixmaps/status/Makefile.mingw
diff --git a/gtk/pixmaps/status/default/Makefile.am b/pidgin/pixmaps/status/default/Makefile.am
index 6ae28d2634..6ae28d2634 100644
--- a/gtk/pixmaps/status/default/Makefile.am
+++ b/pidgin/pixmaps/status/default/Makefile.am
diff --git a/gtk/pixmaps/status/default/Makefile.mingw b/pidgin/pixmaps/status/default/Makefile.mingw
index 9ad5cd4952..9ad5cd4952 100644
--- a/gtk/pixmaps/status/default/Makefile.mingw
+++ b/pidgin/pixmaps/status/default/Makefile.mingw
diff --git a/gtk/pixmaps/status/default/activebuddy.png b/pidgin/pixmaps/status/default/activebuddy.png
index 49614fd2f6..49614fd2f6 100644
--- a/gtk/pixmaps/status/default/activebuddy.png
+++ b/pidgin/pixmaps/status/default/activebuddy.png
diff --git a/gtk/pixmaps/status/default/admin.png b/pidgin/pixmaps/status/default/admin.png
index a4d0bbdb41..a4d0bbdb41 100644
--- a/gtk/pixmaps/status/default/admin.png
+++ b/pidgin/pixmaps/status/default/admin.png
diff --git a/gtk/pixmaps/status/default/aim.png b/pidgin/pixmaps/status/default/aim.png
index 37eb272f92..37eb272f92 100644
--- a/gtk/pixmaps/status/default/aim.png
+++ b/pidgin/pixmaps/status/default/aim.png
diff --git a/gtk/pixmaps/status/default/aol.png b/pidgin/pixmaps/status/default/aol.png
index a042d20c05..a042d20c05 100644
--- a/gtk/pixmaps/status/default/aol.png
+++ b/pidgin/pixmaps/status/default/aol.png
diff --git a/gtk/pixmaps/status/default/away.png b/pidgin/pixmaps/status/default/away.png
index 31af5979dc..31af5979dc 100644
--- a/gtk/pixmaps/status/default/away.png
+++ b/pidgin/pixmaps/status/default/away.png
diff --git a/gtk/pixmaps/status/default/blocked.png b/pidgin/pixmaps/status/default/blocked.png
index 062d61444f..062d61444f 100644
--- a/gtk/pixmaps/status/default/blocked.png
+++ b/pidgin/pixmaps/status/default/blocked.png
diff --git a/gtk/pixmaps/status/default/bonjour.png b/pidgin/pixmaps/status/default/bonjour.png
index 64bcd5a94a..64bcd5a94a 100644
--- a/gtk/pixmaps/status/default/bonjour.png
+++ b/pidgin/pixmaps/status/default/bonjour.png
diff --git a/gtk/pixmaps/status/default/dnd.png b/pidgin/pixmaps/status/default/dnd.png
index 74f73d3360..74f73d3360 100644
--- a/gtk/pixmaps/status/default/dnd.png
+++ b/pidgin/pixmaps/status/default/dnd.png
diff --git a/gtk/pixmaps/status/default/extended_away.png b/pidgin/pixmaps/status/default/extended_away.png
index 611e5c4fdb..611e5c4fdb 100644
--- a/gtk/pixmaps/status/default/extended_away.png
+++ b/pidgin/pixmaps/status/default/extended_away.png
diff --git a/gtk/pixmaps/status/default/external.png b/pidgin/pixmaps/status/default/external.png
index c39a56f2bb..c39a56f2bb 100644
--- a/gtk/pixmaps/status/default/external.png
+++ b/pidgin/pixmaps/status/default/external.png
diff --git a/gtk/pixmaps/status/default/female.png b/pidgin/pixmaps/status/default/female.png
index aa1ab92f62..aa1ab92f62 100644
--- a/gtk/pixmaps/status/default/female.png
+++ b/pidgin/pixmaps/status/default/female.png
diff --git a/gtk/pixmaps/status/default/founder.png b/pidgin/pixmaps/status/default/founder.png
index 5afeaeb5f9..5afeaeb5f9 100644
--- a/gtk/pixmaps/status/default/founder.png
+++ b/pidgin/pixmaps/status/default/founder.png
diff --git a/gtk/pixmaps/status/default/founder.svg b/pidgin/pixmaps/status/default/founder.svg
index 892c0b7abe..892c0b7abe 100644
--- a/gtk/pixmaps/status/default/founder.svg
+++ b/pidgin/pixmaps/status/default/founder.svg
diff --git a/gtk/pixmaps/status/default/freeforchat.png b/pidgin/pixmaps/status/default/freeforchat.png
index 5d713dc739..5d713dc739 100644
--- a/gtk/pixmaps/status/default/freeforchat.png
+++ b/pidgin/pixmaps/status/default/freeforchat.png
diff --git a/gtk/pixmaps/status/default/gadu-gadu.png b/pidgin/pixmaps/status/default/gadu-gadu.png
index 659fd76242..659fd76242 100644
--- a/gtk/pixmaps/status/default/gadu-gadu.png
+++ b/pidgin/pixmaps/status/default/gadu-gadu.png
diff --git a/gtk/pixmaps/status/default/game.png b/pidgin/pixmaps/status/default/game.png
index 9a1c4c8d5c..9a1c4c8d5c 100644
--- a/gtk/pixmaps/status/default/game.png
+++ b/pidgin/pixmaps/status/default/game.png
diff --git a/gtk/pixmaps/status/default/halfop.png b/pidgin/pixmaps/status/default/halfop.png
index 63f12f016b..63f12f016b 100644
--- a/gtk/pixmaps/status/default/halfop.png
+++ b/pidgin/pixmaps/status/default/halfop.png
diff --git a/gtk/pixmaps/status/default/halfop.svg b/pidgin/pixmaps/status/default/halfop.svg
index 6883b68a5c..6883b68a5c 100644
--- a/gtk/pixmaps/status/default/halfop.svg
+++ b/pidgin/pixmaps/status/default/halfop.svg
diff --git a/gtk/pixmaps/status/default/hiptop.png b/pidgin/pixmaps/status/default/hiptop.png
index 2c26d45803..2c26d45803 100644
--- a/gtk/pixmaps/status/default/hiptop.png
+++ b/pidgin/pixmaps/status/default/hiptop.png
diff --git a/gtk/pixmaps/status/default/icq.png b/pidgin/pixmaps/status/default/icq.png
index 098b69f3bb..098b69f3bb 100644
--- a/gtk/pixmaps/status/default/icq.png
+++ b/pidgin/pixmaps/status/default/icq.png
diff --git a/gtk/pixmaps/status/default/ignored.png b/pidgin/pixmaps/status/default/ignored.png
index 8896eac575..8896eac575 100644
--- a/gtk/pixmaps/status/default/ignored.png
+++ b/pidgin/pixmaps/status/default/ignored.png
diff --git a/gtk/pixmaps/status/default/ignored.svg b/pidgin/pixmaps/status/default/ignored.svg
index c5e2a2fb83..c5e2a2fb83 100644
--- a/gtk/pixmaps/status/default/ignored.svg
+++ b/pidgin/pixmaps/status/default/ignored.svg
diff --git a/gtk/pixmaps/status/default/invisible.png b/pidgin/pixmaps/status/default/invisible.png
index 1ebeb02a6e..1ebeb02a6e 100644
--- a/gtk/pixmaps/status/default/invisible.png
+++ b/pidgin/pixmaps/status/default/invisible.png
diff --git a/gtk/pixmaps/status/default/irc.png b/pidgin/pixmaps/status/default/irc.png
index fbc53a54c3..fbc53a54c3 100644
--- a/gtk/pixmaps/status/default/irc.png
+++ b/pidgin/pixmaps/status/default/irc.png
diff --git a/gtk/pixmaps/status/default/jabber.png b/pidgin/pixmaps/status/default/jabber.png
index b1c2751102..b1c2751102 100644
--- a/gtk/pixmaps/status/default/jabber.png
+++ b/pidgin/pixmaps/status/default/jabber.png
diff --git a/gtk/pixmaps/status/default/login.png b/pidgin/pixmaps/status/default/login.png
index 16b9c66815..16b9c66815 100644
--- a/gtk/pixmaps/status/default/login.png
+++ b/pidgin/pixmaps/status/default/login.png
diff --git a/gtk/pixmaps/status/default/logout.png b/pidgin/pixmaps/status/default/logout.png
index 393598b9f3..393598b9f3 100644
--- a/gtk/pixmaps/status/default/logout.png
+++ b/pidgin/pixmaps/status/default/logout.png
diff --git a/gtk/pixmaps/status/default/male.png b/pidgin/pixmaps/status/default/male.png
index a182c10ea5..a182c10ea5 100644
--- a/gtk/pixmaps/status/default/male.png
+++ b/pidgin/pixmaps/status/default/male.png
diff --git a/gtk/pixmaps/status/default/meanwhile.png b/pidgin/pixmaps/status/default/meanwhile.png
index 2ef1a0c6e6..2ef1a0c6e6 100644
--- a/gtk/pixmaps/status/default/meanwhile.png
+++ b/pidgin/pixmaps/status/default/meanwhile.png
diff --git a/gtk/pixmaps/status/default/msn.png b/pidgin/pixmaps/status/default/msn.png
index 7fb2c51531..7fb2c51531 100644
--- a/gtk/pixmaps/status/default/msn.png
+++ b/pidgin/pixmaps/status/default/msn.png
diff --git a/gtk/pixmaps/status/default/msn.svg b/pidgin/pixmaps/status/default/msn.svg
index ea8fb7d271..ea8fb7d271 100644
--- a/gtk/pixmaps/status/default/msn.svg
+++ b/pidgin/pixmaps/status/default/msn.svg
diff --git a/gtk/pixmaps/status/default/notauthorized.png b/pidgin/pixmaps/status/default/notauthorized.png
index c731c81417..c731c81417 100644
--- a/gtk/pixmaps/status/default/notauthorized.png
+++ b/pidgin/pixmaps/status/default/notauthorized.png
diff --git a/gtk/pixmaps/status/default/novell.png b/pidgin/pixmaps/status/default/novell.png
index bf9b3a1d0c..bf9b3a1d0c 100644
--- a/gtk/pixmaps/status/default/novell.png
+++ b/pidgin/pixmaps/status/default/novell.png
diff --git a/gtk/pixmaps/status/default/occupied.png b/pidgin/pixmaps/status/default/occupied.png
index ae6b1dc453..ae6b1dc453 100644
--- a/gtk/pixmaps/status/default/occupied.png
+++ b/pidgin/pixmaps/status/default/occupied.png
diff --git a/gtk/pixmaps/status/default/offline.png b/pidgin/pixmaps/status/default/offline.png
index 328daf2d45..328daf2d45 100644
--- a/gtk/pixmaps/status/default/offline.png
+++ b/pidgin/pixmaps/status/default/offline.png
diff --git a/gtk/pixmaps/status/default/op.png b/pidgin/pixmaps/status/default/op.png
index 299752bf7d..299752bf7d 100644
--- a/gtk/pixmaps/status/default/op.png
+++ b/pidgin/pixmaps/status/default/op.png
diff --git a/gtk/pixmaps/status/default/op.svg b/pidgin/pixmaps/status/default/op.svg
index 4b32b81ac9..4b32b81ac9 100644
--- a/gtk/pixmaps/status/default/op.svg
+++ b/pidgin/pixmaps/status/default/op.svg
diff --git a/gtk/pixmaps/status/default/pending.png b/pidgin/pixmaps/status/default/pending.png
index 0609057a4a..0609057a4a 100644
--- a/gtk/pixmaps/status/default/pending.png
+++ b/pidgin/pixmaps/status/default/pending.png
diff --git a/gtk/pixmaps/status/default/qq.png b/pidgin/pixmaps/status/default/qq.png
index aea5078a24..aea5078a24 100644
--- a/gtk/pixmaps/status/default/qq.png
+++ b/pidgin/pixmaps/status/default/qq.png
diff --git a/gtk/pixmaps/status/default/secure.png b/pidgin/pixmaps/status/default/secure.png
index 1a3db8fcb9..1a3db8fcb9 100644
--- a/gtk/pixmaps/status/default/secure.png
+++ b/pidgin/pixmaps/status/default/secure.png
diff --git a/gtk/pixmaps/status/default/silc.png b/pidgin/pixmaps/status/default/silc.png
index 3138ce3833..3138ce3833 100644
--- a/gtk/pixmaps/status/default/silc.png
+++ b/pidgin/pixmaps/status/default/silc.png
diff --git a/gtk/pixmaps/status/default/simple.png b/pidgin/pixmaps/status/default/simple.png
index 854920e1e0..854920e1e0 100644
--- a/gtk/pixmaps/status/default/simple.png
+++ b/pidgin/pixmaps/status/default/simple.png
diff --git a/gtk/pixmaps/status/default/unavailable.png b/pidgin/pixmaps/status/default/unavailable.png
index 1bef6313be..1bef6313be 100644
--- a/gtk/pixmaps/status/default/unavailable.png
+++ b/pidgin/pixmaps/status/default/unavailable.png
diff --git a/gtk/pixmaps/status/default/voice.png b/pidgin/pixmaps/status/default/voice.png
index 0a29a653b5..0a29a653b5 100644
--- a/gtk/pixmaps/status/default/voice.png
+++ b/pidgin/pixmaps/status/default/voice.png
diff --git a/gtk/pixmaps/status/default/voice.svg b/pidgin/pixmaps/status/default/voice.svg
index b494c78cb9..b494c78cb9 100644
--- a/gtk/pixmaps/status/default/voice.svg
+++ b/pidgin/pixmaps/status/default/voice.svg
diff --git a/gtk/pixmaps/status/default/wireless.png b/pidgin/pixmaps/status/default/wireless.png
index 46be2da06b..46be2da06b 100644
--- a/gtk/pixmaps/status/default/wireless.png
+++ b/pidgin/pixmaps/status/default/wireless.png
diff --git a/gtk/pixmaps/status/default/yahoo.png b/pidgin/pixmaps/status/default/yahoo.png
index fee362bce3..fee362bce3 100644
--- a/gtk/pixmaps/status/default/yahoo.png
+++ b/pidgin/pixmaps/status/default/yahoo.png
diff --git a/gtk/pixmaps/status/default/zephyr.png b/pidgin/pixmaps/status/default/zephyr.png
index 2bf1e2da40..2bf1e2da40 100644
--- a/gtk/pixmaps/status/default/zephyr.png
+++ b/pidgin/pixmaps/status/default/zephyr.png
diff --git a/gtk/pixmaps/stock_connect_16.png b/pidgin/pixmaps/stock_connect_16.png
index 4f031b71c6..4f031b71c6 100644
--- a/gtk/pixmaps/stock_connect_16.png
+++ b/pidgin/pixmaps/stock_connect_16.png
diff --git a/gtk/pixmaps/stock_disconnect_16.png b/pidgin/pixmaps/stock_disconnect_16.png
index bc9a1b7215..bc9a1b7215 100644
--- a/gtk/pixmaps/stock_disconnect_16.png
+++ b/pidgin/pixmaps/stock_disconnect_16.png
diff --git a/gtk/pixmaps/tb_drag_arrow_down.xpm b/pidgin/pixmaps/tb_drag_arrow_down.xpm
index 24b2d32516..24b2d32516 100644
--- a/gtk/pixmaps/tb_drag_arrow_down.xpm
+++ b/pidgin/pixmaps/tb_drag_arrow_down.xpm
diff --git a/gtk/pixmaps/tb_drag_arrow_left.xpm b/pidgin/pixmaps/tb_drag_arrow_left.xpm
index ad750a5293..ad750a5293 100644
--- a/gtk/pixmaps/tb_drag_arrow_left.xpm
+++ b/pidgin/pixmaps/tb_drag_arrow_left.xpm
diff --git a/gtk/pixmaps/tb_drag_arrow_right.xpm b/pidgin/pixmaps/tb_drag_arrow_right.xpm
index 96e6c756d5..96e6c756d5 100644
--- a/gtk/pixmaps/tb_drag_arrow_right.xpm
+++ b/pidgin/pixmaps/tb_drag_arrow_right.xpm
diff --git a/gtk/pixmaps/tb_drag_arrow_up.xpm b/pidgin/pixmaps/tb_drag_arrow_up.xpm
index 53e8043f9d..53e8043f9d 100644
--- a/gtk/pixmaps/tb_drag_arrow_up.xpm
+++ b/pidgin/pixmaps/tb_drag_arrow_up.xpm
diff --git a/gtk/pixmaps/text_bigger.png b/pidgin/pixmaps/text_bigger.png
index 887d70be0d..887d70be0d 100644
--- a/gtk/pixmaps/text_bigger.png
+++ b/pidgin/pixmaps/text_bigger.png
diff --git a/gtk/pixmaps/text_normal.png b/pidgin/pixmaps/text_normal.png
index 84521faf4b..84521faf4b 100644
--- a/gtk/pixmaps/text_normal.png
+++ b/pidgin/pixmaps/text_normal.png
diff --git a/gtk/pixmaps/text_smaller.png b/pidgin/pixmaps/text_smaller.png
index e6d3a42568..e6d3a42568 100644
--- a/gtk/pixmaps/text_smaller.png
+++ b/pidgin/pixmaps/text_smaller.png
diff --git a/gtk/pixmaps/typed.png b/pidgin/pixmaps/typed.png
index 84e8f54688..84e8f54688 100644
--- a/gtk/pixmaps/typed.png
+++ b/pidgin/pixmaps/typed.png
diff --git a/gtk/pixmaps/typing.png b/pidgin/pixmaps/typing.png
index defad7b08d..defad7b08d 100644
--- a/gtk/pixmaps/typing.png
+++ b/pidgin/pixmaps/typing.png
diff --git a/gtk/plugins/Makefile.am b/pidgin/plugins/Makefile.am
index 9d5092e81f..0b6c001e6e 100644
--- a/gtk/plugins/Makefile.am
+++ b/pidgin/plugins/Makefile.am
@@ -101,8 +101,8 @@ AM_CPPFLAGS = \
 	-DDATADIR=\"$(datadir)\" \
 	-DVERSION=\"$(VERSION)\" \
 	-I$(top_builddir)/src \
-	-I$(top_srcdir)/libgaim \
-	-I$(top_srcdir)/gtk \
+	-I$(top_srcdir)/libpurple \
+	-I$(top_srcdir)/pidgin \
 	$(DEBUG_CFLAGS) \
 	$(GTK_CFLAGS) \
 	$(PLUGIN_CFLAGS)
diff --git a/gtk/plugins/Makefile.mingw b/pidgin/plugins/Makefile.mingw
index 6da213bcd7..6da213bcd7 100644
--- a/gtk/plugins/Makefile.mingw
+++ b/pidgin/plugins/Makefile.mingw
diff --git a/gtk/plugins/cap/Makefile.am b/pidgin/plugins/cap/Makefile.am
index 53d8af98ea..cb12535f46 100644
--- a/gtk/plugins/cap/Makefile.am
+++ b/pidgin/plugins/cap/Makefile.am
@@ -20,8 +20,8 @@ cap_la_LIBADD = $(GTK_LIBS) $(SQLITE3_LIBS)
 AM_CPPFLAGS = \
 	-DDATADIR=\"$(datadir)\" \
 	-DVERSION=\"$(VERSION)\" \
-	-I$(top_srcdir)/libgaim \
-	-I$(top_srcdir)/gtk \
+	-I$(top_srcdir)/libpurple \
+	-I$(top_srcdir)/pidgin \
 	$(DEBUG_CFLAGS) \
 	$(GTK_CFLAGS) \
 	$(SQLITE3_CFLAGS)
diff --git a/gtk/plugins/cap/README b/pidgin/plugins/cap/README
index fb123285c6..fb123285c6 100644
--- a/gtk/plugins/cap/README
+++ b/pidgin/plugins/cap/README
diff --git a/gtk/plugins/cap/cap-mysql.sql b/pidgin/plugins/cap/cap-mysql.sql
index f5a803399c..f5a803399c 100644
--- a/gtk/plugins/cap/cap-mysql.sql
+++ b/pidgin/plugins/cap/cap-mysql.sql
diff --git a/gtk/plugins/cap/cap.c b/pidgin/plugins/cap/cap.c
index 8d8679c113..8d8679c113 100644
--- a/gtk/plugins/cap/cap.c
+++ b/pidgin/plugins/cap/cap.c
diff --git a/gtk/plugins/cap/cap.h b/pidgin/plugins/cap/cap.h
index 5ced892d2b..5ced892d2b 100644
--- a/gtk/plugins/cap/cap.h
+++ b/pidgin/plugins/cap/cap.h
diff --git a/gtk/plugins/cap/cap_statistics.h b/pidgin/plugins/cap/cap_statistics.h
index 78933800b6..78933800b6 100644
--- a/gtk/plugins/cap/cap_statistics.h
+++ b/pidgin/plugins/cap/cap_statistics.h
diff --git a/gtk/plugins/contact_priority.c b/pidgin/plugins/contact_priority.c
index 04467c4e42..04467c4e42 100644
--- a/gtk/plugins/contact_priority.c
+++ b/pidgin/plugins/contact_priority.c
diff --git a/gtk/plugins/convcolors.c b/pidgin/plugins/convcolors.c
index 4be496f2aa..4be496f2aa 100644
--- a/gtk/plugins/convcolors.c
+++ b/pidgin/plugins/convcolors.c
diff --git a/gtk/plugins/crazychat/Makefile.am b/pidgin/plugins/crazychat/Makefile.am
index 9b373eed05..9b373eed05 100644
--- a/gtk/plugins/crazychat/Makefile.am
+++ b/pidgin/plugins/crazychat/Makefile.am
diff --git a/gtk/plugins/crazychat/QTUtilities.c b/pidgin/plugins/crazychat/QTUtilities.c
index aa4b95ffcd..aa4b95ffcd 100644
--- a/gtk/plugins/crazychat/QTUtilities.c
+++ b/pidgin/plugins/crazychat/QTUtilities.c
diff --git a/gtk/plugins/crazychat/QTUtilities.h b/pidgin/plugins/crazychat/QTUtilities.h
index 6e2773a134..6e2773a134 100644
--- a/gtk/plugins/crazychat/QTUtilities.h
+++ b/pidgin/plugins/crazychat/QTUtilities.h
diff --git a/gtk/plugins/crazychat/Utilities.c b/pidgin/plugins/crazychat/Utilities.c
index 09c45fed6b..09c45fed6b 100644
--- a/gtk/plugins/crazychat/Utilities.c
+++ b/pidgin/plugins/crazychat/Utilities.c
diff --git a/gtk/plugins/crazychat/Utilities.h b/pidgin/plugins/crazychat/Utilities.h
index 95c46449b0..95c46449b0 100644
--- a/gtk/plugins/crazychat/Utilities.h
+++ b/pidgin/plugins/crazychat/Utilities.h
diff --git a/gtk/plugins/crazychat/camdata.c b/pidgin/plugins/crazychat/camdata.c
index 93934006c1..93934006c1 100644
--- a/gtk/plugins/crazychat/camdata.c
+++ b/pidgin/plugins/crazychat/camdata.c
diff --git a/gtk/plugins/crazychat/camdata.h b/pidgin/plugins/crazychat/camdata.h
index 85300c8bec..85300c8bec 100644
--- a/gtk/plugins/crazychat/camdata.h
+++ b/pidgin/plugins/crazychat/camdata.h
diff --git a/gtk/plugins/crazychat/camproc.c b/pidgin/plugins/crazychat/camproc.c
index bb70aee44c..bb70aee44c 100644
--- a/gtk/plugins/crazychat/camproc.c
+++ b/pidgin/plugins/crazychat/camproc.c
diff --git a/gtk/plugins/crazychat/camproc.h b/pidgin/plugins/crazychat/camproc.h
index a006ff1c8f..a006ff1c8f 100644
--- a/gtk/plugins/crazychat/camproc.h
+++ b/pidgin/plugins/crazychat/camproc.h
diff --git a/gtk/plugins/crazychat/cc_features.c b/pidgin/plugins/crazychat/cc_features.c
index 5100b6cf21..5100b6cf21 100644
--- a/gtk/plugins/crazychat/cc_features.c
+++ b/pidgin/plugins/crazychat/cc_features.c
diff --git a/gtk/plugins/crazychat/cc_gaim_plugin.c b/pidgin/plugins/crazychat/cc_gaim_plugin.c
index d61333aa44..d61333aa44 100644
--- a/gtk/plugins/crazychat/cc_gaim_plugin.c
+++ b/pidgin/plugins/crazychat/cc_gaim_plugin.c
diff --git a/gtk/plugins/crazychat/cc_gtk_gl.c b/pidgin/plugins/crazychat/cc_gtk_gl.c
index 00bf156feb..00bf156feb 100644
--- a/gtk/plugins/crazychat/cc_gtk_gl.c
+++ b/pidgin/plugins/crazychat/cc_gtk_gl.c
diff --git a/gtk/plugins/crazychat/cc_gtk_gl.h b/pidgin/plugins/crazychat/cc_gtk_gl.h
index 9f5d666caa..9f5d666caa 100644
--- a/gtk/plugins/crazychat/cc_gtk_gl.h
+++ b/pidgin/plugins/crazychat/cc_gtk_gl.h
diff --git a/gtk/plugins/crazychat/cc_interface.h b/pidgin/plugins/crazychat/cc_interface.h
index fa44fee4d1..fa44fee4d1 100644
--- a/gtk/plugins/crazychat/cc_interface.h
+++ b/pidgin/plugins/crazychat/cc_interface.h
diff --git a/gtk/plugins/crazychat/cc_network.c b/pidgin/plugins/crazychat/cc_network.c
index d176bb9932..d176bb9932 100644
--- a/gtk/plugins/crazychat/cc_network.c
+++ b/pidgin/plugins/crazychat/cc_network.c
diff --git a/gtk/plugins/crazychat/cc_network.h b/pidgin/plugins/crazychat/cc_network.h
index 7a4127e11f..7a4127e11f 100644
--- a/gtk/plugins/crazychat/cc_network.h
+++ b/pidgin/plugins/crazychat/cc_network.h
diff --git a/gtk/plugins/crazychat/cc_output.c b/pidgin/plugins/crazychat/cc_output.c
index 77a04df211..77a04df211 100644
--- a/gtk/plugins/crazychat/cc_output.c
+++ b/pidgin/plugins/crazychat/cc_output.c
diff --git a/gtk/plugins/crazychat/configure.ac b/pidgin/plugins/crazychat/configure.ac
index bb050a0689..bb050a0689 100644
--- a/gtk/plugins/crazychat/configure.ac
+++ b/pidgin/plugins/crazychat/configure.ac
diff --git a/gtk/plugins/crazychat/crazychat.c b/pidgin/plugins/crazychat/crazychat.c
index 8d685e6145..8d685e6145 100644
--- a/gtk/plugins/crazychat/crazychat.c
+++ b/pidgin/plugins/crazychat/crazychat.c
diff --git a/gtk/plugins/crazychat/crazychat.h b/pidgin/plugins/crazychat/crazychat.h
index 775c07fb52..775c07fb52 100644
--- a/gtk/plugins/crazychat/crazychat.h
+++ b/pidgin/plugins/crazychat/crazychat.h
diff --git a/gtk/plugins/crazychat/dog_lids.c b/pidgin/plugins/crazychat/dog_lids.c
index 51d6db6c2c..51d6db6c2c 100644
--- a/gtk/plugins/crazychat/dog_lids.c
+++ b/pidgin/plugins/crazychat/dog_lids.c
diff --git a/gtk/plugins/crazychat/dog_lids.h b/pidgin/plugins/crazychat/dog_lids.h
index c542cff642..c542cff642 100644
--- a/gtk/plugins/crazychat/dog_lids.h
+++ b/pidgin/plugins/crazychat/dog_lids.h
diff --git a/gtk/plugins/crazychat/doggy.c b/pidgin/plugins/crazychat/doggy.c
index 1faa89bb25..1faa89bb25 100644
--- a/gtk/plugins/crazychat/doggy.c
+++ b/pidgin/plugins/crazychat/doggy.c
diff --git a/gtk/plugins/crazychat/doggy.h b/pidgin/plugins/crazychat/doggy.h
index b0b8594201..b0b8594201 100644
--- a/gtk/plugins/crazychat/doggy.h
+++ b/pidgin/plugins/crazychat/doggy.h
diff --git a/gtk/plugins/crazychat/draw.c b/pidgin/plugins/crazychat/draw.c
index 4ac00b24df..4ac00b24df 100644
--- a/gtk/plugins/crazychat/draw.c
+++ b/pidgin/plugins/crazychat/draw.c
diff --git a/gtk/plugins/crazychat/eye.c b/pidgin/plugins/crazychat/eye.c
index be88e46ca9..be88e46ca9 100644
--- a/gtk/plugins/crazychat/eye.c
+++ b/pidgin/plugins/crazychat/eye.c
diff --git a/gtk/plugins/crazychat/eye.h b/pidgin/plugins/crazychat/eye.h
index 94ae082768..94ae082768 100644
--- a/gtk/plugins/crazychat/eye.h
+++ b/pidgin/plugins/crazychat/eye.h
diff --git a/gtk/plugins/crazychat/eyes.c b/pidgin/plugins/crazychat/eyes.c
index 301db7e2f6..301db7e2f6 100644
--- a/gtk/plugins/crazychat/eyes.c
+++ b/pidgin/plugins/crazychat/eyes.c
diff --git a/gtk/plugins/crazychat/eyes.h b/pidgin/plugins/crazychat/eyes.h
index 9e49f49882..9e49f49882 100644
--- a/gtk/plugins/crazychat/eyes.h
+++ b/pidgin/plugins/crazychat/eyes.h
diff --git a/gtk/plugins/crazychat/face.c b/pidgin/plugins/crazychat/face.c
index 3e0e8bb166..3e0e8bb166 100644
--- a/gtk/plugins/crazychat/face.c
+++ b/pidgin/plugins/crazychat/face.c
diff --git a/gtk/plugins/crazychat/face.h b/pidgin/plugins/crazychat/face.h
index 9ff1eea914..9ff1eea914 100644
--- a/gtk/plugins/crazychat/face.h
+++ b/pidgin/plugins/crazychat/face.h
diff --git a/gtk/plugins/crazychat/filter.c b/pidgin/plugins/crazychat/filter.c
index e008137c9a..e008137c9a 100644
--- a/gtk/plugins/crazychat/filter.c
+++ b/pidgin/plugins/crazychat/filter.c
diff --git a/gtk/plugins/crazychat/filter.h b/pidgin/plugins/crazychat/filter.h
index b45467b259..b45467b259 100644
--- a/gtk/plugins/crazychat/filter.h
+++ b/pidgin/plugins/crazychat/filter.h
diff --git a/gtk/plugins/crazychat/glm.c b/pidgin/plugins/crazychat/glm.c
index d4e3aad9e7..d4e3aad9e7 100644
--- a/gtk/plugins/crazychat/glm.c
+++ b/pidgin/plugins/crazychat/glm.c
diff --git a/gtk/plugins/crazychat/glm.h b/pidgin/plugins/crazychat/glm.h
index 84599c8fac..84599c8fac 100644
--- a/gtk/plugins/crazychat/glm.h
+++ b/pidgin/plugins/crazychat/glm.h
diff --git a/gtk/plugins/crazychat/lids.c b/pidgin/plugins/crazychat/lids.c
index fb25888ab8..fb25888ab8 100644
--- a/gtk/plugins/crazychat/lids.c
+++ b/pidgin/plugins/crazychat/lids.c
diff --git a/gtk/plugins/crazychat/lids.h b/pidgin/plugins/crazychat/lids.h
index c66fe1cf13..c66fe1cf13 100644
--- a/gtk/plugins/crazychat/lids.h
+++ b/pidgin/plugins/crazychat/lids.h
diff --git a/gtk/plugins/crazychat/main.c b/pidgin/plugins/crazychat/main.c
index a7748ddca5..a7748ddca5 100644
--- a/gtk/plugins/crazychat/main.c
+++ b/pidgin/plugins/crazychat/main.c
diff --git a/gtk/plugins/crazychat/mat_struct.h b/pidgin/plugins/crazychat/mat_struct.h
index 816d12de88..816d12de88 100644
--- a/gtk/plugins/crazychat/mat_struct.h
+++ b/pidgin/plugins/crazychat/mat_struct.h
diff --git a/gtk/plugins/crazychat/models.c b/pidgin/plugins/crazychat/models.c
index 2ffa324d59..2ffa324d59 100644
--- a/gtk/plugins/crazychat/models.c
+++ b/pidgin/plugins/crazychat/models.c
diff --git a/gtk/plugins/crazychat/models.h b/pidgin/plugins/crazychat/models.h
index b05a4d68e5..b05a4d68e5 100644
--- a/gtk/plugins/crazychat/models.h
+++ b/pidgin/plugins/crazychat/models.h
diff --git a/gtk/plugins/crazychat/sharky.c b/pidgin/plugins/crazychat/sharky.c
index e29253e67f..e29253e67f 100644
--- a/gtk/plugins/crazychat/sharky.c
+++ b/pidgin/plugins/crazychat/sharky.c
diff --git a/gtk/plugins/crazychat/sharky.h b/pidgin/plugins/crazychat/sharky.h
index 7555df3f38..7555df3f38 100644
--- a/gtk/plugins/crazychat/sharky.h
+++ b/pidgin/plugins/crazychat/sharky.h
diff --git a/gtk/plugins/crazychat/test.h b/pidgin/plugins/crazychat/test.h
index 9c150c7934..9c150c7934 100644
--- a/gtk/plugins/crazychat/test.h
+++ b/pidgin/plugins/crazychat/test.h
diff --git a/gtk/plugins/crazychat/util.h b/pidgin/plugins/crazychat/util.h
index 5f8fc116f3..5f8fc116f3 100644
--- a/gtk/plugins/crazychat/util.h
+++ b/pidgin/plugins/crazychat/util.h
diff --git a/gtk/plugins/extplacement.c b/pidgin/plugins/extplacement.c
index 6580fe512d..6580fe512d 100644
--- a/gtk/plugins/extplacement.c
+++ b/pidgin/plugins/extplacement.c
diff --git a/gtk/plugins/gaiminc.c b/pidgin/plugins/gaiminc.c
index d426323a1d..d426323a1d 100644
--- a/gtk/plugins/gaiminc.c
+++ b/pidgin/plugins/gaiminc.c
diff --git a/gtk/plugins/gaimrc.c b/pidgin/plugins/gaimrc.c
index 5008642654..5008642654 100644
--- a/gtk/plugins/gaimrc.c
+++ b/pidgin/plugins/gaimrc.c
diff --git a/gtk/plugins/gestures/Makefile.am b/pidgin/plugins/gestures/Makefile.am
index ab51d39d51..da91664b2c 100644
--- a/gtk/plugins/gestures/Makefile.am
+++ b/pidgin/plugins/gestures/Makefile.am
@@ -20,7 +20,7 @@ endif
 AM_CPPFLAGS = \
 	-DDATADIR=\"$(datadir)\" \
 	-DVERSION=\"$(VERSION)\" \
-	-I$(top_srcdir)/libgaim \
-	-I$(top_srcdir)/gtk \
+	-I$(top_srcdir)/libpurple \
+	-I$(top_srcdir)/pidgin \
 	$(DEBUG_CFLAGS) \
 	$(GTK_CFLAGS)
diff --git a/gtk/plugins/gestures/gestures.c b/pidgin/plugins/gestures/gestures.c
index 9b8f81090f..9b8f81090f 100644
--- a/gtk/plugins/gestures/gestures.c
+++ b/pidgin/plugins/gestures/gestures.c
diff --git a/gtk/plugins/gestures/gstroke-internal.h b/pidgin/plugins/gestures/gstroke-internal.h
index 4faaa89397..4faaa89397 100644
--- a/gtk/plugins/gestures/gstroke-internal.h
+++ b/pidgin/plugins/gestures/gstroke-internal.h
diff --git a/gtk/plugins/gestures/gstroke.h b/pidgin/plugins/gestures/gstroke.h
index 76a45ea9f8..76a45ea9f8 100644
--- a/gtk/plugins/gestures/gstroke.h
+++ b/pidgin/plugins/gestures/gstroke.h
diff --git a/gtk/plugins/gestures/stroke-draw.c b/pidgin/plugins/gestures/stroke-draw.c
index 5164ca1b41..5164ca1b41 100644
--- a/gtk/plugins/gestures/stroke-draw.c
+++ b/pidgin/plugins/gestures/stroke-draw.c
diff --git a/gtk/plugins/gestures/stroke.c b/pidgin/plugins/gestures/stroke.c
index 9b944c7cfa..9b944c7cfa 100644
--- a/gtk/plugins/gestures/stroke.c
+++ b/pidgin/plugins/gestures/stroke.c
diff --git a/gtk/plugins/gevolution/Makefile.am b/pidgin/plugins/gevolution/Makefile.am
index 38eec55123..bb644f4b46 100644
--- a/gtk/plugins/gevolution/Makefile.am
+++ b/pidgin/plugins/gevolution/Makefile.am
@@ -22,8 +22,8 @@ endif
 AM_CPPFLAGS = \
 	-DDATADIR=\"$(datadir)\" \
 	-DVERSION=\"$(VERSION)\" \
-	-I$(top_srcdir)/libgaim \
-	-I$(top_srcdir)/gtk \
+	-I$(top_srcdir)/libpurple \
+	-I$(top_srcdir)/pidgin \
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS) \
 	$(DEBUG_CFLAGS) \
 	$(GTK_CFLAGS)
diff --git a/gtk/plugins/gevolution/add_buddy_dialog.c b/pidgin/plugins/gevolution/add_buddy_dialog.c
index 57c8d27cb7..57c8d27cb7 100644
--- a/gtk/plugins/gevolution/add_buddy_dialog.c
+++ b/pidgin/plugins/gevolution/add_buddy_dialog.c
diff --git a/gtk/plugins/gevolution/assoc-buddy.c b/pidgin/plugins/gevolution/assoc-buddy.c
index 757c6da6fa..757c6da6fa 100644
--- a/gtk/plugins/gevolution/assoc-buddy.c
+++ b/pidgin/plugins/gevolution/assoc-buddy.c
diff --git a/gtk/plugins/gevolution/eds-utils.c b/pidgin/plugins/gevolution/eds-utils.c
index f28d9c1036..f28d9c1036 100644
--- a/gtk/plugins/gevolution/eds-utils.c
+++ b/pidgin/plugins/gevolution/eds-utils.c
diff --git a/gtk/plugins/gevolution/gevo-util.c b/pidgin/plugins/gevolution/gevo-util.c
index 489c63b825..489c63b825 100644
--- a/gtk/plugins/gevolution/gevo-util.c
+++ b/pidgin/plugins/gevolution/gevo-util.c
diff --git a/gtk/plugins/gevolution/gevolution.c b/pidgin/plugins/gevolution/gevolution.c
index 33854b19d4..33854b19d4 100644
--- a/gtk/plugins/gevolution/gevolution.c
+++ b/pidgin/plugins/gevolution/gevolution.c
diff --git a/gtk/plugins/gevolution/gevolution.h b/pidgin/plugins/gevolution/gevolution.h
index 5dc1204692..5dc1204692 100644
--- a/gtk/plugins/gevolution/gevolution.h
+++ b/pidgin/plugins/gevolution/gevolution.h
diff --git a/gtk/plugins/gevolution/new_person_dialog.c b/pidgin/plugins/gevolution/new_person_dialog.c
index e4fb23505a..e4fb23505a 100644
--- a/gtk/plugins/gevolution/new_person_dialog.c
+++ b/pidgin/plugins/gevolution/new_person_dialog.c
diff --git a/gtk/plugins/gtk-signals-test.c b/pidgin/plugins/gtk-signals-test.c
index 7b7292c4cc..7b7292c4cc 100644
--- a/gtk/plugins/gtk-signals-test.c
+++ b/pidgin/plugins/gtk-signals-test.c
diff --git a/gtk/plugins/history.c b/pidgin/plugins/history.c
index 4111a64e89..4111a64e89 100644
--- a/gtk/plugins/history.c
+++ b/pidgin/plugins/history.c
diff --git a/gtk/plugins/iconaway.c b/pidgin/plugins/iconaway.c
index 44c51333df..44c51333df 100644
--- a/gtk/plugins/iconaway.c
+++ b/pidgin/plugins/iconaway.c
diff --git a/gtk/plugins/mailchk.c b/pidgin/plugins/mailchk.c
index 5e809993f8..5e809993f8 100644
--- a/gtk/plugins/mailchk.c
+++ b/pidgin/plugins/mailchk.c
diff --git a/gtk/plugins/markerline.c b/pidgin/plugins/markerline.c
index a2923fd417..a2923fd417 100644
--- a/gtk/plugins/markerline.c
+++ b/pidgin/plugins/markerline.c
diff --git a/gtk/plugins/musicmessaging/Makefile.am b/pidgin/plugins/musicmessaging/Makefile.am
index 8737485180..7ec5771069 100644
--- a/gtk/plugins/musicmessaging/Makefile.am
+++ b/pidgin/plugins/musicmessaging/Makefile.am
@@ -22,14 +22,14 @@ CLEANFILES              = music-messaging-bindings.c
 
 .PHONY: always
 
-$(top_builddir)/libgaim/dbus-types.h: always
+$(top_builddir)/libpurple/dbus-types.h: always
 	cd $(@D) && $(MAKE) $(AM_MAKEFLAGS) $(@F)
 
-music-messaging-bindings.c: $(top_srcdir)/libgaim/dbus-analyze-functions.py $(musicmessaging_la_SOURCES)
+music-messaging-bindings.c: $(top_srcdir)/libpurple/dbus-analyze-functions.py $(musicmessaging_la_SOURCES)
 	cat $(srcdir)/$(musicmessaging_la_SOURCES) | \
-	$(PYTHON) $(top_srcdir)/libgaim/dbus-analyze-functions.py --export-only > $@
+	$(PYTHON) $(top_srcdir)/libpurple/dbus-analyze-functions.py --export-only > $@
 
-$(musicmessaging_la_OBJECTS) musicmessaging.so: music-messaging-bindings.c $(top_builddir)/libgaim/dbus-types.h
+$(musicmessaging_la_OBJECTS) musicmessaging.so: music-messaging-bindings.c $(top_builddir)/libpurple/dbus-types.h
 
 endif
 endif
@@ -37,9 +37,9 @@ endif
 AM_CPPFLAGS = \
 	-DDATADIR=\"$(datadir)\" \
 	-DVERSION=\"$(VERSION)\" \
-	-I$(top_builddir)/libgaim \
-	-I$(top_srcdir)/libgaim \
-	-I$(top_srcdir)/gtk \
+	-I$(top_builddir)/libpurple \
+	-I$(top_srcdir)/libpurple \
+	-I$(top_srcdir)/pidgin \
 	$(DEBUG_CFLAGS) \
 	$(GTK_CFLAGS) \
 	$(DBUS_CFLAGS)
diff --git a/gtk/plugins/musicmessaging/music.png b/pidgin/plugins/musicmessaging/music.png
index 6aec4a5629..6aec4a5629 100644
--- a/gtk/plugins/musicmessaging/music.png
+++ b/pidgin/plugins/musicmessaging/music.png
diff --git a/gtk/plugins/musicmessaging/musicmessaging.c b/pidgin/plugins/musicmessaging/musicmessaging.c
index 40c5f10690..40c5f10690 100644
--- a/gtk/plugins/musicmessaging/musicmessaging.c
+++ b/pidgin/plugins/musicmessaging/musicmessaging.c
diff --git a/gtk/plugins/notify.c b/pidgin/plugins/notify.c
index a0d4e06dff..a0d4e06dff 100644
--- a/gtk/plugins/notify.c
+++ b/pidgin/plugins/notify.c
diff --git a/gtk/plugins/perl/Makefile.am b/pidgin/plugins/perl/Makefile.am
index 9c1313f915..d1a93445bd 100644
--- a/gtk/plugins/perl/Makefile.am
+++ b/pidgin/plugins/perl/Makefile.am
@@ -97,8 +97,8 @@ distclean-generic:
 AM_CPPFLAGS = \
 	-DVERSION=\"$(VERSION)\" \
 	-I$(top_srcdir) \
-	-I$(top_srcdir)/libgaim \
-	-I$(top_srcdir)/gtk \
+	-I$(top_srcdir)/libpurple \
+	-I$(top_srcdir)/pidgin \
 	$(DEBUG_CFLAGS) \
 	$(GTK_CFLAGS) \
 	$(PLUGIN_CFLAGS) \
diff --git a/gtk/plugins/perl/Makefile.mingw b/pidgin/plugins/perl/Makefile.mingw
index 157e054a37..157e054a37 100644
--- a/gtk/plugins/perl/Makefile.mingw
+++ b/pidgin/plugins/perl/Makefile.mingw
diff --git a/gtk/plugins/perl/common/GtkAccount.xs b/pidgin/plugins/perl/common/GtkAccount.xs
index 9f118ddc0f..9f118ddc0f 100644
--- a/gtk/plugins/perl/common/GtkAccount.xs
+++ b/pidgin/plugins/perl/common/GtkAccount.xs
diff --git a/gtk/plugins/perl/common/GtkBlist.xs b/pidgin/plugins/perl/common/GtkBlist.xs
index 583383a6c1..583383a6c1 100644
--- a/gtk/plugins/perl/common/GtkBlist.xs
+++ b/pidgin/plugins/perl/common/GtkBlist.xs
diff --git a/gtk/plugins/perl/common/GtkConn.xs b/pidgin/plugins/perl/common/GtkConn.xs
index a388d957cf..a388d957cf 100644
--- a/gtk/plugins/perl/common/GtkConn.xs
+++ b/pidgin/plugins/perl/common/GtkConn.xs
diff --git a/gtk/plugins/perl/common/GtkConv.xs b/pidgin/plugins/perl/common/GtkConv.xs
index 92e70dc088..92e70dc088 100644
--- a/gtk/plugins/perl/common/GtkConv.xs
+++ b/pidgin/plugins/perl/common/GtkConv.xs
diff --git a/gtk/plugins/perl/common/GtkConvWin.xs b/pidgin/plugins/perl/common/GtkConvWin.xs
index e3297415b8..e3297415b8 100644
--- a/gtk/plugins/perl/common/GtkConvWin.xs
+++ b/pidgin/plugins/perl/common/GtkConvWin.xs
diff --git a/gtk/plugins/perl/common/GtkDebug.xs b/pidgin/plugins/perl/common/GtkDebug.xs
index eea573e844..eea573e844 100644
--- a/gtk/plugins/perl/common/GtkDebug.xs
+++ b/pidgin/plugins/perl/common/GtkDebug.xs
diff --git a/gtk/plugins/perl/common/GtkDialogs.xs b/pidgin/plugins/perl/common/GtkDialogs.xs
index 30f944e329..30f944e329 100644
--- a/gtk/plugins/perl/common/GtkDialogs.xs
+++ b/pidgin/plugins/perl/common/GtkDialogs.xs
diff --git a/gtk/plugins/perl/common/GtkFt.xs b/pidgin/plugins/perl/common/GtkFt.xs
index 36c24dc148..36c24dc148 100644
--- a/gtk/plugins/perl/common/GtkFt.xs
+++ b/pidgin/plugins/perl/common/GtkFt.xs
diff --git a/gtk/plugins/perl/common/GtkIMHtml.xs b/pidgin/plugins/perl/common/GtkIMHtml.xs
index 90fdd3e98f..90fdd3e98f 100644
--- a/gtk/plugins/perl/common/GtkIMHtml.xs
+++ b/pidgin/plugins/perl/common/GtkIMHtml.xs
diff --git a/gtk/plugins/perl/common/GtkIMHtmlToolbar.xs b/pidgin/plugins/perl/common/GtkIMHtmlToolbar.xs
index eb9e26a1f0..eb9e26a1f0 100644
--- a/gtk/plugins/perl/common/GtkIMHtmlToolbar.xs
+++ b/pidgin/plugins/perl/common/GtkIMHtmlToolbar.xs
diff --git a/gtk/plugins/perl/common/GtkLog.xs b/pidgin/plugins/perl/common/GtkLog.xs
index df6107c39d..df6107c39d 100644
--- a/gtk/plugins/perl/common/GtkLog.xs
+++ b/pidgin/plugins/perl/common/GtkLog.xs
diff --git a/gtk/plugins/perl/common/GtkMenuTray.xs b/pidgin/plugins/perl/common/GtkMenuTray.xs
index 3815a567c1..3815a567c1 100644
--- a/gtk/plugins/perl/common/GtkMenuTray.xs
+++ b/pidgin/plugins/perl/common/GtkMenuTray.xs
diff --git a/gtk/plugins/perl/common/GtkPlugin.xs b/pidgin/plugins/perl/common/GtkPlugin.xs
index b728da184c..b728da184c 100644
--- a/gtk/plugins/perl/common/GtkPlugin.xs
+++ b/pidgin/plugins/perl/common/GtkPlugin.xs
diff --git a/gtk/plugins/perl/common/GtkPluginPref.xs b/pidgin/plugins/perl/common/GtkPluginPref.xs
index b930364b6e..b930364b6e 100644
--- a/gtk/plugins/perl/common/GtkPluginPref.xs
+++ b/pidgin/plugins/perl/common/GtkPluginPref.xs
diff --git a/gtk/plugins/perl/common/GtkPounce.xs b/pidgin/plugins/perl/common/GtkPounce.xs
index 83a2f23ce3..83a2f23ce3 100644
--- a/gtk/plugins/perl/common/GtkPounce.xs
+++ b/pidgin/plugins/perl/common/GtkPounce.xs
diff --git a/gtk/plugins/perl/common/GtkPrefs.xs b/pidgin/plugins/perl/common/GtkPrefs.xs
index a059677148..a059677148 100644
--- a/gtk/plugins/perl/common/GtkPrefs.xs
+++ b/pidgin/plugins/perl/common/GtkPrefs.xs
diff --git a/gtk/plugins/perl/common/GtkPrivacy.xs b/pidgin/plugins/perl/common/GtkPrivacy.xs
index 60d6cddf3f..60d6cddf3f 100644
--- a/gtk/plugins/perl/common/GtkPrivacy.xs
+++ b/pidgin/plugins/perl/common/GtkPrivacy.xs
diff --git a/gtk/plugins/perl/common/GtkRoomlist.xs b/pidgin/plugins/perl/common/GtkRoomlist.xs
index 4e31dbc26e..4e31dbc26e 100644
--- a/gtk/plugins/perl/common/GtkRoomlist.xs
+++ b/pidgin/plugins/perl/common/GtkRoomlist.xs
diff --git a/gtk/plugins/perl/common/GtkSavedStatuses.xs b/pidgin/plugins/perl/common/GtkSavedStatuses.xs
index b86b8bee69..b86b8bee69 100644
--- a/gtk/plugins/perl/common/GtkSavedStatuses.xs
+++ b/pidgin/plugins/perl/common/GtkSavedStatuses.xs
diff --git a/gtk/plugins/perl/common/GtkSession.xs b/pidgin/plugins/perl/common/GtkSession.xs
index 7dcd563e1a..7dcd563e1a 100644
--- a/gtk/plugins/perl/common/GtkSession.xs
+++ b/pidgin/plugins/perl/common/GtkSession.xs
diff --git a/gtk/plugins/perl/common/GtkSound.xs b/pidgin/plugins/perl/common/GtkSound.xs
index 124ebad151..124ebad151 100644
--- a/gtk/plugins/perl/common/GtkSound.xs
+++ b/pidgin/plugins/perl/common/GtkSound.xs
diff --git a/gtk/plugins/perl/common/GtkStatusBox.xs b/pidgin/plugins/perl/common/GtkStatusBox.xs
index 1a4bd2f3b5..1a4bd2f3b5 100644
--- a/gtk/plugins/perl/common/GtkStatusBox.xs
+++ b/pidgin/plugins/perl/common/GtkStatusBox.xs
diff --git a/gtk/plugins/perl/common/GtkThemes.xs b/pidgin/plugins/perl/common/GtkThemes.xs
index 4b4422697f..4b4422697f 100644
--- a/gtk/plugins/perl/common/GtkThemes.xs
+++ b/pidgin/plugins/perl/common/GtkThemes.xs
diff --git a/gtk/plugins/perl/common/GtkUI.pm b/pidgin/plugins/perl/common/GtkUI.pm
index 99c43b4b42..99c43b4b42 100644
--- a/gtk/plugins/perl/common/GtkUI.pm
+++ b/pidgin/plugins/perl/common/GtkUI.pm
diff --git a/gtk/plugins/perl/common/GtkUI.xs b/pidgin/plugins/perl/common/GtkUI.xs
index 9366a1d47f..9366a1d47f 100644
--- a/gtk/plugins/perl/common/GtkUI.xs
+++ b/pidgin/plugins/perl/common/GtkUI.xs
diff --git a/gtk/plugins/perl/common/GtkUtils.xs b/pidgin/plugins/perl/common/GtkUtils.xs
index e63499fc36..e63499fc36 100644
--- a/gtk/plugins/perl/common/GtkUtils.xs
+++ b/pidgin/plugins/perl/common/GtkUtils.xs
diff --git a/gtk/plugins/perl/common/MANIFEST b/pidgin/plugins/perl/common/MANIFEST
index 2c7ac58e6a..2c7ac58e6a 100644
--- a/gtk/plugins/perl/common/MANIFEST
+++ b/pidgin/plugins/perl/common/MANIFEST
diff --git a/gtk/plugins/perl/common/Makefile.PL.in b/pidgin/plugins/perl/common/Makefile.PL.in
index f7fd86508f..f7fd86508f 100644
--- a/gtk/plugins/perl/common/Makefile.PL.in
+++ b/pidgin/plugins/perl/common/Makefile.PL.in
diff --git a/gtk/plugins/perl/common/Makefile.mingw b/pidgin/plugins/perl/common/Makefile.mingw
index be49bc7d96..be49bc7d96 100644
--- a/gtk/plugins/perl/common/Makefile.mingw
+++ b/pidgin/plugins/perl/common/Makefile.mingw
diff --git a/gtk/plugins/perl/common/gtkmodule.h b/pidgin/plugins/perl/common/gtkmodule.h
index 29026948ba..29026948ba 100644
--- a/gtk/plugins/perl/common/gtkmodule.h
+++ b/pidgin/plugins/perl/common/gtkmodule.h
diff --git a/gtk/plugins/perl/common/typemap b/pidgin/plugins/perl/common/typemap
index 34e8347cd0..34e8347cd0 100644
--- a/gtk/plugins/perl/common/typemap
+++ b/pidgin/plugins/perl/common/typemap
diff --git a/gtk/plugins/raw.c b/pidgin/plugins/raw.c
index 8328c7c86a..8328c7c86a 100644
--- a/gtk/plugins/raw.c
+++ b/pidgin/plugins/raw.c
diff --git a/gtk/plugins/relnot.c b/pidgin/plugins/relnot.c
index f23c2610a1..f23c2610a1 100644
--- a/gtk/plugins/relnot.c
+++ b/pidgin/plugins/relnot.c
diff --git a/gtk/plugins/spellchk.c b/pidgin/plugins/spellchk.c
index 11fa1acccc..11fa1acccc 100644
--- a/gtk/plugins/spellchk.c
+++ b/pidgin/plugins/spellchk.c
diff --git a/gtk/plugins/ticker/Makefile.am b/pidgin/plugins/ticker/Makefile.am
index 03c115429d..2a4958cda1 100644
--- a/gtk/plugins/ticker/Makefile.am
+++ b/pidgin/plugins/ticker/Makefile.am
@@ -21,7 +21,7 @@ endif
 AM_CPPFLAGS = \
 	-DDATADIR=\"$(datadir)\" \
 	-DVERSION=\"$(VERSION)\" \
-	-I$(top_srcdir)/libgaim \
-	-I$(top_srcdir)/gtk \
+	-I$(top_srcdir)/libpurple \
+	-I$(top_srcdir)/pidgin \
 	$(DEBUG_CFLAGS) \
 	$(GTK_CFLAGS)
diff --git a/gtk/plugins/ticker/Makefile.mingw b/pidgin/plugins/ticker/Makefile.mingw
index ad34a22e74..ad34a22e74 100644
--- a/gtk/plugins/ticker/Makefile.mingw
+++ b/pidgin/plugins/ticker/Makefile.mingw
diff --git a/gtk/plugins/ticker/gtkticker.c b/pidgin/plugins/ticker/gtkticker.c
index 8911d42b8f..8911d42b8f 100644
--- a/gtk/plugins/ticker/gtkticker.c
+++ b/pidgin/plugins/ticker/gtkticker.c
diff --git a/gtk/plugins/ticker/gtkticker.h b/pidgin/plugins/ticker/gtkticker.h
index 19e39bb85f..19e39bb85f 100644
--- a/gtk/plugins/ticker/gtkticker.h
+++ b/pidgin/plugins/ticker/gtkticker.h
diff --git a/gtk/plugins/ticker/ticker.c b/pidgin/plugins/ticker/ticker.c
index bfc2bdedc7..bfc2bdedc7 100644
--- a/gtk/plugins/ticker/ticker.c
+++ b/pidgin/plugins/ticker/ticker.c
diff --git a/gtk/plugins/timestamp.c b/pidgin/plugins/timestamp.c
index bf6a55ba02..bf6a55ba02 100644
--- a/gtk/plugins/timestamp.c
+++ b/pidgin/plugins/timestamp.c
diff --git a/gtk/plugins/timestamp_format.c b/pidgin/plugins/timestamp_format.c
index dc4f05349f..dc4f05349f 100644
--- a/gtk/plugins/timestamp_format.c
+++ b/pidgin/plugins/timestamp_format.c
diff --git a/gtk/plugins/win32/transparency/Makefile.mingw b/pidgin/plugins/win32/transparency/Makefile.mingw
index 20560812ab..20560812ab 100644
--- a/gtk/plugins/win32/transparency/Makefile.mingw
+++ b/pidgin/plugins/win32/transparency/Makefile.mingw
diff --git a/gtk/plugins/win32/transparency/win2ktrans.c b/pidgin/plugins/win32/transparency/win2ktrans.c
index b649ff78cc..b649ff78cc 100644
--- a/gtk/plugins/win32/transparency/win2ktrans.c
+++ b/pidgin/plugins/win32/transparency/win2ktrans.c
diff --git a/gtk/plugins/win32/winprefs/Makefile.mingw b/pidgin/plugins/win32/winprefs/Makefile.mingw
index f33b98b330..f33b98b330 100644
--- a/gtk/plugins/win32/winprefs/Makefile.mingw
+++ b/pidgin/plugins/win32/winprefs/Makefile.mingw
diff --git a/gtk/plugins/win32/winprefs/gtkappbar.c b/pidgin/plugins/win32/winprefs/gtkappbar.c
index 48c83dc825..48c83dc825 100644
--- a/gtk/plugins/win32/winprefs/gtkappbar.c
+++ b/pidgin/plugins/win32/winprefs/gtkappbar.c
diff --git a/gtk/plugins/win32/winprefs/gtkappbar.h b/pidgin/plugins/win32/winprefs/gtkappbar.h
index 0efb5caa90..0efb5caa90 100644
--- a/gtk/plugins/win32/winprefs/gtkappbar.h
+++ b/pidgin/plugins/win32/winprefs/gtkappbar.h
diff --git a/gtk/plugins/win32/winprefs/winprefs.c b/pidgin/plugins/win32/winprefs/winprefs.c
index cdd8cba6c9..cdd8cba6c9 100644
--- a/gtk/plugins/win32/winprefs/winprefs.c
+++ b/pidgin/plugins/win32/winprefs/winprefs.c
diff --git a/gtk/plugins/xmppconsole.c b/pidgin/plugins/xmppconsole.c
index e6b90cf4b4..e6b90cf4b4 100644
--- a/gtk/plugins/xmppconsole.c
+++ b/pidgin/plugins/xmppconsole.c
diff --git a/gtk/sounds/Makefile.am b/pidgin/sounds/Makefile.am
index 0ca00aa9f1..0ca00aa9f1 100644
--- a/gtk/sounds/Makefile.am
+++ b/pidgin/sounds/Makefile.am
diff --git a/gtk/sounds/Makefile.mingw b/pidgin/sounds/Makefile.mingw
index b9e5e95a0a..b9e5e95a0a 100644
--- a/gtk/sounds/Makefile.mingw
+++ b/pidgin/sounds/Makefile.mingw
diff --git a/gtk/sounds/alert.wav b/pidgin/sounds/alert.wav
index e456f4ae56..e456f4ae56 100644
--- a/gtk/sounds/alert.wav
+++ b/pidgin/sounds/alert.wav
diff --git a/gtk/sounds/login.wav b/pidgin/sounds/login.wav
index ec06433ef4..ec06433ef4 100644
--- a/gtk/sounds/login.wav
+++ b/pidgin/sounds/login.wav
diff --git a/gtk/sounds/logout.wav b/pidgin/sounds/logout.wav
index 69af2462d0..69af2462d0 100644
--- a/gtk/sounds/logout.wav
+++ b/pidgin/sounds/logout.wav
diff --git a/gtk/sounds/receive.wav b/pidgin/sounds/receive.wav
index dce135e0f0..dce135e0f0 100644
--- a/gtk/sounds/receive.wav
+++ b/pidgin/sounds/receive.wav
diff --git a/gtk/sounds/send.wav b/pidgin/sounds/send.wav
index c77beb7f8f..c77beb7f8f 100644
--- a/gtk/sounds/send.wav
+++ b/pidgin/sounds/send.wav
diff --git a/gtk/win32/IdleTracker/Makefile.mingw b/pidgin/win32/IdleTracker/Makefile.mingw
index ebbdc1df27..ebbdc1df27 100644
--- a/gtk/win32/IdleTracker/Makefile.mingw
+++ b/pidgin/win32/IdleTracker/Makefile.mingw
diff --git a/gtk/win32/IdleTracker/idletrack.c b/pidgin/win32/IdleTracker/idletrack.c
index b256168a69..b256168a69 100644
--- a/gtk/win32/IdleTracker/idletrack.c
+++ b/pidgin/win32/IdleTracker/idletrack.c
diff --git a/gtk/win32/IdleTracker/idletrack.h b/pidgin/win32/IdleTracker/idletrack.h
index 46529aff89..46529aff89 100644
--- a/gtk/win32/IdleTracker/idletrack.h
+++ b/pidgin/win32/IdleTracker/idletrack.h
diff --git a/gtk/win32/MinimizeToTray.c b/pidgin/win32/MinimizeToTray.c
index 45dc2c823d..45dc2c823d 100644
--- a/gtk/win32/MinimizeToTray.c
+++ b/pidgin/win32/MinimizeToTray.c
diff --git a/gtk/win32/MinimizeToTray.h b/pidgin/win32/MinimizeToTray.h
index 1029c4436b..1029c4436b 100644
--- a/gtk/win32/MinimizeToTray.h
+++ b/pidgin/win32/MinimizeToTray.h
diff --git a/gtk/win32/gaimrc.rc.in b/pidgin/win32/gaimrc.rc.in
index 6c4b50a7d5..6c4b50a7d5 100644
--- a/gtk/win32/gaimrc.rc.in
+++ b/pidgin/win32/gaimrc.rc.in
diff --git a/gtk/win32/gtkdocklet-win32.c b/pidgin/win32/gtkdocklet-win32.c
index ec1db65abe..ec1db65abe 100644
--- a/gtk/win32/gtkdocklet-win32.c
+++ b/pidgin/win32/gtkdocklet-win32.c
diff --git a/gtk/win32/gtkgaimrc.rc.in b/pidgin/win32/gtkgaimrc.rc.in
index d88789e305..d88789e305 100644
--- a/gtk/win32/gtkgaimrc.rc.in
+++ b/pidgin/win32/gtkgaimrc.rc.in
diff --git a/gtk/win32/gtkwin32dep.c b/pidgin/win32/gtkwin32dep.c
index 0fc1c5d456..0fc1c5d456 100644
--- a/gtk/win32/gtkwin32dep.c
+++ b/pidgin/win32/gtkwin32dep.c
diff --git a/gtk/win32/gtkwin32dep.h b/pidgin/win32/gtkwin32dep.h
index 755b3e764e..755b3e764e 100644
--- a/gtk/win32/gtkwin32dep.h
+++ b/pidgin/win32/gtkwin32dep.h
diff --git a/gtk/win32/nsis/gaim-header.bmp b/pidgin/win32/nsis/gaim-header.bmp
index 64df1258f1..64df1258f1 100644
--- a/gtk/win32/nsis/gaim-header.bmp
+++ b/pidgin/win32/nsis/gaim-header.bmp
diff --git a/gtk/win32/nsis/gaim-intro.bmp b/pidgin/win32/nsis/gaim-intro.bmp
index e05c3f103f..e05c3f103f 100644
--- a/gtk/win32/nsis/gaim-intro.bmp
+++ b/pidgin/win32/nsis/gaim-intro.bmp
diff --git a/gtk/win32/nsis/gaim-plugin.nsh b/pidgin/win32/nsis/gaim-plugin.nsh
index b350485d53..b350485d53 100644
--- a/gtk/win32/nsis/gaim-plugin.nsh
+++ b/pidgin/win32/nsis/gaim-plugin.nsh
diff --git a/gtk/win32/nsis/langmacros.nsh b/pidgin/win32/nsis/langmacros.nsh
index 4637fed1ba..4637fed1ba 100644
--- a/gtk/win32/nsis/langmacros.nsh
+++ b/pidgin/win32/nsis/langmacros.nsh
diff --git a/gtk/win32/nsis/translations/albanian.nsh b/pidgin/win32/nsis/translations/albanian.nsh
index b264a80e26..b264a80e26 100644
--- a/gtk/win32/nsis/translations/albanian.nsh
+++ b/pidgin/win32/nsis/translations/albanian.nsh
diff --git a/gtk/win32/nsis/translations/bulgarian.nsh b/pidgin/win32/nsis/translations/bulgarian.nsh
index 9d5fa8809b..9d5fa8809b 100644
--- a/gtk/win32/nsis/translations/bulgarian.nsh
+++ b/pidgin/win32/nsis/translations/bulgarian.nsh
diff --git a/gtk/win32/nsis/translations/catalan.nsh b/pidgin/win32/nsis/translations/catalan.nsh
index d7f1b08cd3..d7f1b08cd3 100644
--- a/gtk/win32/nsis/translations/catalan.nsh
+++ b/pidgin/win32/nsis/translations/catalan.nsh
diff --git a/gtk/win32/nsis/translations/czech.nsh b/pidgin/win32/nsis/translations/czech.nsh
index 3c9f617dc2..3c9f617dc2 100644
--- a/gtk/win32/nsis/translations/czech.nsh
+++ b/pidgin/win32/nsis/translations/czech.nsh
diff --git a/gtk/win32/nsis/translations/danish.nsh b/pidgin/win32/nsis/translations/danish.nsh
index 43066cc66b..43066cc66b 100644
--- a/gtk/win32/nsis/translations/danish.nsh
+++ b/pidgin/win32/nsis/translations/danish.nsh
diff --git a/gtk/win32/nsis/translations/dutch.nsh b/pidgin/win32/nsis/translations/dutch.nsh
index 371eaac599..371eaac599 100644
--- a/gtk/win32/nsis/translations/dutch.nsh
+++ b/pidgin/win32/nsis/translations/dutch.nsh
diff --git a/gtk/win32/nsis/translations/english.nsh b/pidgin/win32/nsis/translations/english.nsh
index 0b0d24e03b..0b0d24e03b 100644
--- a/gtk/win32/nsis/translations/english.nsh
+++ b/pidgin/win32/nsis/translations/english.nsh
diff --git a/gtk/win32/nsis/translations/finnish.nsh b/pidgin/win32/nsis/translations/finnish.nsh
index 60ff67ff81..60ff67ff81 100644
--- a/gtk/win32/nsis/translations/finnish.nsh
+++ b/pidgin/win32/nsis/translations/finnish.nsh
diff --git a/gtk/win32/nsis/translations/french.nsh b/pidgin/win32/nsis/translations/french.nsh
index e300f05da7..e300f05da7 100644
--- a/gtk/win32/nsis/translations/french.nsh
+++ b/pidgin/win32/nsis/translations/french.nsh
diff --git a/gtk/win32/nsis/translations/galician.nsh b/pidgin/win32/nsis/translations/galician.nsh
index 2489339674..2489339674 100644
--- a/gtk/win32/nsis/translations/galician.nsh
+++ b/pidgin/win32/nsis/translations/galician.nsh
diff --git a/gtk/win32/nsis/translations/german.nsh b/pidgin/win32/nsis/translations/german.nsh
index 739f61a15d..739f61a15d 100644
--- a/gtk/win32/nsis/translations/german.nsh
+++ b/pidgin/win32/nsis/translations/german.nsh
diff --git a/gtk/win32/nsis/translations/hebrew.nsh b/pidgin/win32/nsis/translations/hebrew.nsh
index 52df55bba0..52df55bba0 100644
--- a/gtk/win32/nsis/translations/hebrew.nsh
+++ b/pidgin/win32/nsis/translations/hebrew.nsh
diff --git a/gtk/win32/nsis/translations/hungarian.nsh b/pidgin/win32/nsis/translations/hungarian.nsh
index 434350d3a3..434350d3a3 100644
--- a/gtk/win32/nsis/translations/hungarian.nsh
+++ b/pidgin/win32/nsis/translations/hungarian.nsh
diff --git a/gtk/win32/nsis/translations/italian.nsh b/pidgin/win32/nsis/translations/italian.nsh
index 8e216b1ae6..8e216b1ae6 100644
--- a/gtk/win32/nsis/translations/italian.nsh
+++ b/pidgin/win32/nsis/translations/italian.nsh
diff --git a/gtk/win32/nsis/translations/japanese.nsh b/pidgin/win32/nsis/translations/japanese.nsh
index 8a7985f782..8a7985f782 100644
--- a/gtk/win32/nsis/translations/japanese.nsh
+++ b/pidgin/win32/nsis/translations/japanese.nsh
diff --git a/gtk/win32/nsis/translations/korean.nsh b/pidgin/win32/nsis/translations/korean.nsh
index 0a5d398bf9..0a5d398bf9 100644
--- a/gtk/win32/nsis/translations/korean.nsh
+++ b/pidgin/win32/nsis/translations/korean.nsh
diff --git a/gtk/win32/nsis/translations/kurdish.nsh b/pidgin/win32/nsis/translations/kurdish.nsh
index 464c281897..464c281897 100644
--- a/gtk/win32/nsis/translations/kurdish.nsh
+++ b/pidgin/win32/nsis/translations/kurdish.nsh
diff --git a/gtk/win32/nsis/translations/lithuanian.nsh b/pidgin/win32/nsis/translations/lithuanian.nsh
index b760ac32c8..b760ac32c8 100644
--- a/gtk/win32/nsis/translations/lithuanian.nsh
+++ b/pidgin/win32/nsis/translations/lithuanian.nsh
diff --git a/gtk/win32/nsis/translations/norwegian.nsh b/pidgin/win32/nsis/translations/norwegian.nsh
index 97bd8708e8..97bd8708e8 100644
--- a/gtk/win32/nsis/translations/norwegian.nsh
+++ b/pidgin/win32/nsis/translations/norwegian.nsh
diff --git a/gtk/win32/nsis/translations/polish.nsh b/pidgin/win32/nsis/translations/polish.nsh
index 1438f6f3c4..1438f6f3c4 100644
--- a/gtk/win32/nsis/translations/polish.nsh
+++ b/pidgin/win32/nsis/translations/polish.nsh
diff --git a/gtk/win32/nsis/translations/portuguese-br.nsh b/pidgin/win32/nsis/translations/portuguese-br.nsh
index ee1ed78c35..ee1ed78c35 100644
--- a/gtk/win32/nsis/translations/portuguese-br.nsh
+++ b/pidgin/win32/nsis/translations/portuguese-br.nsh
diff --git a/gtk/win32/nsis/translations/portuguese.nsh b/pidgin/win32/nsis/translations/portuguese.nsh
index d1e2a5f058..d1e2a5f058 100644
--- a/gtk/win32/nsis/translations/portuguese.nsh
+++ b/pidgin/win32/nsis/translations/portuguese.nsh
diff --git a/gtk/win32/nsis/translations/romanian.nsh b/pidgin/win32/nsis/translations/romanian.nsh
index bfc7f01605..bfc7f01605 100644
--- a/gtk/win32/nsis/translations/romanian.nsh
+++ b/pidgin/win32/nsis/translations/romanian.nsh
diff --git a/gtk/win32/nsis/translations/russian.nsh b/pidgin/win32/nsis/translations/russian.nsh
index 0381ee6edb..0381ee6edb 100644
--- a/gtk/win32/nsis/translations/russian.nsh
+++ b/pidgin/win32/nsis/translations/russian.nsh
diff --git a/gtk/win32/nsis/translations/serbian-latin.nsh b/pidgin/win32/nsis/translations/serbian-latin.nsh
index f8ddac6a16..f8ddac6a16 100644
--- a/gtk/win32/nsis/translations/serbian-latin.nsh
+++ b/pidgin/win32/nsis/translations/serbian-latin.nsh
diff --git a/gtk/win32/nsis/translations/simp-chinese.nsh b/pidgin/win32/nsis/translations/simp-chinese.nsh
index fc6aa25eae..fc6aa25eae 100644
--- a/gtk/win32/nsis/translations/simp-chinese.nsh
+++ b/pidgin/win32/nsis/translations/simp-chinese.nsh
diff --git a/gtk/win32/nsis/translations/slovak.nsh b/pidgin/win32/nsis/translations/slovak.nsh
index def89dff5d..def89dff5d 100644
--- a/gtk/win32/nsis/translations/slovak.nsh
+++ b/pidgin/win32/nsis/translations/slovak.nsh
diff --git a/gtk/win32/nsis/translations/slovenian.nsh b/pidgin/win32/nsis/translations/slovenian.nsh
index 236197b172..236197b172 100644
--- a/gtk/win32/nsis/translations/slovenian.nsh
+++ b/pidgin/win32/nsis/translations/slovenian.nsh
diff --git a/gtk/win32/nsis/translations/spanish.nsh b/pidgin/win32/nsis/translations/spanish.nsh
index 22a033605a..22a033605a 100644
--- a/gtk/win32/nsis/translations/spanish.nsh
+++ b/pidgin/win32/nsis/translations/spanish.nsh
diff --git a/gtk/win32/nsis/translations/swedish.nsh b/pidgin/win32/nsis/translations/swedish.nsh
index 9cad1d167b..9cad1d167b 100644
--- a/gtk/win32/nsis/translations/swedish.nsh
+++ b/pidgin/win32/nsis/translations/swedish.nsh
diff --git a/gtk/win32/nsis/translations/trad-chinese.nsh b/pidgin/win32/nsis/translations/trad-chinese.nsh
index 508fa8e6de..508fa8e6de 100644
--- a/gtk/win32/nsis/translations/trad-chinese.nsh
+++ b/pidgin/win32/nsis/translations/trad-chinese.nsh
diff --git a/gtk/win32/nsis/translations/valencian.nsh b/pidgin/win32/nsis/translations/valencian.nsh
index abf9fed884..abf9fed884 100644
--- a/gtk/win32/nsis/translations/valencian.nsh
+++ b/pidgin/win32/nsis/translations/valencian.nsh
diff --git a/gtk/win32/nsis/translations/vietnamese.nsh b/pidgin/win32/nsis/translations/vietnamese.nsh
index 9a186ceba3..9a186ceba3 100644
--- a/gtk/win32/nsis/translations/vietnamese.nsh
+++ b/pidgin/win32/nsis/translations/vietnamese.nsh
diff --git a/gtk/win32/resource.h b/pidgin/win32/resource.h
index b39d3d96ef..b39d3d96ef 100644
--- a/gtk/win32/resource.h
+++ b/pidgin/win32/resource.h
diff --git a/gtk/win32/untar.c b/pidgin/win32/untar.c
index c36b8c6c7c..c36b8c6c7c 100644
--- a/gtk/win32/untar.c
+++ b/pidgin/win32/untar.c
diff --git a/gtk/win32/untar.h b/pidgin/win32/untar.h
index da4db3dfea..da4db3dfea 100644
--- a/gtk/win32/untar.h
+++ b/pidgin/win32/untar.h
diff --git a/gtk/win32/win_gaim.c b/pidgin/win32/win_gaim.c
index 716372d461..716372d461 100644
--- a/gtk/win32/win_gaim.c
+++ b/pidgin/win32/win_gaim.c
diff --git a/gtk/win32/wspell.c b/pidgin/win32/wspell.c
index 2e7d410fbb..2e7d410fbb 100644
--- a/gtk/win32/wspell.c
+++ b/pidgin/win32/wspell.c
diff --git a/gtk/win32/wspell.h b/pidgin/win32/wspell.h
index bd353b1c7b..bd353b1c7b 100644
--- a/gtk/win32/wspell.h
+++ b/pidgin/win32/wspell.h