# HG changeset patch # User Christian Hammond # Date 1055545466 0 # Node ID 2fa4aa9c1885785c914d8a8a07b85d57cbd56159 # Parent a479e218c54b7944073c1bba5ae6b5941a97a62a [gaim-migrate @ 6288] Renamed the pounce structures and typedefs to be in sync with the rest of the API. Also added some g_return_*_if_fail() checks in place of the if statements we had. I'll try to get pounces working again. committer: Tailor Script diff -r a479e218c54b -r 2fa4aa9c1885 src/gaimrc.c --- a/src/gaimrc.c Fri Jun 13 21:22:46 2003 +0000 +++ b/src/gaimrc.c Fri Jun 13 23:04:26 2003 +0000 @@ -1619,7 +1619,7 @@ { GList *l; struct pounce_placeholder *ph; - struct gaim_pounce *pounce; + GaimPounce *pounce; GaimAccount *account; for (l = buddy_pounces; l != NULL; l = l->next) { diff -r a479e218c54b -r 2fa4aa9c1885 src/gtkpounce.c --- a/src/gtkpounce.c Fri Jun 13 21:22:46 2003 +0000 +++ b/src/gtkpounce.c Fri Jun 13 23:04:26 2003 +0000 @@ -29,10 +29,10 @@ #include "sound.h" #include "notify.h" -struct gaim_gtkpounce_dialog +typedef struct { /* Pounce data */ - struct gaim_pounce *pounce; + GaimPounce *pounce; GaimAccount *account; /* The window */ @@ -66,14 +66,14 @@ GtkWidget *play_sound_test; GtkWidget *save_pounce; -}; + +} GaimGtkPounceDialog; /************************************************************************** * Callbacks **************************************************************************/ static gint -delete_win_cb(GtkWidget *w, GdkEventAny *e, - struct gaim_gtkpounce_dialog *dialog) +delete_win_cb(GtkWidget *w, GdkEventAny *e, GaimGtkPounceDialog *dialog) { gtk_widget_destroy(dialog->window); g_free(dialog); @@ -82,7 +82,7 @@ } static void -delete_cb(GtkWidget *w, struct gaim_gtkpounce_dialog *dialog) +delete_cb(GtkWidget *w, GaimGtkPounceDialog *dialog) { gaim_pounce_destroy(dialog->pounce); @@ -90,7 +90,7 @@ } static void -cancel_cb(GtkWidget *w, struct gaim_gtkpounce_dialog *dialog) +cancel_cb(GtkWidget *w, GaimGtkPounceDialog *dialog) { delete_win_cb(NULL, NULL, dialog); } @@ -98,64 +98,70 @@ static void pounce_update_entryfields(GtkWidget *w, gpointer data) { - const char *selected_filename; + const char *filename; GHashTable *args; - - args = (GHashTable *) data; - - selected_filename = gtk_file_selection_get_filename(GTK_FILE_SELECTION(g_hash_table_lookup(args, "pounce_file_selector"))); - if (selected_filename != NULL) - gtk_entry_set_text(GTK_ENTRY(g_hash_table_lookup(args, "entry")),selected_filename); + + args = (GHashTable *)data; + + filename = gtk_file_selection_get_filename(GTK_FILE_SELECTION( + g_hash_table_lookup(args, "filesel"))); + + if (filename != NULL) + gtk_entry_set_text(GTK_ENTRY(g_hash_table_lookup(args, "entry")), + filename); g_free(args); } static void -pounce_file_selector(GtkWidget *w, gpointer data) +filesel(GtkWidget *w, gpointer data) { - GtkWidget *pounce_file_selector; + GtkWidget *filesel; GtkWidget *entry; GHashTable *args; - entry = (GtkWidget *) data; + entry = (GtkWidget *)data; - pounce_file_selector = gtk_file_selection_new(_("Select a file")); - gtk_file_selection_set_filename(GTK_FILE_SELECTION(pounce_file_selector), gtk_entry_get_text(GTK_ENTRY(entry))); - gtk_file_selection_hide_fileop_buttons(GTK_FILE_SELECTION(pounce_file_selector)); - gtk_file_selection_set_select_multiple(GTK_FILE_SELECTION(pounce_file_selector), FALSE); + filesel = gtk_file_selection_new(_("Select a file")); + gtk_file_selection_set_filename(GTK_FILE_SELECTION(filesel), + gtk_entry_get_text(GTK_ENTRY(entry))); + gtk_file_selection_hide_fileop_buttons(GTK_FILE_SELECTION(filesel)); + gtk_file_selection_set_select_multiple(GTK_FILE_SELECTION(filesel), FALSE); args = g_hash_table_new(g_str_hash,g_str_equal); - g_hash_table_insert(args, "pounce_file_selector", (gpointer) pounce_file_selector); - g_hash_table_insert(args, "entry", (gpointer) entry); - - g_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(pounce_file_selector)->ok_button), - "clicked", G_CALLBACK(pounce_update_entryfields), (gpointer) args); + g_hash_table_insert(args, "filesel", filesel); + g_hash_table_insert(args, "entry", entry); + + g_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(filesel)->ok_button), + "clicked", + G_CALLBACK(pounce_update_entryfields), args); - g_signal_connect_swapped(G_OBJECT(GTK_FILE_SELECTION(pounce_file_selector)->ok_button), - "clicked", G_CALLBACK(gtk_widget_destroy), (gpointer) pounce_file_selector); - g_signal_connect_swapped(G_OBJECT(GTK_FILE_SELECTION(pounce_file_selector)->cancel_button), - "clicked", G_CALLBACK(gtk_widget_destroy), (gpointer) pounce_file_selector); + g_signal_connect_swapped(G_OBJECT(GTK_FILE_SELECTION(filesel)->ok_button), + "clicked", + G_CALLBACK(gtk_widget_destroy), filesel); - gtk_widget_show(pounce_file_selector); + g_signal_connect_swapped(G_OBJECT(GTK_FILE_SELECTION(filesel)->cancel_button), + "clicked", + G_CALLBACK(gtk_widget_destroy), filesel); + + gtk_widget_show(filesel); } static void -pounce_test_sound(GtkWidget *w, gpointer data) +pounce_test_sound(GtkWidget *w, GtkWidget *entry) { const char *filename; - GtkWidget *entry; - entry = (GtkWidget *) data; - filename = gtk_entry_get_text(GTK_ENTRY(entry)); - if ((filename != NULL) && (strlen(filename) > 0)) + + if (filename != NULL && *filename != '\0') gaim_sound_play_file((char *) filename); else gaim_sound_play_event(GAIM_SOUND_POUNCE_DEFAULT); } static void -save_pounce_cb(GtkWidget *w, struct gaim_gtkpounce_dialog *dialog) +save_pounce_cb(GtkWidget *w, GaimGtkPounceDialog *dialog) { const char *name; const char *message, *command, *sound; @@ -233,7 +239,7 @@ } else { - struct gaim_gtkpounce_data *pounce_data; + GaimGtkPounceData *pounce_data; gaim_pounce_set_events(dialog->pounce, events); gaim_pounce_set_pouncer(dialog->pounce, dialog->account); @@ -266,13 +272,13 @@ } static void -pounce_choose_cb(GtkWidget *item, struct gaim_gtkpounce_dialog *dialog) +pounce_choose_cb(GtkWidget *item, GaimGtkPounceDialog *dialog) { dialog->account = g_object_get_data(G_OBJECT(item), "user_data"); } static GtkWidget * -pounce_user_menu(struct gaim_gtkpounce_dialog *dialog) +pounce_user_menu(GaimGtkPounceDialog *dialog) { GaimAccount *account; GaimPlugin *prpl; @@ -320,14 +326,14 @@ } static void -pounce_cb(struct gaim_pounce *pounce, GaimPounceEvent events, void *data) +pounce_cb(GaimPounce *pounce, GaimPounceEvent events, void *data) { GaimConversation *conv; GaimAccount *account; - struct gaim_gtkpounce_data *pounce_data; + GaimGtkPounceData *pounce_data; const char *pouncee; - pounce_data = (struct gaim_gtkpounce_data *)data; + pounce_data = (GaimGtkPounceData *)data; pouncee = gaim_pounce_get_pouncee(pounce); account = gaim_pounce_get_pouncer(pounce); @@ -404,11 +410,11 @@ static void free_pounce(void *data) { - struct gaim_gtkpounce_data *pounce_data; + GaimGtkPounceData *pounce_data; struct gaim_buddy_list *blist; struct gaim_gtk_buddy_list *gtkblist; - pounce_data = (struct gaim_gtkpounce_data *)data; + pounce_data = (GaimGtkPounceData *)data; if (pounce_data->message != NULL) g_free(pounce_data->message); if (pounce_data->command != NULL) g_free(pounce_data->command); @@ -427,15 +433,15 @@ } } -struct gaim_pounce * +GaimPounce * gaim_gtkpounce_new(GaimAccount *pouncer, const char *pouncee, GaimPounceEvent events, GaimGtkPounceAction actions, const char *message, const char *command, const char *sound, gboolean save) { - struct gaim_gtkpounce_data *data; + GaimGtkPounceData *data; - data = g_new0(struct gaim_gtkpounce_data, 1); + data = g_new0(GaimGtkPounceData, 1); data->actions = actions; @@ -451,9 +457,9 @@ void gaim_gtkpounce_dialog_show(struct buddy *buddy, - struct gaim_pounce *cur_pounce) + GaimPounce *cur_pounce) { - struct gaim_gtkpounce_dialog *dialog; + GaimGtkPounceDialog *dialog; GtkWidget *window; GtkWidget *label; GtkWidget *bbox; @@ -466,8 +472,8 @@ GtkSizeGroup *sg; GPtrArray *sound_widgets; GPtrArray *exec_widgets; - - dialog = g_new0(struct gaim_gtkpounce_dialog, 1); + + dialog = g_new0(GaimGtkPounceDialog, 1); if (cur_pounce != NULL) { dialog->pounce = cur_pounce; @@ -675,7 +681,7 @@ G_CALLBACK(gtk_toggle_sensitive_array), exec_widgets); g_signal_connect(G_OBJECT(dialog->exec_cmd_browse), "clicked", - G_CALLBACK(pounce_file_selector), + G_CALLBACK(filesel), dialog->exec_cmd_entry); sound_widgets = g_ptr_array_new(); @@ -687,7 +693,7 @@ G_CALLBACK(gtk_toggle_sensitive_array), sound_widgets); g_signal_connect(G_OBJECT(dialog->play_sound_browse), "clicked", - G_CALLBACK(pounce_file_selector), + G_CALLBACK(filesel), dialog->play_sound_entry); g_signal_connect(G_OBJECT(dialog->play_sound_test), "clicked", G_CALLBACK(pounce_test_sound), @@ -746,7 +752,7 @@ if (cur_pounce != NULL) { GaimPounceEvent events; GaimGtkPounceAction actions; - struct gaim_gtkpounce_data *pounce_data; + GaimGtkPounceData *pounce_data; pounce_data = GAIM_GTKPOUNCE(cur_pounce); events = gaim_pounce_get_events(cur_pounce); @@ -810,13 +816,13 @@ } static void -delete_pounce_cb(GtkWidget *w, struct gaim_pounce *pounce) +delete_pounce_cb(GtkWidget *w, GaimPounce *pounce) { gaim_pounce_destroy(pounce); } static void -edit_pounce_cb(GtkWidget *w, struct gaim_pounce *pounce) +edit_pounce_cb(GtkWidget *w, GaimPounce *pounce) { struct buddy *buddy; @@ -832,12 +838,12 @@ GtkWidget *image; GtkWidget *item; GdkPixbuf *pixbuf, *scale; - struct gaim_pounce *pounce; + GaimPounce *pounce; const char *buddy; GList *bp; for (bp = gaim_get_pounces(); bp != NULL; bp = bp->next) { - pounce = (struct gaim_pounce *)bp->data; + pounce = (GaimPounce *)bp->data; buddy = gaim_pounce_get_pouncee(pounce); /* Build the menu item */ diff -r a479e218c54b -r 2fa4aa9c1885 src/gtkpounce.h --- a/src/gtkpounce.h Fri Jun 13 21:22:46 2003 +0000 +++ b/src/gtkpounce.h Fri Jun 13 23:04:26 2003 +0000 @@ -42,7 +42,7 @@ /** * GTK+ pounce-specific data. */ -struct gaim_gtkpounce_data +typedef struct { GaimGtkPounceAction actions; /**< The action(s) for this pounce. */ @@ -55,18 +55,11 @@ gboolean save; /**< If TRUE, the pounce should be saved after activation. */ -}; + +} GaimGtkPounceData; #define GAIM_GTKPOUNCE(pounce) \ - ((struct gaim_gtkpounce_data *)gaim_pounce_get_data(pounce)) - -/** - * The pounce dialog. - * - * The structure is opaque, as nobody should be touching anything inside of - * it. - */ -struct gaim_gtkpounce_dialog; + ((GaimGtkPounceData *)gaim_pounce_get_data(pounce)) /** * Creates a GTK-specific pounce. @@ -82,14 +75,11 @@ * * @return The new buddy pounce. */ -struct gaim_pounce *gaim_gtkpounce_new(GaimAccount *pouncer, - const char *pouncee, - GaimPounceEvent events, - GaimGtkPounceAction actions, - const char *message, - const char *command, - const char *sound, - gboolean save); +GaimPounce *gaim_gtkpounce_new(GaimAccount *pouncer, const char *pouncee, + GaimPounceEvent events, + GaimGtkPounceAction actions, + const char *message, const char *command, + const char *sound, gboolean save); /** * Displays a New Buddy Pounce or Edit Buddy Pounce dialog. @@ -97,8 +87,7 @@ * @param buddy The optional buddy to pounce on. * @param cur_pounce The current buddy pounce, if editting an existing one. */ -void gaim_gtkpounce_dialog_show(struct buddy *buddy, - struct gaim_pounce *cur_pounce); +void gaim_gtkpounce_dialog_show(struct buddy *buddy, GaimPounce *cur_pounce); /** * Displays all registered buddy pounces in a menu. diff -r a479e218c54b -r 2fa4aa9c1885 src/pounce.c --- a/src/pounce.c Fri Jun 13 21:22:46 2003 +0000 +++ b/src/pounce.c Fri Jun 13 23:04:26 2003 +0000 @@ -25,17 +25,19 @@ static GList *pounces = NULL; -struct gaim_pounce * +GaimPounce * gaim_pounce_new(GaimAccount *pouncer, const char *pouncee, - GaimPounceEvent event, gaim_pounce_cb cb, + GaimPounceEvent event, GaimPounceCb cb, void *data, void (*free)(void *)) { - struct gaim_pounce *pounce; + GaimPounce *pounce; - if (pouncer == NULL || pouncee == NULL || event == 0 || cb == NULL) - return NULL; + g_return_val_if_fail(pouncer != NULL, NULL); + g_return_val_if_fail(pouncee != NULL, NULL); + g_return_val_if_fail(event != 0, NULL); + g_return_val_if_fail(cb != NULL, NULL); - pounce = g_new0(struct gaim_pounce, 1); + pounce = g_new0(GaimPounce, 1); pounce->pouncer = pouncer; pounce->pouncee = g_strdup(pouncee); @@ -50,10 +52,9 @@ } void -gaim_pounce_destroy(struct gaim_pounce *pounce) +gaim_pounce_destroy(GaimPounce *pounce) { - if (pounce == NULL) - return; + g_return_if_fail(pounce != NULL); if (pounce->pouncee != NULL) g_free(pounce->pouncee); @@ -67,29 +68,28 @@ } void -gaim_pounce_set_events(struct gaim_pounce *pounce, GaimPounceEvent events) +gaim_pounce_set_events(GaimPounce *pounce, GaimPounceEvent events) { - if (pounce == NULL || events == GAIM_POUNCE_NONE) - return; + g_return_if_fail(pounce != NULL); + g_return_if_fail(pounce != GAIM_POUNCE_NONE); pounce->events = events; } void -gaim_pounce_set_pouncer(struct gaim_pounce *pounce, - GaimAccount *pouncer) +gaim_pounce_set_pouncer(GaimPounce *pounce, GaimAccount *pouncer) { - if (pounce == NULL || pouncer == NULL) - return; + g_return_if_fail(pounce != NULL); + g_return_if_fail(pouncer != NULL); pounce->pouncer = pouncer; } void -gaim_pounce_set_pouncee(struct gaim_pounce *pounce, const char *pouncee) +gaim_pounce_set_pouncee(GaimPounce *pounce, const char *pouncee) { - if (pounce == NULL || pouncee == NULL) - return; + g_return_if_fail(pounce != NULL); + g_return_if_fail(pouncee != NULL); if (pounce->pouncee != NULL) g_free(pounce->pouncee); @@ -98,62 +98,58 @@ } void -gaim_pounce_set_data(struct gaim_pounce *pounce, void *data) +gaim_pounce_set_data(GaimPounce *pounce, void *data) { - if (pounce == NULL) - return; + g_return_if_fail(pounce != NULL); pounce->data = data; } GaimPounceEvent -gaim_pounce_get_events(const struct gaim_pounce *pounce) +gaim_pounce_get_events(const GaimPounce *pounce) { - if (pounce == NULL) - return GAIM_POUNCE_NONE; + g_return_val_if_fail(pounce != NULL, GAIM_POUNCE_NONE); return pounce->events; } GaimAccount * -gaim_pounce_get_pouncer(const struct gaim_pounce *pounce) +gaim_pounce_get_pouncer(const GaimPounce *pounce) { - if (pounce == NULL) - return NULL; + g_return_val_if_fail(pounce != NULL, NULL); return pounce->pouncer; } const char * -gaim_pounce_get_pouncee(const struct gaim_pounce *pounce) +gaim_pounce_get_pouncee(const GaimPounce *pounce) { - if (pounce == NULL) - return NULL; + g_return_val_if_fail(pounce != NULL, NULL); return pounce->pouncee; } void * -gaim_pounce_get_data(const struct gaim_pounce *pounce) +gaim_pounce_get_data(const GaimPounce *pounce) { - if (pounce == NULL) - return NULL; + g_return_val_if_fail(pounce != NULL, NULL); return pounce->data; } void -gaim_pounce_execute(const GaimAccount *pouncer, - const char *pouncee, GaimPounceEvent events) +gaim_pounce_execute(const GaimAccount *pouncer, const char *pouncee, + GaimPounceEvent events) { - struct gaim_pounce *pounce; + GaimPounce *pounce; GList *l; - if (events == GAIM_POUNCE_NONE || pouncer == NULL || pouncee == NULL) - return; + g_return_if_fail(pouncer != NULL); + g_return_if_fail(pouncee != NULL); + g_return_if_fail(events != GAIM_POUNCE_NONE); for (l = gaim_get_pounces(); l != NULL; l = l->next) { - pounce = (struct gaim_pounce *)l->data; + pounce = (GaimPounce *)l->data; if ((gaim_pounce_get_events(pounce) & events) && (gaim_pounce_get_pouncer(pounce) == pouncer) && @@ -165,18 +161,19 @@ } } -struct gaim_pounce * -gaim_find_pounce(const GaimAccount *pouncer, - const char *pouncee, GaimPounceEvent events) +GaimPounce * +gaim_find_pounce(const GaimAccount *pouncer, const char *pouncee, + GaimPounceEvent events) { - struct gaim_pounce *pounce; + GaimPounce *pounce; GList *l; - if (events == GAIM_POUNCE_NONE || pouncer == NULL || pouncee == NULL) - return NULL; + g_return_val_if_fail(pouncer != NULL, NULL); + g_return_val_if_fail(pouncee != NULL, NULL); + g_return_val_if_fail(events != GAIM_POUNCE_NONE, NULL); for (l = gaim_get_pounces(); l != NULL; l = l->next) { - pounce = (struct gaim_pounce *)l->data; + pounce = (GaimPounce *)l->data; if ((gaim_pounce_get_events(pounce) & events) && (gaim_pounce_get_pouncer(pounce) == pouncer) && diff -r a479e218c54b -r 2fa4aa9c1885 src/pounce.h --- a/src/pounce.h Fri Jun 13 21:22:46 2003 +0000 +++ b/src/pounce.h Fri Jun 13 23:04:26 2003 +0000 @@ -23,6 +23,8 @@ #ifndef _GAIM_POUNCE_H_ #define _GAIM_POUNCE_H_ +typedef struct _GaimPounce GaimPounce; + /** * Events that trigger buddy pounces. */ @@ -40,10 +42,8 @@ } GaimPounceEvent; -struct gaim_pounce; - /** A pounce callback. */ -typedef void (*gaim_pounce_cb)(struct gaim_pounce *, GaimPounceEvent, void *); +typedef void (*GaimPounceCb)(GaimPounce *, GaimPounceEvent, void *); /** * A buddy pounce structure. @@ -53,14 +53,14 @@ * signs on or returns from away. Such responses are handled in the * UI. The events themselves are done in the core. */ -struct gaim_pounce +struct _GaimPounce { GaimPounceEvent events; /**< The event(s) to pounce on. */ GaimAccount *pouncer; /**< The user who is pouncing. */ char *pouncee; /**< The buddy to pounce on. */ - gaim_pounce_cb callback; /**< The callback function to call when the + GaimPounceCb callback; /**< The callback function to call when the event is triggered. */ void (*free)(void *data); /**< The data free function. */ void *data; /**< Pounce-specific data. */ @@ -78,18 +78,16 @@ * * @return The new buddy pounce structure. */ -struct gaim_pounce *gaim_pounce_new(GaimAccount *pouncer, - const char *pouncee, - GaimPounceEvent event, - gaim_pounce_cb cb, void *data, - void (*free)(void *)); +GaimPounce *gaim_pounce_new(GaimAccount *pouncer, const char *pouncee, + GaimPounceEvent event, GaimPounceCb cb, + void *data, void (*free)(void *)); /** * Destroys a buddy pounce. * * @param pounce The buddy pounce. */ -void gaim_pounce_destroy(struct gaim_pounce *pounce); +void gaim_pounce_destroy(GaimPounce *pounce); /** * Sets the events a pounce should watch for. @@ -97,8 +95,7 @@ * @param pounce The buddy pounce. * @param events The events to watch for. */ -void gaim_pounce_set_events(struct gaim_pounce *pounce, - GaimPounceEvent events); +void gaim_pounce_set_events(GaimPounce *pounce, GaimPounceEvent events); /** * Sets the account that will do the pouncing. @@ -106,8 +103,7 @@ * @param pounce The buddy pounce. * @param pouncer The account that will pounce. */ -void gaim_pounce_set_pouncer(struct gaim_pounce *pounce, - GaimAccount *pouncer); +void gaim_pounce_set_pouncer(GaimPounce *pounce, GaimAccount *pouncer); /** * Sets the buddy a pounce should pounce on. @@ -115,7 +111,7 @@ * @param pounce The buddy pounce. * @param pouncee The buddy to pounce on. */ -void gaim_pounce_set_pouncee(struct gaim_pounce *pounce, const char *buddy); +void gaim_pounce_set_pouncee(GaimPounce *pounce, const char *buddy); /** * Sets the callback function to call when the pounce event is triggered. @@ -123,7 +119,7 @@ * @param pounce The buddy pounce. * @param cb The callback function. */ -void gaim_pounce_set_callback(struct gaim_pounce *pounce, gaim_pounce_cb cb); +void gaim_pounce_set_callback(GaimPounce *pounce, GaimPounceCb cb); /** * Sets the pounce-specific data. @@ -131,7 +127,7 @@ * @param pounce The buddy pounce. * @param data Data specific to the pounce. */ -void gaim_pounce_set_data(struct gaim_pounce *pounce, void *data); +void gaim_pounce_set_data(GaimPounce *pounce, void *data); /** * Returns the events a pounce should watch for. @@ -140,7 +136,7 @@ * * @return The events the pounce is watching for. */ -GaimPounceEvent gaim_pounce_get_events(const struct gaim_pounce *pounce); +GaimPounceEvent gaim_pounce_get_events(const GaimPounce *pounce); /** * Returns the account that will do the pouncing. @@ -149,7 +145,7 @@ * * @return The account that will pounce. */ -GaimAccount *gaim_pounce_get_pouncer(const struct gaim_pounce *pounce); +GaimAccount *gaim_pounce_get_pouncer(const GaimPounce *pounce); /** * Returns the buddy a pounce should pounce on. @@ -158,7 +154,7 @@ * * @return The buddy to pounce on. */ -const char *gaim_pounce_get_pouncee(const struct gaim_pounce *pounce); +const char *gaim_pounce_get_pouncee(const GaimPounce *pounce); /** * Returns the pounce-specific data. @@ -167,7 +163,7 @@ * * @return The data specific to a buddy pounce. */ -void *gaim_pounce_get_data(const struct gaim_pounce *pounce); +void *gaim_pounce_get_data(const GaimPounce *pounce); /** * Executes a pounce with the specified pouncer, pouncee, and event type. @@ -176,8 +172,7 @@ * @param pouncee The buddy that is being pounced. * @param events The events that triggered the pounce. */ -void gaim_pounce_execute(const GaimAccount *pouncer, - const char *pouncee, +void gaim_pounce_execute(const GaimAccount *pouncer, const char *pouncee, GaimPounceEvent events); /** @@ -189,9 +184,8 @@ * * @return The pounce if found, or @c NULL otherwise. */ -struct gaim_pounce *gaim_find_pounce(const GaimAccount *pouncer, - const char *pouncee, - GaimPounceEvent events); +GaimPounce *gaim_find_pounce(const GaimAccount *pouncer, + const char *pouncee, GaimPounceEvent events); /** * Returns a list of all registered buddy pounces.