diff pidgin/gtkrequest.c @ 16442:08db93bbd798

Added account, who, and conversation parameters to the request API calls, and updated all code to match. I can't compile the Perl module, so I'd appreciate it if someone who knows it would verify that this doesn't break Perl.

--- a/pidgin/gtkrequest.c	Thu Apr 26 10:49:27 2007 +0000
+++ b/pidgin/gtkrequest.c	Thu Apr 26 12:25:49 2007 +0000
@@ -285,6 +285,7 @@
 					   gboolean multiline, gboolean masked, gchar *hint,
 					   const char *ok_text, GCallback ok_cb,
 					   const char *cancel_text, GCallback cancel_cb,
+					   PurpleAccount *account, const char *who, PurpleConversation *conv,
 					   void *user_data)
 {
 	PidginRequestData *data;
@@ -443,6 +444,7 @@
 			const char *secondary, unsigned int default_value,
 			const char *ok_text, GCallback ok_cb,
 			const char *cancel_text, GCallback cancel_cb,
+			PurpleAccount *account, const char *who, PurpleConversation *conv,
 			void *user_data, va_list args)
 {
 	PidginRequestData *data;
@@ -544,6 +546,7 @@
 static void *
 pidgin_request_action(const char *title, const char *primary,
 						const char *secondary, unsigned int default_action,
+					    PurpleAccount *account, const char *who, PurpleConversation *conv,
 						void *user_data, size_t action_count, va_list actions)
 {
 	PidginRequestData *data;
@@ -1025,6 +1028,7 @@
 						const char *secondary, PurpleRequestFields *fields,
 						const char *ok_text, GCallback ok_cb,
 						const char *cancel_text, GCallback cancel_cb,
+					    PurpleAccount *account, const char *who, PurpleConversation *conv,
 						void *user_data)
 {
 	PidginRequestData *data;
@@ -1467,7 +1471,9 @@
 	if ((data->u.file.savedialog == TRUE) &&
 		(g_file_test(data->u.file.name, G_FILE_TEST_EXISTS))) {
 		purple_request_action(data, NULL, _("That file already exists"),
-							_("Would you like to overwrite it?"), 0, data, 2,
+							_("Would you like to overwrite it?"), 0,
+							NULL, NULL, NULL,
+							data, 2,
 							_("Overwrite"), G_CALLBACK(file_yes_no_cb),
 							_("Choose New Name"), G_CALLBACK(file_yes_no_cb));
 	} else
@@ -1491,6 +1497,7 @@
 pidgin_request_file(const char *title, const char *filename,
 					  gboolean savedialog,
 					  GCallback ok_cb, GCallback cancel_cb,
+					  PurpleAccount *account, const char *who, PurpleConversation *conv,
 					  void *user_data)
 {
 	PidginRequestData *data;
@@ -1588,6 +1595,7 @@
 static void *
 pidgin_request_folder(const char *title, const char *dirname,
 					  GCallback ok_cb, GCallback cancel_cb,
+					  PurpleAccount *account, const char *who, PurpleConversation *conv,
 					  void *user_data)
 {
 	PidginRequestData *data;