changeset 19863:783fa7308f32

Broke all purple_request_* APIs
author Gabriel Schulhof <nix@go-nix.ca>
date Sun, 12 Aug 2007 14:30:39 +0000
parents d082ddab1ccc
children 71548588654d
files libpurple/request.h pidgin/gtkdialogs.h
diffstat 2 files changed, 23 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/request.h	Wed Aug 08 20:50:01 2007 +0000
+++ b/libpurple/request.h	Sun Aug 12 14:30:39 2007 +0000
@@ -1186,6 +1186,7 @@
  * @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.
@@ -1197,7 +1198,7 @@
 						 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);
 
 /**
  * Prompts the user for multiple-choice input.
@@ -1216,6 +1217,7 @@
  * @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.
@@ -1228,7 +1230,7 @@
 						  const char *ok_text, GCallback ok_cb,
 						  const char *cancel_text, GCallback cancel_cb,
 						  PurpleAccount *account, const char *who, PurpleConversation *conv,
-						  void *user_data, ...) G_GNUC_NULL_TERMINATED;
+						  const char *ui_hint, void *user_data, ...) G_GNUC_NULL_TERMINATED;
 
 /**
  * Prompts the user for multiple-choice input.
@@ -1247,6 +1249,7 @@
  * @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.
@@ -1259,7 +1262,7 @@
 							   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);
 
 /**
  * Prompts the user for an action.
@@ -1276,6 +1279,7 @@
  * @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
@@ -1292,7 +1296,7 @@
 						  const char *primary, const char *secondary,
 						  unsigned 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, ...);
 
 /**
  * Prompts the user for an action.
@@ -1309,6 +1313,7 @@
  * @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.
@@ -1319,7 +1324,7 @@
 							   const char *primary, const char *secondary,
 							   unsigned 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,
 							   va_list actions);
 
 /**
@@ -1339,6 +1344,7 @@
  * @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.
@@ -1349,7 +1355,7 @@
 						  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);
 
 /**
  * Closes a request.
@@ -1371,9 +1377,9 @@
  */
 #define purple_request_yes_no(handle, title, primary, secondary, \
 							default_action, account, who, conv, \
-							user_data, yes_cb, no_cb) \
+							ui_hint, user_data, yes_cb, no_cb) \
 	purple_request_action((handle), (title), (primary), (secondary), \
-						(default_action), account, who, conv, (user_data), 2, \
+						(default_action), account, who, conv, (ui_hint), (user_data), 2, \
 						_("_Yes"), (yes_cb), _("_No"), (no_cb))
 
 /**
@@ -1381,9 +1387,9 @@
  */
 #define purple_request_ok_cancel(handle, title, primary, secondary, \
 							default_action, account, who, conv, \
-						    user_data, ok_cb, cancel_cb) \
+						    ui_hint, user_data, ok_cb, cancel_cb) \
 	purple_request_action((handle), (title), (primary), (secondary), \
-						(default_action), account, who, conv, (user_data), 2, \
+						(default_action), account, who, conv, (ui_hint), (user_data), 2, \
 						_("_OK"), (ok_cb), _("_Cancel"), (cancel_cb))
 
 /**
@@ -1391,9 +1397,9 @@
  */
 #define purple_request_accept_cancel(handle, title, primary, secondary, \
 								   default_action, account, who, conv, \
-								   user_data, accept_cb, cancel_cb) \
+								   ui_hint, user_data, accept_cb, cancel_cb) \
 	purple_request_action((handle), (title), (primary), (secondary), \
-						(default_action), account, who, conv, (user_data), 2, \
+						(default_action), account, who, conv, (ui_hint), (user_data), 2, \
 						_("_Accept"), (accept_cb), _("_Cancel"), (cancel_cb))
 
 /**
@@ -1412,6 +1418,7 @@
  * @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.
@@ -1420,7 +1427,7 @@
 						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);
 
 /**
  * Displays a folder select dialog. Returns the selected filename to
@@ -1436,6 +1443,7 @@
  * @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.
@@ -1443,7 +1451,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,
-						void *user_data);
+						const char *ui_hint, void *user_data);
 
 /*@}*/
 
--- a/pidgin/gtkdialogs.h	Wed Aug 08 20:50:01 2007 +0000
+++ b/pidgin/gtkdialogs.h	Sun Aug 12 14:30:39 2007 +0000
@@ -32,7 +32,7 @@
 /* Functions in gtkdialogs.c (these should actually stay in this file) */
 void pidgin_dialogs_destroy_all(void);
 void pidgin_dialogs_about(GtkWindow *parent);
-void pidgin_dialogs_im(void);
+void pidgin_dialogs_im();
 void pidgin_dialogs_im_with_user(PurpleAccount *, const char *);
 void pidgin_dialogs_info(void);
 void pidgin_dialogs_log(void);