Mercurial > pidgin.yaz
comparison libpurple/protocols/yahoo/yahoo.c @ 23404:c6b29adc22d1
Added "website" and "dev_website" items to the ui_info GHashTable,
and made use of "website" wherever PURPLE_WEBSITE was found previously.
Thanks to Stu for the suggestion as a replacement for my #define-based
previous solution.
| author | Evan Schoenberg <evan.s@dreskin.net> |
|---|---|
| date | Tue, 01 Jul 2008 23:40:13 +0000 |
| parents | f1602b78aa59 |
| children | aaaff38e144f 797377cbd5bf e23b447aa5ca 91a7d0ad2021 28a7992d37b2 |
comparison
equal
deleted
inserted
replaced
| 23403:18cc881d5a73 | 23404:c6b29adc22d1 |
|---|---|
| 1993 case 1: | 1993 case 1: |
| 1994 case 2: /* This case seems to work, could probably use testing */ | 1994 case 2: /* This case seems to work, could probably use testing */ |
| 1995 yahoo_process_auth_new(gc, seed); | 1995 yahoo_process_auth_new(gc, seed); |
| 1996 break; | 1996 break; |
| 1997 default: | 1997 default: |
| 1998 buf = g_strdup_printf(_("The Yahoo server has requested the use of an unrecognized " | 1998 { |
| 1999 "authentication method. You will probably not be able " | 1999 GHashTable *ui_info = purple_core_get_ui_info(); |
| 2000 "to successfully sign on to Yahoo. Check %s for updates."), PURPLE_WEBSITE); | 2000 |
| 2001 purple_notify_error(gc, "", _("Failed Yahoo! Authentication"), | 2001 buf = g_strdup_printf(_("The Yahoo server has requested the use of an unrecognized " |
| 2002 buf); | 2002 "authentication method. You will probably not be able " |
| 2003 g_free(buf); | 2003 "to successfully sign on to Yahoo. Check %s for updates."), |
| 2004 yahoo_process_auth_new(gc, seed); /* Can't hurt to try it anyway. */ | 2004 ((ui_info && g_hash_table_lookup(ui_info, "website")) ? (char *)g_hash_table_lookup(ui_info, "website") : PURPLE_WEBSITE)); |
| 2005 purple_notify_error(gc, "", _("Failed Yahoo! Authentication"), | |
| 2006 buf); | |
| 2007 g_free(buf); | |
| 2008 yahoo_process_auth_new(gc, seed); /* Can't hurt to try it anyway. */ | |
| 2009 break; | |
| 2010 } | |
| 2005 } | 2011 } |
| 2006 } | 2012 } |
| 2007 } | 2013 } |
| 2008 | 2014 |
| 2009 static void ignore_buddy(PurpleBuddy *buddy) { | 2015 static void ignore_buddy(PurpleBuddy *buddy) { |