Mercurial > pidgin.yaz
changeset 21389:b7a004e65702
Fix the return type of pidgin_make_mini_dialog() to be GtkWidget * rather than
void *.
| author | Will Thompson <will.thompson@collabora.co.uk> |
|---|---|
| date | Fri, 02 Nov 2007 14:48:06 +0000 |
| parents | 2b5f1b47b1ba |
| children | aa52a0a224be |
| files | ChangeLog.API pidgin/gtkutils.c pidgin/gtkutils.h |
| diffstat | 3 files changed, 16 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog.API Wed Oct 31 15:32:24 2007 +0000 +++ b/ChangeLog.API Fri Nov 02 14:48:06 2007 +0000 @@ -90,6 +90,11 @@ when a dependent plugin fails to unload. The UI should do something appropriate. + * pidgin_make_mini_dialog() now declares its return type to be + GtkWidget * rather than void *. This should not break any + existing code since any code using it must already rely on + the return type actually being GtkWidget * all along. + Deprecated: * pidgin_dialogs_about() * pidgin_log_show_contact()
--- a/pidgin/gtkutils.c Wed Oct 31 15:32:24 2007 +0000 +++ b/pidgin/gtkutils.c Fri Nov 02 14:48:06 2007 +0000 @@ -2908,9 +2908,13 @@ minidialogs = g_slist_remove(minidialogs, widget); } -void *pidgin_make_mini_dialog(PurpleConnection *gc, const char *icon_name, - const char *primary, const char *secondary, - void *user_data, ...) +GtkWidget * +pidgin_make_mini_dialog(PurpleConnection *gc, + const char *icon_name, + const char *primary, + const char *secondary, + void *user_data, + ...) { GtkWidget *vbox; GtkWidget *hbox;
--- a/pidgin/gtkutils.h Wed Oct 31 15:32:24 2007 +0000 +++ b/pidgin/gtkutils.h Fri Nov 02 14:48:06 2007 +0000 @@ -621,13 +621,13 @@ * dialog will evaporate. Callbacks may be @c NULL, in * which case pressing the corresponding button simply * dismisses the dialog. - * @return A <tt>GtkWidget *</tt> suitable for passing to + * @return The dialog widget, suitable for passing to * pidgin_blist_add_alert(). * @see pidginstock.h */ -void *pidgin_make_mini_dialog(PurpleConnection *handle, const char* stock_id, - const char *primary, const char *secondary, - void *user_data, ...); +GtkWidget *pidgin_make_mini_dialog(PurpleConnection *handle, + const char* stock_id, const char *primary, const char *secondary, + void *user_data, ...); /** * This is a callback function to be used for Ctrl+F searching in treeviews.