aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00
Code

Revert "Commented self presence handling #151"

Browse Source 
This reverts commit 872726c5aa.
This commit is contained in:
James Booth 2013-02-21 08:14:41 +00:00
parent 872726c5aa
commit d1e28e44ca
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/xmpp/connection.c
View File

@ -94,8 +94,8 @@ jabber_init(const int disable_tls)
jabber_conn.tls_disabled = disable_tls; jabber_conn.tls_disabled = disable_tls;
presence_init(); presence_init();
caps_init(); caps_init();
// available_resources = g_hash_table_new_full(g_str_hash, g_str_equal, free, available_resources = g_hash_table_new_full(g_str_hash, g_str_equal, free,
// (GDestroyNotify)resource_destroy); (GDestroyNotify)resource_destroy);
} }
jabber_conn_status_t jabber_conn_status_t
@ -283,7 +283,7 @@ connection_free_resources(void)
FREE_SET_NULL(saved_details.altdomain); FREE_SET_NULL(saved_details.altdomain);
FREE_SET_NULL(saved_account.name); FREE_SET_NULL(saved_account.name);
FREE_SET_NULL(saved_account.passwd); FREE_SET_NULL(saved_account.passwd);
// g_hash_table_remove_all(available_resources); g_hash_table_remove_all(available_resources);
chat_sessions_clear(); chat_sessions_clear();
presence_free_sub_requests(); presence_free_sub_requests();
xmpp_conn_release(jabber_conn.conn); xmpp_conn_release(jabber_conn.conn);

6
src/xmpp/presence.c
View File

@ -343,13 +343,10 @@ _unavailable_handler(xmpp_conn_t * const conn,
if (strcmp(my_jid->barejid, from_jid->barejid) !=0) { if (strcmp(my_jid->barejid, from_jid->barejid) !=0) {
prof_handle_contact_offline(from_jid->barejid, from_jid->resourcepart, status_str); prof_handle_contact_offline(from_jid->barejid, from_jid->resourcepart, status_str);
/*
} else { } else {
connection_remove_available_resource(from_jid->resourcepart); connection_remove_available_resource(from_jid->resourcepart);
*/
} }
jid_destroy(my_jid); jid_destroy(my_jid);
jid_destroy(from_jid); jid_destroy(from_jid);
@ -430,17 +427,14 @@ _available_handler(xmpp_conn_t * const conn,
Resource *resource = resource_new(from_jid->resourcepart, presence, Resource *resource = resource_new(from_jid->resourcepart, presence,
status_str, priority, caps_key); status_str, priority, caps_key);
prof_handle_contact_online(from_jid->barejid, resource, last_activity); prof_handle_contact_online(from_jid->barejid, resource, last_activity);
/*
} else { } else {
// handle self presence // handle self presence
resource_presence_t presence = resource_presence_from_string(show_str); resource_presence_t presence = resource_presence_from_string(show_str);
Resource *resource = resource_new(from_jid->resourcepart, presence, Resource *resource = resource_new(from_jid->resourcepart, presence,
status_str, priority, caps_key); status_str, priority, caps_key);
connection_add_available_resource(resource); connection_add_available_resource(resource);
*/
} }
jid_destroy(my_jid); jid_destroy(my_jid);
jid_destroy(from_jid); jid_destroy(from_jid);