diff src/notify.h @ 12220:64254fbabc7b

[gaim-migrate @ 14522] SF Patch #1363787 from Bartosz Oler "This is a fix to the 'Find buddies' command in which, after the search results window was closed, prpl's internal state was not cleared. A minor modification in the notify API was required. This patch also adds a few more notifications for the user." There also appears to be a few unrelated GG prpl updates in here. I noticed that more strings are marked for translation now. I made several changes to this patch. I also found out that we're not honoring the callbacks passed in to the notify API. That's a bug since we document them. I'm not in the mood to fix it. I changed GCallback to GHookFunc as it has the right type (whereas GCallback did not). The name isn't too bad either. I didn't really want to create a new callback function typedef. committer: Tailor Script <[e-mail]>

--- a/src/notify.h	Fri Nov 25 01:22:45 2005 +0000
+++ b/src/notify.h	Fri Nov 25 01:33:10 2005 +0000
@@ -107,27 +107,27 @@
 {
 	void *(*notify_message)(GaimNotifyMsgType type, const char *title,
 							const char *primary, const char *secondary,
-							GCallback cb, void *user_data);
+							GHookFunc cb, gpointer user_data);
 	void *(*notify_email)(const char *subject, const char *from,
 						  const char *to, const char *url,
-						  GCallback cb, void *user_data);
+						  GHookFunc cb, gpointer user_data);
 	void *(*notify_emails)(size_t count, gboolean detailed,
 						   const char **subjects, const char **froms,
 						   const char **tos, const char **urls,
-						   GCallback cb, void *user_data);
+						   GHookFunc cb, gpointer user_data);
 	void *(*notify_formatted)(const char *title, const char *primary,
 							  const char *secondary, const char *text,
-							  GCallback cb, void *user_data);
+							  GHookFunc cb, gpointer user_data);
 	void *(*notify_searchresults)(GaimConnection *gc, const char *title,
 								  const char *primary, const char *secondary,
-								  GaimNotifySearchResults *results, GCallback cb,
-								  void *user_data);
+								  GaimNotifySearchResults *results, GHookFunc cb,
+								  gpointer user_data);
 	void (*notify_searchresults_new_rows)(GaimConnection *gc,
 										  GaimNotifySearchResults *results,
-										  void *data, void *user_data);
+										  void *data, gpointer user_data);
 	void *(*notify_userinfo)(GaimConnection *gc, const char *who,
 							  const char *text,
-							  GCallback cb, void *user_data);
+							  GHookFunc cb, gpointer user_data);
 	void *(*notify_uri)(const char *uri);
 
 	void (*close_notify)(GaimNotifyType type, void *ui_handle);
@@ -162,8 +162,8 @@
  */
 void *gaim_notify_searchresults(GaimConnection *gc, const char *title,
 								const char *primary, const char *secondary,
-								GaimNotifySearchResults *results, GCallback cb,
-								void *user_data);
+								GaimNotifySearchResults *results, GHookFunc cb,
+								gpointer user_data);
 
 void gaim_notify_searchresults_free(GaimNotifySearchResults *results);
 
@@ -177,7 +177,7 @@
  */
 void gaim_notify_searchresults_new_rows(GaimConnection *gc,
 										GaimNotifySearchResults *results,
-										void *data, void *user_data);
+										void *data, gpointer user_data);
 
 /**
  * Adds a button that will be displayed in the search results dialog.
@@ -287,8 +287,8 @@
  */
 void *gaim_notify_message(void *handle, GaimNotifyMsgType type,
 						  const char *title, const char *primary,
-						  const char *secondary, GCallback cb,
-						  void *user_data);
+						  const char *secondary, GHookFunc cb,
+						  gpointer user_data);
 
 /**
  * Displays a single e-mail notification to the user.
@@ -306,8 +306,8 @@
  */
 void *gaim_notify_email(void *handle, const char *subject,
 						const char *from, const char *to,
-						const char *url, GCallback cb,
-						void *user_data);
+						const char *url, GHookFunc cb,
+						gpointer user_data);
 
 /**
  * Displays a notification for multiple e-mails to the user.
@@ -329,7 +329,7 @@
 void *gaim_notify_emails(void *handle, size_t count, gboolean detailed,
 						 const char **subjects, const char **froms,
 						 const char **tos, const char **urls,
-						 GCallback cb, void *user_data);
+						 GHookFunc cb, gpointer user_data);
 
 /**
  * Displays a notification with formatted text.
@@ -350,7 +350,7 @@
  */
 void *gaim_notify_formatted(void *handle, const char *title,
 							const char *primary, const char *secondary,
-							const char *text, GCallback cb, void *user_data);
+							const char *text, GHookFunc cb, gpointer user_data);
 
 /**
  * Displays user information with formatted text, passing information giving
@@ -369,8 +369,8 @@
  * @return A UI-specific handle.
  */
 void *gaim_notify_userinfo(GaimConnection *gc, const char *who,
-						   const char *text, GCallback cb,
-						   void *user_data);
+						   const char *text, GHookFunc cb,
+						   gpointer user_data);
 
 /**
  * Opens a URI or somehow presents it to the user.