# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1174323782 0
# Node ID 9e6dd4e924a559b25bd66cf788005a9a41a86f2e
# Parent  2f8274ce570a5c75acc5bfb991ab66adb2570ae8# Parent  c12bf63ba2ccb06edfaebf793ed9a283baf6821e
merge of 'b832e269fb7a739638e43b6d96e1b5fa46f3a64c'
     and 'cf81a9a130f823277c62b3d52b48f02ff2a9a0eb'

diff -r 2f8274ce570a -r 9e6dd4e924a5 finch/gntrequest.c
--- a/finch/gntrequest.c	Mon Mar 19 17:02:24 2007 +0000
+++ b/finch/gntrequest.c	Mon Mar 19 17:03:02 2007 +0000
@@ -384,18 +384,18 @@
 			}
 			else if (type == PURPLE_REQUEST_FIELD_STRING)
 			{
-				const char *hint = gaim_request_field_get_type_hint(field);
+				const char *hint = purple_request_field_get_type_hint(field);
 				GntWidget *entry = gnt_entry_new(
 							purple_request_field_string_get_default_value(field));
 				gnt_entry_set_masked(GNT_ENTRY(entry),
 						purple_request_field_string_is_masked(field));
-				if (gaim_str_has_prefix(hint, "screenname")) {
-					GaimBlistNode *node = gaim_blist_get_root();
-					gboolean offline = gaim_str_has_suffix(hint, "all");
-					for (; node; node = gaim_blist_node_next(node, offline)) {
-						if (!GAIM_BLIST_NODE_IS_BUDDY(node))
+				if (purple_str_has_prefix(hint, "screenname")) {
+					PurpleBlistNode *node = purple_blist_get_root();
+					gboolean offline = purple_str_has_suffix(hint, "all");
+					for (; node; node = purple_blist_node_next(node, offline)) {
+						if (!PURPLE_BLIST_NODE_IS_BUDDY(node))
 							continue;
-						gnt_entry_add_suggest(GNT_ENTRY(entry), gaim_buddy_get_name((GaimBuddy*)node));
+						gnt_entry_add_suggest(GNT_ENTRY(entry), purple_buddy_get_name((PurpleBuddy*)node));
 					}
 					gnt_entry_set_always_suggest(GNT_ENTRY(entry), TRUE);
 				}