diff libpurple/request.c @ 21351:7b30d02a36aa

merge of '55275a531f00a6cabade1b8bfe74eafa3c2db4ba' and 'a4922c657f183e4b124142298268ba47350a72e0'
author Richard Laager <rlaager@wiktel.com>
date Fri, 16 Nov 2007 23:01:34 +0000
parents d4f95419be45
children 8ae227dca885
line wrap: on
line diff
--- a/libpurple/request.c	Fri Nov 16 23:01:26 2007 +0000
+++ b/libpurple/request.c	Fri Nov 16 23:01:34 2007 +0000
@@ -1230,7 +1230,7 @@
 {
 	return purple_request_input_with_hint(
 		handle, title, primary, secondary, default_value, multiline, masked, hint, ok_text, ok_cb,
-		cancel_text, cancel_cb, account, who, conv, PURPLE_REQUEST_UI_HINT_BLIST, user_data);
+		cancel_text, cancel_cb, account, who, conv, PURPLE_REQUEST_HINT_BLIST, user_data);
 }
 
 void *
@@ -1289,7 +1289,7 @@
 	ui_handle = purple_request_choice_varg_with_hint(handle, title, primary, secondary,
 					     default_value, ok_text, ok_cb,
 					     cancel_text, cancel_cb,
-					     account, who, conv, PURPLE_REQUEST_UI_HINT_BLIST, user_data, args);
+					     account, who, conv, PURPLE_REQUEST_HINT_BLIST, user_data, args);
 	va_end(args);
 
 	return ui_handle;
@@ -1330,7 +1330,7 @@
 {
 	return purple_request_choice_varg_with_hint(
 		handle, title, primary, secondary, default_value, ok_text, ok_cb,
-		cancel_text, cancel_cb, account, who, conv, PURPLE_REQUEST_UI_HINT_BLIST, user_data, choices);
+		cancel_text, cancel_cb, account, who, conv, PURPLE_REQUEST_HINT_BLIST, user_data, choices);
 }
 
 void *
@@ -1384,7 +1384,7 @@
 	va_start(args, action_count);
 	ui_handle = purple_request_action_varg_with_hint(handle, title, primary, secondary,
 										 default_action, account, who, conv,
-										 PURPLE_REQUEST_UI_HINT_BLIST, user_data, action_count, args);
+										 PURPLE_REQUEST_HINT_BLIST, user_data, action_count, args);
 	va_end(args);
 
 	return ui_handle;
@@ -1419,7 +1419,7 @@
 {
 	return purple_request_action_varg_with_hint(
 		handle, title, primary, secondary, default_action, account, who, conv,
-		PURPLE_REQUEST_UI_HINT_BLIST, user_data, action_count, actions);
+		PURPLE_REQUEST_HINT_BLIST, user_data, action_count, actions);
 }
 
 void *
@@ -1463,7 +1463,7 @@
 {
 	return purple_request_fields_with_hint(
 		handle, title, primary, secondary, fields, ok_text, ok_cb,
-		cancel_text, cancel_cb, account, who, conv, PURPLE_REQUEST_UI_HINT_BLIST, user_data);
+		cancel_text, cancel_cb, account, who, conv, PURPLE_REQUEST_HINT_BLIST, user_data);
 }
 
 void *
@@ -1510,7 +1510,7 @@
 				  void *user_data)
 {
 	return purple_request_file_with_hint(
-		handle, title, filename, savedialog, ok_cb, cancel_cb, account, who, conv, PURPLE_REQUEST_UI_HINT_BLIST, user_data);
+		handle, title, filename, savedialog, ok_cb, cancel_cb, account, who, conv, PURPLE_REQUEST_HINT_BLIST, user_data);
 }
 
 void *
@@ -1547,7 +1547,7 @@
 				  void *user_data)
 {
 	return purple_request_folder_with_hint(
-		handle, title, dirname, ok_cb, cancel_cb, account, who, conv, PURPLE_REQUEST_UI_HINT_BLIST, user_data);
+		handle, title, dirname, ok_cb, cancel_cb, account, who, conv, PURPLE_REQUEST_HINT_BLIST, user_data);
 }
 
 void *