gobjectification: 6acc79b3: and we compile libpurple + prpls + defau...

[grim at pidgin.im]

-----------------------------------------------------------------
Revision: 6acc79b35241c7a742f6766e47e728ac237c2459
Ancestor: 0d1d0d436c022bd3f7ca0f39d901997a1c02f33e
Author: grim at pidgin.im
Date: 2009-07-19T18:32:46
Branch: im.pidgin.gobjectification
URL: http://d.pidgin.im/viewmtn/revision/info/6acc79b35241c7a742f6766e47e728ac237c2459

Modified files:
        libpurple/connection.c libpurple/gsignal.c
        libpurple/gsignal.h

ChangeLog: 

and we compile libpurple + prpls + default plugins now!


-------------- next part --------------
============================================================
--- libpurple/connection.c	933ac5db238fecb2b53bc30487e572fc482664f3
+++ libpurple/connection.c	c82a178c215d476c9cdd1337006e67844c1d9894
@@ -546,7 +546,7 @@ purple_connection_disconnect_cb(gpointer
 	account = data;
 	gc = purple_account_get_connection(account);
 
-	gc->disconnect_timeout = 0;
+	gc->priv->disconnect_timeout = 0;
 
 	password = g_strdup(purple_account_get_password(account));
 	purple_account_disconnect(account);
============================================================
--- libpurple/gsignal.c	9b55225c2bcb6eb0e85992a8070a599c5a4d15e3
+++ libpurple/gsignal.c	a0e28ada68a8fc818468aa82048a2596a5934d89
@@ -67,7 +67,7 @@ purple_g_signal_emission_hook(GSignalInv
 	g_signal_connect_closure_by_id(obj, hint->signal_id, sd->detail, closure, after);
 
 	if(sd->return_type != G_TYPE_NONE) {
-		GValue ret = { 0, };
+		GValue ret;
 
 		g_value_init(&ret, sd->return_type);
 
@@ -84,8 +84,8 @@ purple_g_signal_connect_flags(GType type
  *****************************************************************************/
 PurpleGSignalHandle *
 purple_g_signal_connect_flags(GType type, const gchar *name,
-                               GConnectFlags flags,
-                               GCallback callback, gpointer data)
+							  GConnectFlags flags,
+							  GCallback callback, gpointer data)
 {
 	PurpleGSignalData *sd = NULL;
 	PurpleGSignalHandle *handle = NULL;
@@ -122,11 +122,11 @@ purple_g_signal_connect_flags(GType type
 	}
 
 	sd = g_new(PurpleGSignalData, 1);
-	sd->callback = cb;
-	sd->user_data = d;
+	sd->callback = callback;
+	sd->user_data = data;
 	sd->flags = 0;
 	sd->detail = detail;
-	sd->type = t;
+	sd->type = type;
 	sd->return_type = query.return_type;
 
 	hook_id = g_signal_add_emission_hook(signal_id, detail,
============================================================
--- libpurple/gsignal.h	d3d03fd2860f79a755c684dc4b874b024e0e7ad7
+++ libpurple/gsignal.h	0fc90bb77e2329d41e182911eb787d17d46975a6
@@ -36,7 +36,7 @@ void purple_g_signal_disconnect(PurpleGS
 PurpleGSignalHandle *purple_g_signal_connect_flags(GType type, const gchar *name, GConnectFlags flags, GCallback callback, gpointer data);
 void purple_g_signal_disconnect(PurpleGSignalHandle *handle);
 
-GType purple_g_signal_handle_get_gtype(void);
+GType purple_g_signal_handle_get_type(void);
 PurpleGSignalHandle *purple_g_signal_handle_new(guint signal_id, gulong hook_id);
 PurpleGSignalHandle *purple_g_signal_handle_copy(const PurpleGSignalHandle *handle);
 void purple_g_signal_handle_free(PurpleGSignalHandle *handle);