Mercurial > pidgin.yaz
comparison libpurple/protocols/jabber/jabber.c @ 21978:cacc01b50a23
Fixes for incorrectly displaying user tune emblem and empty current media.
We now send an empty tune when not listening to any music, don't interpret
empty tune information as valid tune info and deactivate the "tune" status
when receiving empty tune information.
author | Stu Tomlinson <stu@nosnilmot.com> |
---|---|
date | Thu, 03 Jan 2008 18:31:58 +0000 |
parents | 966f98d4b04b |
children | af0426c34c27 |
comparison
equal
deleted
inserted
replaced
21976:a86c035be695 | 21978:cacc01b50a23 |
---|---|
612 js->chats = g_hash_table_new_full(g_str_hash, g_str_equal, | 612 js->chats = g_hash_table_new_full(g_str_hash, g_str_equal, |
613 g_free, (GDestroyNotify)jabber_chat_free); | 613 g_free, (GDestroyNotify)jabber_chat_free); |
614 js->user = jabber_id_new(purple_account_get_username(account)); | 614 js->user = jabber_id_new(purple_account_get_username(account)); |
615 js->next_id = g_random_int(); | 615 js->next_id = g_random_int(); |
616 js->write_buffer = purple_circ_buffer_new(512); | 616 js->write_buffer = purple_circ_buffer_new(512); |
617 js->old_length = -1; | 617 js->old_length = 0; |
618 js->keepalive_timeout = -1; | 618 js->keepalive_timeout = -1; |
619 | 619 |
620 if(!js->user) { | 620 if(!js->user) { |
621 purple_connection_error_reason (gc, | 621 purple_connection_error_reason (gc, |
622 PURPLE_CONNECTION_ERROR_INVALID_SETTINGS, | 622 PURPLE_CONNECTION_ERROR_INVALID_SETTINGS, |
1098 g_free, g_free); | 1098 g_free, g_free); |
1099 js->disco_callbacks = g_hash_table_new_full(g_str_hash, g_str_equal, | 1099 js->disco_callbacks = g_hash_table_new_full(g_str_hash, g_str_equal, |
1100 g_free, g_free); | 1100 g_free, g_free); |
1101 js->user = jabber_id_new(purple_account_get_username(account)); | 1101 js->user = jabber_id_new(purple_account_get_username(account)); |
1102 js->next_id = g_random_int(); | 1102 js->next_id = g_random_int(); |
1103 js->old_length = -1; | 1103 js->old_length = 0; |
1104 | 1104 |
1105 if(!js->user) { | 1105 if(!js->user) { |
1106 purple_connection_error_reason (gc, | 1106 purple_connection_error_reason (gc, |
1107 PURPLE_CONNECTION_ERROR_INVALID_SETTINGS, | 1107 PURPLE_CONNECTION_ERROR_INVALID_SETTINGS, |
1108 _("Invalid XMPP ID")); | 1108 _("Invalid XMPP ID")); |