comparison src/protocols/oscar/oscar.c @ 13253:87a7c3077c19

[gaim-migrate @ 15619] More cleaning up of oscar. Renamed some functions to be more clear. Got rid of some stuff that wasn't used. Inlined some small things in conn.c that were only used once. The goals of all this are 1. Non-blocking I/O for all connections 2. p2p stuff won't use the same struct as oscar connections, because that's stupid 3. The oscar PRPL should be less scary committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Sun, 12 Feb 2006 21:27:04 +0000
parents 2871c385c45a
children e9802db22b06
comparison
equal deleted inserted replaced
13252:2871c385c45a 13253:87a7c3077c19
1840 gc->flags |= GAIM_CONNECTION_HTML; 1840 gc->flags |= GAIM_CONNECTION_HTML;
1841 gc->flags |= GAIM_CONNECTION_AUTO_RESP; 1841 gc->flags |= GAIM_CONNECTION_AUTO_RESP;
1842 } 1842 }
1843 od->buddyinfo = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, oscar_free_buddyinfo); 1843 od->buddyinfo = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, oscar_free_buddyinfo);
1844 1844
1845 sess = g_new0(OscarSession, 1); 1845 sess = oscar_session_new();
1846 aim_session_init(sess, TRUE);
1847 /* 1846 /*
1848 * We need an immediate queue because we don't use a while-loop 1847 * We need an immediate queue because we don't use a while-loop
1849 * to see if things need to be sent. 1848 * to see if things need to be sent.
1850 */ 1849 */
1851 aim_tx_setenqueue(sess, AIM_TX_IMMEDIATE, NULL); 1850 aim_tx_setenqueue(sess, AIM_TX_IMMEDIATE, NULL);
1935 gaim_timeout_remove(od->getblisttimer); 1934 gaim_timeout_remove(od->getblisttimer);
1936 if (od->getinfotimer > 0) 1935 if (od->getinfotimer > 0)
1937 gaim_timeout_remove(od->getinfotimer); 1936 gaim_timeout_remove(od->getinfotimer);
1938 gaim_prefs_disconnect_by_handle(gc); 1937 gaim_prefs_disconnect_by_handle(gc);
1939 1938
1940 aim_session_kill(od->sess); 1939 oscar_session_destroy(od->sess);
1941 g_free(od->sess);
1942 od->sess = NULL; 1940 od->sess = NULL;
1943 g_free(gc->proto_data); 1941 g_free(gc->proto_data);
1944 gc->proto_data = NULL; 1942 gc->proto_data = NULL;
1945 gaim_debug_info("oscar", "Signed off.\n"); 1943 gaim_debug_info("oscar", "Signed off.\n");
1946 } 1944 }