Mercurial > pidgin

changeset 19866:14ad6eabb918

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Restored API. Lessee what we can do with the other params first
author Gabriel Schulhof <nix@go-nix.ca>
date Sun, 12 Aug 2007 15:56:33 +0000
parents 71548588654d
children 1fb7dbe2c6ee
files libpurple/request.h
diffstat 1 files changed, 14 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/request.h	Sun Aug 12 14:32:13 2007 +0000
+++ b/libpurple/request.h	Sun Aug 12 15:56:33 2007 +0000
@@ -1186,7 +1186,6 @@
  * @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-specific data
  * @param user_data     The data to pass to the callback.
  *
  * @return A UI-specific handle.
@@ -1198,7 +1197,7 @@
 						 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);
 
 /**
  * Prompts the user for multiple-choice input.
@@ -1217,7 +1216,6 @@
  * @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-specific data
  * @param user_data     The data to pass to the callback.
  * @param ...           The choices.  This argument list should be
  *                      terminated with a NULL parameter.
@@ -1230,7 +1228,7 @@
 						  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;
+						  void *user_data, ...) G_GNUC_NULL_TERMINATED;
 
 /**
  * Prompts the user for multiple-choice input.
@@ -1249,7 +1247,6 @@
  * @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-specific data
  * @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.
@@ -1262,7 +1259,7 @@
 							   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);
 
 /**
  * Prompts the user for an action.
@@ -1279,7 +1276,6 @@
  * @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-specific data
  * @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
@@ -1296,7 +1292,7 @@
 						  const char *primary, const char *secondary,
 						  unsigned 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, ...);
 
 /**
  * Prompts the user for an action.
@@ -1313,7 +1309,6 @@
  * @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-specific data
  * @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.
@@ -1324,7 +1319,7 @@
 							   const char *primary, const char *secondary,
 							   unsigned 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);
 
 /**
@@ -1344,7 +1339,6 @@
  * @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-specific data
  * @param user_data   The data to pass to the callback.
  *
  * @return A UI-specific handle.
@@ -1355,7 +1349,7 @@
 						  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);
 
 /**
  * Closes a request.
@@ -1377,9 +1371,9 @@
  */
 #define purple_request_yes_no(handle, title, primary, secondary, \
 							default_action, account, who, conv, \
-							ui_hint, user_data, yes_cb, no_cb) \
+							user_data, yes_cb, no_cb) \
 	purple_request_action((handle), (title), (primary), (secondary), \
-						(default_action), account, who, conv, (ui_hint), (user_data), 2, \
+						(default_action), account, who, conv, (user_data), 2, \
 						_("_Yes"), (yes_cb), _("_No"), (no_cb))
 
 /**
@@ -1387,9 +1381,9 @@
  */
 #define purple_request_ok_cancel(handle, title, primary, secondary, \
 							default_action, account, who, conv, \
-						    ui_hint, user_data, ok_cb, cancel_cb) \
+						    user_data, ok_cb, cancel_cb) \
 	purple_request_action((handle), (title), (primary), (secondary), \
-						(default_action), account, who, conv, (ui_hint), (user_data), 2, \
+						(default_action), account, who, conv, (user_data), 2, \
 						_("_OK"), (ok_cb), _("_Cancel"), (cancel_cb))
 
 /**
@@ -1397,9 +1391,9 @@
  */
 #define purple_request_accept_cancel(handle, title, primary, secondary, \
 								   default_action, account, who, conv, \
-								   ui_hint, user_data, accept_cb, cancel_cb) \
+								   user_data, accept_cb, cancel_cb) \
 	purple_request_action((handle), (title), (primary), (secondary), \
-						(default_action), account, who, conv, (ui_hint), (user_data), 2, \
+						(default_action), account, who, conv, (user_data), 2, \
 						_("_Accept"), (accept_cb), _("_Cancel"), (cancel_cb))
 
 /**
@@ -1418,7 +1412,6 @@
  * @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-specific data
  * @param user_data   The data to pass to the callback.
  *
  * @return A UI-specific handle.
@@ -1427,7 +1420,7 @@
 						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);
 
 /**
  * Displays a folder select dialog. Returns the selected filename to
@@ -1443,7 +1436,6 @@
  * @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-specific data
  * @param user_data   The data to pass to the callback.
  *
  * @return A UI-specific handle.
@@ -1451,7 +1443,7 @@
 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,
-						const char *ui_hint, void *user_data);
+						void *user_data);
 
 /*@}*/