diff libpurple/protocols/yahoo/yahoo.c @ 23402: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
line wrap: on
line diff
--- a/libpurple/protocols/yahoo/yahoo.c	Tue Jul 01 23:21:20 2008 +0000
+++ b/libpurple/protocols/yahoo/yahoo.c	Tue Jul 01 23:40:13 2008 +0000
@@ -1995,13 +1995,19 @@
 			yahoo_process_auth_new(gc, seed);
 			break;
 		default:
-			buf = g_strdup_printf(_("The Yahoo server has requested the use of an unrecognized "
-						"authentication method.  You will probably not be able "
-						"to successfully sign on to Yahoo.  Check %s for updates."), PURPLE_WEBSITE);
-			purple_notify_error(gc, "", _("Failed Yahoo! Authentication"),
-					  buf);
-			g_free(buf);
-			yahoo_process_auth_new(gc, seed); /* Can't hurt to try it anyway. */
+			{
+				GHashTable *ui_info = purple_core_get_ui_info();
+
+				buf = g_strdup_printf(_("The Yahoo server has requested the use of an unrecognized "
+							"authentication method.  You will probably not be able "
+							"to successfully sign on to Yahoo.  Check %s for updates."),
+							((ui_info && g_hash_table_lookup(ui_info, "website")) ? (char *)g_hash_table_lookup(ui_info, "website") : PURPLE_WEBSITE));
+				purple_notify_error(gc, "", _("Failed Yahoo! Authentication"),
+							buf);
+				g_free(buf);
+				yahoo_process_auth_new(gc, seed); /* Can't hurt to try it anyway. */
+				break;
+			}
 		}
 	}
 }