diff libpurple/protocols/oscar/clientlogin.c @ 27427:4f24d5da4cb3

Create a oscar_get_ui_info_string() function that looks up a value in the ui_info hash table, and use this function in clientlogin.c and oscar.c

--- a/libpurple/protocols/oscar/clientlogin.c	Wed Jul 08 19:15:31 2009 +0000
+++ b/libpurple/protocols/oscar/clientlogin.c	Wed Jul 08 19:46:50 2009 +0000
@@ -56,17 +56,9 @@
 
 static const char *get_client_key(OscarData *od)
 {
-	GHashTable *ui_info;
-	const char *client_key = NULL;
-
-	ui_info = purple_core_get_ui_info();
-	if (ui_info != NULL)
-		client_key = g_hash_table_lookup(ui_info,
-				od->icq ? "prpl-icq-clientkey" : "prpl-aim-clientkey");
-	if (client_key == NULL)
-		client_key = DEFAULT_CLIENT_KEY;
-
-	return client_key;
+	return oscar_get_ui_info_string(
+			od->icq ? "prpl-icq-clientkey" : "prpl-aim-clientkey",
+			DEFAULT_CLIENT_KEY);
 }
 
 /**