pidgin.yaz: libpurple/request.c comparison

comparison libpurple/request.c @ 20597:591267f6f1d5

propagate from branch 'im.pidgin.pidgin' (head 025faf23aaac403798451974c320c4de6df470d5) to branch 'org.maemo.garage.pidgin.pidgin.dialog-transience' (head bab8f4f115d13e3eb53165748f147eae91ee250d)

author	Gabriel Schulhof <nix@go-nix.ca>
date	Sat, 22 Sep 2007 09:48:07 +0000
parents	6bf32c9e15a7 6a0d9fa477d4
children	285bb637a2b7

comparison

equal deleted inserted replaced

-:7d072354544a
+:591267f6f1d5
 				   const char *secondary, const char *default_value,
 				   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)
+				   const char *ui_hint, void *user_data)
 {
 	PurpleRequestUiOps *ops;
 	g_return_val_if_fail(ok_text != NULL, NULL);
 	g_return_val_if_fail(ok_cb   != NULL, NULL);
 											 default_value,
 											 multiline, masked, hint,
 											 ok_text, ok_cb,
 											 cancel_text, cancel_cb,
 											 account, who, conv,
-											 user_data);
+											 ui_hint, user_data);
 		handles = g_list_append(handles, info);
 		return info->ui_handle;
 	}
 purple_request_choice(void *handle, const char *title, const char *primary,
 					const char *secondary, 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, ...)
+					const char *ui_hint, void *user_data, ...)
 {
 	void *ui_handle;
 	va_list args;
 	g_return_val_if_fail(ok_text != NULL,  NULL);
 	va_start(args, user_data);
 	ui_handle = purple_request_choice_varg(handle, title, primary, secondary,
 					     default_value, ok_text, ok_cb,
 					     cancel_text, cancel_cb,
-					     account, who, conv, user_data, args);
+					     account, who, conv, ui_hint, user_data, args);
 	va_end(args);
 	return ui_handle;
 }
 			 const char *primary, const char *secondary,
 			 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 choices)
+			 const char *ui_hint, void *user_data, va_list choices)
 {
 	PurpleRequestUiOps *ops;
 	g_return_val_if_fail(ok_text != NULL,  NULL);
 	g_return_val_if_fail(ok_cb   != NULL,  NULL);
 		info->ui_handle = ops->request_choice(title, primary, secondary,
 						      default_value,
 						      ok_text, ok_cb,
 						      cancel_text, cancel_cb,
 							  account, who, conv,
-						      user_data, choices);
+						      ui_hint, user_data, choices);
 		handles = g_list_append(handles, info);
 		return info->ui_handle;
 	}
 void *
 purple_request_action(void *handle, const char *title, const char *primary,
 					const char *secondary, int default_action,
 					PurpleAccount *account, const char *who, PurpleConversation *conv,
-					void *user_data, size_t action_count, ...)
+					const char *ui_hint, void *user_data, size_t action_count, ...)
 {
 	void *ui_handle;
 	va_list args;
 	g_return_val_if_fail(action_count > 0, NULL);
 	va_start(args, action_count);
 	ui_handle = purple_request_action_varg(handle, title, primary, secondary,
 										 default_action, account, who, conv,
-										 user_data, action_count, args);
+										 ui_hint, user_data, action_count, args);
 	va_end(args);
 	return ui_handle;
 }
 void *
 purple_request_action_varg(void *handle, const char *title,
 						 const char *primary, const char *secondary,
 						 int default_action,
 						 PurpleAccount *account, const char *who, PurpleConversation *conv,
-						  void *user_data, size_t action_count, va_list actions)
+						 const char *ui_hint, void *user_data, size_t action_count, va_list actions)
 {
 	PurpleRequestUiOps *ops;
 	g_return_val_if_fail(action_count > 0, NULL);
 		info            = g_new0(PurpleRequestInfo, 1);
 		info->type      = PURPLE_REQUEST_ACTION;
 		info->handle    = handle;
 		info->ui_handle = ops->request_action(title, primary, secondary,
 											  default_action, account, who, conv,
-											  user_data, action_count, actions);
+											  ui_hint, user_data, action_count, actions);
 		handles = g_list_append(handles, info);
 		return info->ui_handle;
 	}
 purple_request_fields(void *handle, const char *title, const char *primary,
 					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)
+					const char *ui_hint, void *user_data)
 {
 	PurpleRequestUiOps *ops;
 	g_return_val_if_fail(fields  != NULL, NULL);
 	g_return_val_if_fail(ok_text != NULL, NULL);
 		info->handle    = handle;
 		info->ui_handle = ops->request_fields(title, primary, secondary,
 											  fields, ok_text, ok_cb,
 											  cancel_text, cancel_cb,
 											  account, who, conv,
-											  user_data);
+											  ui_hint, user_data);
 		handles = g_list_append(handles, info);
 		return info->ui_handle;
 	}
 void *
 purple_request_file(void *handle, const char *title, const char *filename,
 				  gboolean savedialog,
 				  GCallback ok_cb, GCallback cancel_cb,
 				  PurpleAccount *account, const char *who, PurpleConversation *conv,
-				  void *user_data)
+				  const char *ui_hint, void *user_data)
 {
 	PurpleRequestUiOps *ops;
 	ops = purple_request_get_ui_ops();
 		info            = g_new0(PurpleRequestInfo, 1);
 		info->type      = PURPLE_REQUEST_FILE;
 		info->handle    = handle;
 		info->ui_handle = ops->request_file(title, filename, savedialog,
 											ok_cb, cancel_cb,
-											account, who, conv, user_data);
+											account, who, conv, ui_hint, user_data);
 		handles = g_list_append(handles, info);
 		return info->ui_handle;
 	}
 	return NULL;
 void *
 purple_request_folder(void *handle, const char *title, const char *dirname,
 				  GCallback ok_cb, GCallback cancel_cb,
 				  PurpleAccount *account, const char *who, PurpleConversation *conv,
-				  void *user_data)
+				  const char *ui_hint, void *user_data)
 {
 	PurpleRequestUiOps *ops;
 	ops = purple_request_get_ui_ops();
 		info->type      = PURPLE_REQUEST_FOLDER;
 		info->handle    = handle;
 		info->ui_handle = ops->request_folder(title, dirname,
 											ok_cb, cancel_cb,
 											account, who, conv,
-											user_data);
+											ui_hint, user_data);
 		handles = g_list_append(handles, info);
 		return info->ui_handle;
 	}
 	return NULL;

Mercurial > pidgin.yaz

comparison libpurple/request.c @ 20597:591267f6f1d5