# HG changeset patch
# User John Bailey <rekkanoryo@rekkanoryo.org>
# Date 1224552170 0
# Node ID 70a1dfd52d6c297ec79e7d65605fc4db201f47a3
# Parent  0a25d4ed981b81cecb933d9c245273385e4fba2a# Parent  273d5fc31eab891e44f1b0af19e1d77b52c05316
merge of '2506f7dd86d254a0a503554e51b61106f45e0f80'
     and '509d2bd4f86d7f8da0d7cb581732e21ac886c7c6'

diff -r 273d5fc31eab -r 70a1dfd52d6c libpurple/protocols/yahoo/yahoo.h
--- a/libpurple/protocols/yahoo/yahoo.h	Tue Oct 21 01:04:50 2008 +0000
+++ b/libpurple/protocols/yahoo/yahoo.h	Tue Oct 21 01:22:50 2008 +0000
@@ -31,7 +31,7 @@
 #define YAHOO_PAGER_HOST "scs.msg.yahoo.com"
 #define YAHOO_PAGER_PORT 5050
 #define YAHOO_PROFILE_URL "http://profiles.yahoo.com/"
-#define YAHOO_MAIL_URL "https://login.yahoo.com/config/login?.src=ym"
+#define YAHOO_MAIL_URL "http://us.rd.yahoo.com/messenger/client/?http://mail.yahoo.com/"
 #define YAHOO_XFER_HOST "filetransfer.msg.yahoo.com"
 #define YAHOO_XFER_PORT 80
 #define YAHOO_XFER_RELAY_HOST "relay.msg.yahoo.com"
diff -r 273d5fc31eab -r 70a1dfd52d6c pidgin/gtkdialogs.c
--- a/pidgin/gtkdialogs.c	Tue Oct 21 01:04:50 2008 +0000
+++ b/pidgin/gtkdialogs.c	Tue Oct 21 01:22:50 2008 +0000
@@ -70,7 +70,7 @@
 /* Order: Alphabetical by Last Name */
 static const struct developer developers[] = {
 	{"Daniel 'datallah' Atallah",	N_("developer"), NULL},
-	{"John 'rekkanoryo' Bailey",	N_("developer"), NULL},
+	{"John 'rekkanoryo' Bailey",	N_("developer & bug master"), NULL},
 	{"Ethan 'Paco-Paco' Blanton",	N_("developer"), NULL},
 	{"Thomas Butter",				N_("developer"), NULL},
 	/* feel free to not translate this */
@@ -88,18 +88,15 @@
 	{"Tim 'marv' Ringenbach",		N_("developer"), NULL},
 	{"Elliott 'QuLogic' Sales de Andrade",	N_("developer"),	NULL},
 	{"Luke 'LSchiere' Schierer",	N_("support"), "lschiere@users.sf.net"},
-	{"Megan 'Cae' Schneider",       N_("support/QA"), NULL},
 	{"Evan Schoenberg",		N_("developer"), NULL},
 	{"Kevin 'SimGuy' Stange",	N_("developer & webmaster"),	NULL},
 	{"Will 'resiak' Thompson",	N_("developer"),	NULL},
 	{"Stu 'nosnilmot' Tomlinson",	N_("developer"), NULL},
-	{"Nathan 'faceprint' Walp",		N_("developer"), NULL},
 	{NULL, NULL, NULL}
 };
 
 /* Order: Alphabetical by Last Name */
 static const struct developer patch_writers[] = {
-	{"Felipe 'shx' Contreras",		NULL,	NULL},
 	{"Marcus 'malu' Lundblad", NULL, NULL},
 	{"Dennis 'EvilDennisR' Ristuccia",	N_("Senior Contributor/QA"),	NULL},
 	{"Peter 'Fmoo' Ruibal",		NULL,	NULL},
@@ -117,14 +114,17 @@
 	{"Christian 'ChipX86' Hammond",	N_("developer & webmaster"), NULL},
 	/* If "lazy bum" translates literally into a serious insult, use something else or omit it. */
 	{"Syd Logan",			N_("hacker and designated driver [lazy bum]"), NULL},
+	{"Megan 'Cae' Schneider",       N_("support/QA"), NULL},
 	{"Jim Seymour",			N_("XMPP developer"), NULL},
 	{"Mark Spencer",		N_("original author"), "markster@marko.net"},
+	{"Nathan 'faceprint' Walp",		N_("developer"), NULL},
 	{"Eric Warmenhoven",	N_("lead developer"), "warmenhoven@yahoo.com"},
 	{NULL, NULL, NULL}
 };
 
 /* Order: Alphabetical by Last Name */
 static const struct developer retired_patch_writers[] = {
+	{"Felipe 'shx' Contreras",		NULL,	NULL},
 	{"Decklin Foster",				NULL,	NULL},
 	{"Peter 'Bleeter' Lawler",      NULL,   NULL},
 	{"Robert 'Robot101' McQueen",	NULL,	NULL},