disapproval of revision '8ba833993a115415727bb1b70362e0bd1603c169'

1 files changed, 6 insertions, 125 deletions

diff --git a/libpurple/request.h b/libpurple/request.h
index 6d7fc13360..799a90aae8 100644
--- a/libpurple/request.h
+++ b/libpurple/request.h
@@ -189,33 +189,33 @@ typedef struct
 						   const char *ok_text, GCallback ok_cb,
 						   const char *cancel_text, GCallback cancel_cb,
 						   PurpleAccount *account, const char *who, PurpleConversation *conv,
-						   const char *ui_hint, void *user_data);
+						   void *user_data);
 	void *(*request_choice)(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,
-							const char *ui_hint, void *user_data, va_list choices);
+							void *user_data, va_list choices);
 	void *(*request_action)(const char *title, const char *primary,
 							const char *secondary, int default_action,
 							PurpleAccount *account, const char *who, PurpleConversation *conv,
-							const char *ui_hint, void *user_data, size_t action_count,
+							void *user_data, size_t action_count,
 							va_list actions);
 	void *(*request_fields)(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,
-							const char *ui_hint, void *user_data);
+							void *user_data);
 	void *(*request_file)(const char *title, const char *filename,
 						  gboolean savedialog, GCallback ok_cb, GCallback cancel_cb,
 						  PurpleAccount *account, const char *who, PurpleConversation *conv,
-						  const char *ui_hint, void *user_data);
+						  void *user_data);
 	void (*close_request)(PurpleRequestType type, void *ui_handle);
 	void *(*request_folder)(const char *title, const char *dirname,
 							GCallback ok_cb, GCallback cancel_cb,
 							PurpleAccount *account, const char *who, PurpleConversation *conv,
-							const char *ui_hint, void *user_data);
+							void *user_data);
 
 	void (*_purple_reserved1)(void);
 	void (*_purple_reserved2)(void);
@@ -1187,23 +1187,10 @@ PurpleFilterAccountFunc purple_request_field_account_get_filter(
  * @param account		The PurpleAccount associated with this request, or NULL if none is
  * @param who			The username of the buddy assocaited with this request, or NULL if none is
  * @param conv			The PurpleConversation associated with this request, or NULL if none is
- * @param ui_hint       UI hint
  * @param user_data     The data to pass to the callback.
  *
  * @return A UI-specific handle.
  */
-void *purple_request_input_with_hint(void *handle, const char *title,
-						 const char *primary, 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,
-						 const char *ui_hint, void *user_data);
-
-/**
- * @deprecated Please use purple_request_input_with_hint() instead.
- */
 void *purple_request_input(void *handle, const char *title,
 						 const char *primary, const char *secondary,
 						 const char *default_value,
@@ -1230,24 +1217,12 @@ void *purple_request_input(void *handle, const char *title,
  * @param account		The PurpleAccount associated with this request, or NULL if none is
  * @param who			The username of the buddy assocaited with this request, or NULL if none is
  * @param conv			The PurpleConversation associated with this request, or NULL if none is
- * @param ui_hint       UI hint
  * @param user_data     The data to pass to the callback.
  * @param ...           The choices.  This argument list should be
  *                      terminated with a NULL parameter.
  *
  * @return A UI-specific handle.
  */
-void *purple_request_choice_with_hint(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,
-						  const char *ui_hint, void *user_data, ...) G_GNUC_NULL_TERMINATED;
-
-/**
- * @deprecated Please use purple_request_choice_with_hint() instead.
- */
 void *purple_request_choice(void *handle, const char *title,
 						  const char *primary, const char *secondary,
 						  int default_value,
@@ -1273,24 +1248,12 @@ void *purple_request_choice(void *handle, const char *title,
  * @param account		The PurpleAccount associated with this request, or NULL if none is
  * @param who			The username of the buddy assocaited with this request, or NULL if none is
  * @param conv			The PurpleConversation associated with this request, or NULL if none is
- * @param ui_hint       UI hint
  * @param user_data     The data to pass to the callback.
  * @param choices       The choices.  This argument list should be
  *                      terminated with a @c NULL parameter.
  *
  * @return A UI-specific handle.
  */
-void *purple_request_choice_varg_with_hint(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,
-							   const char *ui_hint, void *user_data, va_list choices);
-
-/**
- * @deprecated Please use purple_request_choice_varg_with_hint() instead.
- */
 void *purple_request_choice_varg(void *handle, const char *title,
 							   const char *primary, const char *secondary,
 							   int default_value,
@@ -1314,7 +1277,6 @@ void *purple_request_choice_varg(void *handle, const char *title,
  * @param account		 The PurpleAccount associated with this request, or NULL if none is
  * @param who			 The username of the buddy assocaited with this request, or NULL if none is
  * @param conv			 The PurpleConversation associated with this request, or NULL if none is
- * @param ui_hint        UI hint
  * @param user_data      The data to pass to the callback.
  * @param action_count   The number of actions.
  * @param ...            A list of actions.  These are pairs of
@@ -1327,15 +1289,6 @@ void *purple_request_choice_varg(void *handle, const char *title,
  *
  * @return A UI-specific handle.
  */
-void *purple_request_action_with_hint(void *handle, const char *title,
-						  const char *primary, const char *secondary,
-						  int default_action,
-						  PurpleAccount *account, const char *who, PurpleConversation *conv,
-						  const char *ui_hint, void *user_data, size_t action_count, ...);
-
-/**
- * @deprecated Please use purple_request_action_with_hint() instead.
- */
 void *purple_request_action(void *handle, const char *title,
 						  const char *primary, const char *secondary,
 						  int default_action,
@@ -1357,23 +1310,12 @@ void *purple_request_action(void *handle, const char *title,
  * @param account		 The PurpleAccount associated with this request, or NULL if none is
  * @param who			 The username of the buddy assocaited with this request, or NULL if none is
  * @param conv			 The PurpleConversation associated with this request, or NULL if none is
- * @param ui_hint        UI hint
  * @param user_data      The data to pass to the callback.
  * @param action_count   The number of actions.
  * @param actions        A list of actions and callbacks.
  *
  * @return A UI-specific handle.
  */
-void *purple_request_action_varg_with_hint(void *handle, const char *title,
-							   const char *primary, const char *secondary,
-							   int default_action,
-							   PurpleAccount *account, const char *who, PurpleConversation *conv,
-							   const char *ui_hint, void *user_data, size_t action_count,
-							   va_list actions);
-
-/**
- * @deprecated Please use purple_request_action_varg_with_hint() instead.
- */
 void *purple_request_action_varg(void *handle, const char *title,
 							   const char *primary, const char *secondary,
 							   int default_action,
@@ -1398,22 +1340,10 @@ void *purple_request_action_varg(void *handle, const char *title,
  * @param account	  The PurpleAccount associated with this request, or NULL if none is
  * @param who		  The username of the buddy associated with this request, or NULL if none is
  * @param conv		  The PurpleConversation associated with this request, or NULL if none is
- * @param ui_hint     UI hint
  * @param user_data   The data to pass to the callback.
  *
  * @return A UI-specific handle.
  */
-void *purple_request_fields_with_hint(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,
-						  const char *ui_hint, void *user_data);
-
-/**
- * @deprecated Please use purple_request_fields_with_hint() instead.
- */
 void *purple_request_fields(void *handle, const char *title,
 						  const char *primary, const char *secondary,
 						  PurpleRequestFields *fields,
@@ -1440,16 +1370,6 @@ void purple_request_close_with_handle(void *handle);
 /**
  * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
  */
-#define purple_request_yes_no_with_hint(handle, title, primary, secondary, \
-							default_action, account, who, conv, \
-							ui_hint, user_data, yes_cb, no_cb) \
-	purple_request_action_with_hint((handle), (title), (primary), (secondary), \
-						(default_action), account, who, conv, (ui_hint), (user_data), 2, \
-						_("_Yes"), (yes_cb), _("_No"), (no_cb))
-
-/**
- * @deprecated Please use purple_request_yes_no_with_hint instead.
- */
 #define purple_request_yes_no(handle, title, primary, secondary, \
 							default_action, account, who, conv, \
 							user_data, yes_cb, no_cb) \
@@ -1460,16 +1380,6 @@ void purple_request_close_with_handle(void *handle);
 /**
  * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
  */
-#define purple_request_ok_cancel_with_hint(handle, title, primary, secondary, \
-							default_action, account, who, conv, \
-						    ui_hint, user_data, ok_cb, cancel_cb) \
-	purple_request_action_with_hint((handle), (title), (primary), (secondary), \
-						(default_action), account, who, conv, (ui_hint), (user_data), 2, \
-						_("_OK"), (ok_cb), _("_Cancel"), (cancel_cb))
-
-/**
- * @deprecated Please use purple_request_ok_cancel_with_hint instead.
- */
 #define purple_request_ok_cancel(handle, title, primary, secondary, \
 							default_action, account, who, conv, \
 						    user_data, ok_cb, cancel_cb) \
@@ -1480,16 +1390,6 @@ void purple_request_close_with_handle(void *handle);
 /**
  * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
  */
-#define purple_request_accept_cancel_with_hint(handle, title, primary, secondary, \
-								   default_action, account, who, conv, \
-								   ui_hint, user_data, accept_cb, cancel_cb) \
-	purple_request_action_with_hint((handle), (title), (primary), (secondary), \
-						(default_action), account, who, conv, (ui_hint), (user_data), 2, \
-						_("_Accept"), (accept_cb), _("_Cancel"), (cancel_cb))
-
-/**
- * @deprecated Please use purple_request_accept_cancel_with_hint instead.
- */
 #define purple_request_accept_cancel(handle, title, primary, secondary, \
 								   default_action, account, who, conv, \
 								   user_data, accept_cb, cancel_cb) \
@@ -1513,20 +1413,10 @@ void purple_request_close_with_handle(void *handle);
  * @param account	  The PurpleAccount associated with this request, or NULL if none is
  * @param who		  The username of the buddy assocaited with this request, or NULL if none is
  * @param conv		  The PurpleConversation associated with this request, or NULL if none is
- * @param ui_hint     UI hint
  * @param user_data   The data to pass to the callback.
  *
  * @return A UI-specific handle.
  */
-void *purple_request_file_with_hint(void *handle, const char *title, const char *filename,
-						gboolean savedialog,
-						GCallback ok_cb, GCallback cancel_cb,
-						PurpleAccount *account, const char *who, PurpleConversation *conv,
-						const char *ui_hint, void *user_data);
-
-/**
- * @deprecated Please use purple_request_file_with_hint() instead.
- */
 void *purple_request_file(void *handle, const char *title, const char *filename,
 						gboolean savedialog,
 						GCallback ok_cb, GCallback cancel_cb,
@@ -1547,19 +1437,10 @@ void *purple_request_file(void *handle, const char *title, const char *filename,
  * @param account	  The PurpleAccount associated with this request, or NULL if none is
  * @param who		  The username of the buddy assocaited with this request, or NULL if none is
  * @param conv		  The PurpleConversation associated with this request, or NULL if none is
- * @param ui_hint     UI hint
  * @param user_data   The data to pass to the callback.
  *
  * @return A UI-specific handle.
  */
-void *purple_request_folder_with_hint(void *handle, const char *title, const char *dirname,
-						GCallback ok_cb, GCallback cancel_cb,
-						PurpleAccount *account, const char *who, PurpleConversation *conv,
-						const char *ui_hint, void *user_data);
-
-/**
- * @deprecated Please use purple_request_folder_with_hint() instead.
- */
 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,