Mercurial > pidgin.yaz
diff src/protocols/oscar/oscar.c @ 10087:9fdbfe832fac
[gaim-migrate @ 11098]
gaim_prefs_connect_callback() now takes a handle that can be used to disconnect
the callbacks later on. The callback id's remain, so people can still use those
if they want, although I'm not sure if there's any need for them any more.
I also switched the order for initializing the prefs subsystem and statically
compiled protocol plugins so that prpl prefs can work for statically compiled
prpls.
committer: Tailor Script <tailor@pidgin.im>
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Tue, 12 Oct 2004 00:49:19 +0000 |
| parents | ae6157393415 |
| children | 2923a6c59192 |
line wrap: on
line diff
--- a/src/protocols/oscar/oscar.c Sun Oct 10 16:47:56 2004 +0000 +++ b/src/protocols/oscar/oscar.c Tue Oct 12 00:49:19 2004 +0000 @@ -107,7 +107,6 @@ guint icontimer; guint getblisttimer; guint getinfotimer; - guint recentbuddies_cbid; struct { guint maxwatchers; /* max users who can watch you */ @@ -1731,7 +1730,7 @@ sess->aux_data = gc; /* Connect to core Gaim signals */ - od->recentbuddies_cbid = gaim_prefs_connect_callback("/plugins/prpl/oscar/recent_buddies", recent_buddies_cb, gc); + gaim_prefs_connect_callback(gc, "/plugins/prpl/oscar/recent_buddies", recent_buddies_cb, gc); conn = aim_newconn(sess, AIM_CONN_TYPE_AUTH, NULL); if (conn == NULL) { @@ -1813,7 +1812,7 @@ gaim_timeout_remove(od->getblisttimer); if (od->getinfotimer > 0) gaim_timeout_remove(od->getinfotimer); - gaim_prefs_disconnect_callback(od->recentbuddies_cbid); + gaim_prefs_disconnect_by_handle(gc); aim_session_kill(od->sess); g_free(od->sess);