gobjectification: a0cc1728: make things compile and run in finch.

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: a0cc17280eb15c5e44ca24c1367d27b3cd476311
Ancestor: 95fc0318c9e0ab2549bda0779ac9c195fb6fb57b
Author: sadrul at pidgin.im
Date: 2008-03-13T11:34:09
Branch: im.pidgin.gobjectification
URL: http://d.pidgin.im/viewmtn/revision/info/a0cc17280eb15c5e44ca24c1367d27b3cd476311

Modified files:
        finch/gntblist.c finch/gntconv.c finch/gntpounce.c
        finch/gntsound.c finch/gntui.c

ChangeLog: 

make things compile and run in finch.

-------------- next part --------------
============================================================
--- finch/gntblist.c	371a337fff5ffd5944c958bd5345b30725c34f60
+++ finch/gntblist.c	9f37df2176e82dc285d407fbf050af92e25c1c46
@@ -2067,7 +2067,7 @@ void finch_blist_init()
 	purple_prefs_connect_callback(finch_blist_get_handle(),
 			PREF_ROOT "/grouping", redraw_blist, NULL);
 
-	purple_signal_connect(purple_connections_get_handle(), "signed-on", purple_blist_get_handle(),
+	purple_signal_connect(NULL, "signed-on", purple_blist_get_handle(),
 			G_CALLBACK(account_signed_on_cb), NULL);
 
 	finch_blist_install_manager(&default_manager);
@@ -2900,9 +2900,9 @@ blist_show(PurpleBuddyList *list)
 
 	gnt_widget_show(ggblist->window);
 
-	purple_signal_connect(purple_connections_get_handle(), "signed-on", finch_blist_get_handle(),
+	purple_signal_connect(NULL, "signed-on", finch_blist_get_handle(),
 				PURPLE_CALLBACK(reconstruct_accounts_menu), NULL);
-	purple_signal_connect(purple_connections_get_handle(), "signed-off", finch_blist_get_handle(),
+	purple_signal_connect(NULL, "signed-off", finch_blist_get_handle(),
 				PURPLE_CALLBACK(reconstruct_accounts_menu), NULL);
 	purple_signal_connect(purple_blist_get_handle(), "buddy-status-changed", finch_blist_get_handle(),
 				PURPLE_CALLBACK(buddy_status_changed), ggblist);
============================================================
--- finch/gntconv.c	7db0e89190623892eeed92ffa11408cc8c8de667
+++ finch/gntconv.c	df6c70378fa921e7a663d11af7ed1f14bccd1973
@@ -1288,9 +1288,9 @@ void finch_conversation_init()
 					PURPLE_CALLBACK(buddy_signed_on_off), NULL);
 	purple_signal_connect(purple_blist_get_handle(), "buddy-signed-off", finch_conv_get_handle(),
 					PURPLE_CALLBACK(buddy_signed_on_off), NULL);
-	purple_signal_connect(purple_connections_get_handle(), "signed-on", finch_conv_get_handle(),
+	purple_signal_connect(NULL, "signed-on", finch_conv_get_handle(),
 					PURPLE_CALLBACK(account_signed_on_off), NULL);
-	purple_signal_connect(purple_connections_get_handle(), "signed-off", finch_conv_get_handle(),
+	purple_signal_connect(NULL, "signed-off", finch_conv_get_handle(),
 					PURPLE_CALLBACK(account_signed_on_off), NULL);
 }
 
============================================================
--- finch/gntpounce.c	ca06a966af8cd4c9e288f056562a7f8b23a58c77
+++ finch/gntpounce.c	158ee2e1b8b62d4decac7bd075b313f3b47d7336
@@ -971,10 +971,10 @@ finch_pounces_init(void)
 						FALSE);
 	purple_prefs_add_none("/finch/pounces/dialog");
 
-	purple_signal_connect(purple_connections_get_handle(), "signed-on",
+	purple_signal_connect(NULL, "signed-on",
 						finch_pounces_get_handle(),
 						PURPLE_CALLBACK(signed_on_off_cb), NULL);
-	purple_signal_connect(purple_connections_get_handle(), "signed-off",
+	purple_signal_connect(NULL, "signed-off",
 						finch_pounces_get_handle(),
 						PURPLE_CALLBACK(signed_on_off_cb), NULL);
 }
============================================================
--- finch/gntsound.c	3dfc44a69e217e5ecd09a844c0bc7fdef2316277
+++ finch/gntsound.c	f0c242a2152d11d7c7eaaf14ad417145e90b2b59
@@ -344,7 +344,7 @@ finch_sound_init(void)
 	GError *error = NULL;
 #endif
 
-	purple_signal_connect(purple_connections_get_handle(), "signed-on",
+	purple_signal_connect(NULL, "signed-on",
 						gnt_sound_handle, PURPLE_CALLBACK(account_signon_cb),
 						NULL);
 
============================================================
--- finch/gntui.c	0a3dd5b122adf23040adadd21949a5ea7e51683d
+++ finch/gntui.c	99bb78dc821137f753596a3c1c6618d4000ec0a8
@@ -56,7 +56,9 @@ void gnt_ui_init()
 
 	/* Connections */
 	finch_connections_init();
+#if 0
 	purple_connections_set_ui_ops(finch_connections_get_ui_ops());
+#endif
 
 	/* Initialize the buddy list */
 	finch_blist_init();
@@ -111,7 +113,9 @@ void gnt_ui_uninit()
 	purple_accounts_set_ui_ops(NULL);
 	finch_accounts_uninit();
 
+#if 0
 	purple_connections_set_ui_ops(NULL);
+#endif
 	finch_connections_uninit();
 
 	purple_blist_set_ui_ops(NULL);