im.pidgin.cpw.resiak.disconnectreason: 4cb0fc8473bb2c11787948e18b243fe7378ad2a0

[resiak at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 4cb0fc8473bb2c11787948e18b243fe7378ad2a0
Ancestor: 5dcaadc25abb777342bcec5f2438c4ac5aa4c527
Author: resiak at soc.pidgin.im
Date: 2007-11-02T14:48:06
Branch: im.pidgin.cpw.resiak.disconnectreason

Modified files:
        ChangeLog.API pidgin/gtkutils.c pidgin/gtkutils.h

ChangeLog: 

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

-------------- next part --------------
============================================================
--- ChangeLog.API	03a52f1864a03d98a6deefa5d1f894ff11c351e0
+++ ChangeLog.API	0fc9eb7a38e77923cbe4448646bc407de373cf7e
@@ -90,6 +90,11 @@ version 2.3.0 (??/??/????):
 		  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()
============================================================
--- pidgin/gtkutils.c	f25493f512c5a1c71fec0042990020ff45a816b5
+++ pidgin/gtkutils.c	048ff8179650132f8fbb52a9977e5a6719a409b8
@@ -2908,9 +2908,13 @@ static void alert_killed_cb(GtkWidget *w
 	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;
============================================================
--- pidgin/gtkutils.h	1b8453a2a37b4351d32ef44f42fe500357dceff1
+++ pidgin/gtkutils.h	24aab942266ceda113e07e7ab0492d7c4c1176e5
@@ -621,13 +621,13 @@ char *pidgin_make_pretty_arrows(const ch
  *                       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.