Fix the return type of pidgin_make_mini_dialog() to be GtkWidget * rather than cpw.resiak.disconnectreason

Fri, 02 Nov 2007 14:48:06 +0000

author
Will Thompson <resiak@pidgin.im>
date
Fri, 02 Nov 2007 14:48:06 +0000
branch
cpw.resiak.disconnectreason
changeset 21310
de88118624f0
parent 21309
3d4ea71cea76
child 21311
bca57f8144a1

Fix the return type of pidgin_make_mini_dialog() to be GtkWidget * rather than
void *.

ChangeLog.API file | annotate | diff | comparison | revisions
pidgin/gtkutils.c file | annotate | diff | comparison | revisions
pidgin/gtkutils.h file | annotate | diff | comparison | revisions
--- 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.

mercurial