# HG changeset patch # User Richard Laager # Date 1174466585 0 # Node ID abb1e1e0c96fd7f57c30a014585c8ff6bcf9c944 # Parent 4c707efebc0c8ac5f7e9fe29c4c28130ea2e9e6a I don't know if the OSCAR checksum stuff will be copied to pidgin.im, but it certainly won't be at a website that's not ours (wrong because of the sed). diff -r 4c707efebc0c -r abb1e1e0c96f libpurple/internal.h --- a/libpurple/internal.h Wed Mar 21 08:41:56 2007 +0000 +++ b/libpurple/internal.h Wed Mar 21 08:43:05 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://purple.sourceforge.net/" +#define PURPLE_WEBSITE "http://pidgin.im/" #ifndef _WIN32 /* Everything needs to include this, because diff -r 4c707efebc0c -r abb1e1e0c96f libpurple/protocols/oscar/oscar.c --- a/libpurple/protocols/oscar/oscar.c Wed Mar 21 08:41:56 2007 +0000 +++ b/libpurple/protocols/oscar/oscar.c Wed Mar 21 08:43:05 2007 +0000 @@ -60,7 +60,7 @@ #define OSCAR_STATUS_ID_CUSTOM "custom" #define OSCAR_STATUS_ID_MOBILE "mobile" -#define AIMHASHDATA "http://purple.sourceforge.net/aim_data.php3" +#define AIMHASHDATA "http://pidgin.im/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, "purple.sourceforge.net", 80, + if (purple_proxy_connect(NULL, pos->gc->account, "pidgin.im", 80, straight_to_hell, pos) == NULL) { char buf[256]; diff -r 4c707efebc0c -r abb1e1e0c96f pidgin/pixmaps/Makefile.am --- a/pidgin/pixmaps/Makefile.am Wed Mar 21 08:41:56 2007 +0000 +++ b/pidgin/pixmaps/Makefile.am Wed Mar 21 08:43:05 2007 +0000 @@ -50,14 +50,14 @@ gaim.ico -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 +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 -gaimiconpixdir = $(datadir)/pixmaps/pidgin/icons -gaimiconpix_DATA = window-icon.png +pidginiconpixdir = $(datadir)/pixmaps/pidgin/icons +pidginiconpix_DATA = window-icon.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 +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 distpixmapdir = $(datadir)/pixmaps diff -r 4c707efebc0c -r abb1e1e0c96f pidgin/plugins/relnot.c --- a/pidgin/plugins/relnot.c Wed Mar 21 08:41:56 2007 +0000 +++ b/pidgin/plugins/relnot.c Wed Mar 21 08:43:05 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://purple.sourceforge.net/version.php?version=%s&build=%s", purple_core_get_version(), + char *url = g_strdup_printf("http://pidgin.im/version.php?version=%s&build=%s", purple_core_get_version(), #ifdef _WIN32 "purple-win32" #else