# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1174466760 0
# Node ID b2903ec59bb70be1895ad378ee2a64677974b084
# Parent  abb1e1e0c96fd7f57c30a014585c8ff6bcf9c944
disapproval of revision 'e3e969c26f10e201035feb11d97774f43ab7c3d4'

diff -r abb1e1e0c96f -r b2903ec59bb7 libpurple/internal.h
--- a/libpurple/internal.h	Wed Mar 21 08:43:05 2007 +0000
+++ b/libpurple/internal.h	Wed Mar 21 08:46:00 2007 +0000
@@ -181,7 +181,7 @@
 #define purple_strlcpy(dest, src) g_strlcpy(dest, src, sizeof(dest))
 #define purple_strlcat(dest, src) g_strlcat(dest, src, sizeof(dest))
 
-#define PURPLE_WEBSITE "http://pidgin.im/"
+#define PURPLE_WEBSITE "http://purple.sourceforge.net/"
 
 #ifndef _WIN32
 /* Everything needs to include this, because
diff -r abb1e1e0c96f -r b2903ec59bb7 libpurple/protocols/oscar/oscar.c
--- a/libpurple/protocols/oscar/oscar.c	Wed Mar 21 08:43:05 2007 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Wed Mar 21 08:46:00 2007 +0000
@@ -60,7 +60,7 @@
 #define OSCAR_STATUS_ID_CUSTOM      "custom"
 #define OSCAR_STATUS_ID_MOBILE	    "mobile"
 
-#define AIMHASHDATA "http://pidgin.im/aim_data.php3"
+#define AIMHASHDATA "http://purple.sourceforge.net/aim_data.php3"
 
 #define OSCAR_CONNECT_STEPS 6
 
@@ -1593,7 +1593,7 @@
 	pos->modname = g_strdup(modname);
 
 	/* TODO: Keep track of this return value. */
-	if (purple_proxy_connect(NULL, pos->gc->account, "pidgin.im", 80,
+	if (purple_proxy_connect(NULL, pos->gc->account, "purple.sourceforge.net", 80,
 			straight_to_hell, pos) == NULL)
 	{
 		char buf[256];
diff -r abb1e1e0c96f -r b2903ec59bb7 pidgin/pixmaps/Makefile.am
--- a/pidgin/pixmaps/Makefile.am	Wed Mar 21 08:43:05 2007 +0000
+++ b/pidgin/pixmaps/Makefile.am	Wed Mar 21 08:46:00 2007 +0000
@@ -50,14 +50,14 @@
 		gaim.ico			
 
 
-pidginbuttonpixdir = $(datadir)/pixmaps/pidgin/buttons
-pidginbuttonpix_DATA = about_menu.png accounts.png change-bgcolor-small.png change-fgcolor-small.png edit.png info.png insert-image-small.png insert-link-small.png insert-smiley-small.png pause.png text_bigger.png text_normal.png text_smaller.png send-im.png
+gaimbuttonpixdir = $(datadir)/pixmaps/gaim/buttons
+gaimbuttonpix_DATA = about_menu.png accounts.png change-bgcolor-small.png change-fgcolor-small.png edit.png info.png insert-image-small.png insert-link-small.png insert-smiley-small.png pause.png text_bigger.png text_normal.png text_smaller.png send-im.png
 
-pidginiconpixdir = $(datadir)/pixmaps/pidgin/icons
-pidginiconpix_DATA = window-icon.png
+gaimiconpixdir = $(datadir)/pixmaps/pidgin/icons
+gaimiconpix_DATA = window-icon.png
 
-pidgindistpixdir = $(datadir)/pixmaps/pidgin
-pidgindistpix_DATA = logo.png tb_drag_arrow_down.xpm tb_drag_arrow_left.xpm tb_drag_arrow_right.xpm tb_drag_arrow_up.xpm typed.png typing.png status-online.png status-offline.png status-away.png status-invisible.png status-typing0.png status-typing1.png status-typing2.png status-typing3.png status-connect0.png status-connect1.png status-connect2.png status-connect3.png phone.png insert-image.png
+gaimdistpixdir = $(datadir)/pixmaps/gaim
+gaimdistpix_DATA = logo.png tb_drag_arrow_down.xpm tb_drag_arrow_left.xpm tb_drag_arrow_right.xpm tb_drag_arrow_up.xpm typed.png typing.png status-online.png status-offline.png status-away.png status-invisible.png status-typing0.png status-typing1.png status-typing2.png status-typing3.png status-connect0.png status-connect1.png status-connect2.png status-connect3.png phone.png insert-image.png
 
 
 distpixmapdir = $(datadir)/pixmaps
diff -r abb1e1e0c96f -r b2903ec59bb7 pidgin/plugins/relnot.c
--- a/pidgin/plugins/relnot.c	Wed Mar 21 08:43:05 2007 +0000
+++ b/pidgin/plugins/relnot.c	Wed Mar 21 08:46:00 2007 +0000
@@ -96,7 +96,7 @@
 {
 	int last_check = purple_prefs_get_int("/plugins/gtk/relnot/last_check");
 	if(!last_check || time(NULL) - last_check > MIN_CHECK_INTERVAL) {
-		char *url = g_strdup_printf("http://pidgin.im/version.php?version=%s&build=%s", purple_core_get_version(),
+		char *url = g_strdup_printf("http://purple.sourceforge.net/version.php?version=%s&build=%s", purple_core_get_version(),
 #ifdef _WIN32
 				"purple-win32"
 #else