Mercurial > pidgin.yaz
comparison src/protocols/yahoo/yahoochat.c @ 12999:68db2c40efb2
[gaim-migrate @ 15352]
Bleeter updated yahoo to support ignoring conference and chatroom invitations similarly to how SILC and the native y! client do. If you don't like the verbiage, blame me.
committer: Tailor Script <tailor@pidgin.im>
author | Daniel Atallah <daniel.atallah@gmail.com> |
---|---|
date | Mon, 23 Jan 2006 01:47:56 +0000 |
parents | a2096c8978b2 |
children | a4ac07e7b077 |
comparison
equal
deleted
inserted
replaced
12998:a2096c8978b2 | 12999:68db2c40efb2 |
---|---|
152 g_hash_table_replace(components, g_strdup("topic"), msg); | 152 g_hash_table_replace(components, g_strdup("topic"), msg); |
153 g_hash_table_replace(components, g_strdup("type"), g_strdup("Conference")); | 153 g_hash_table_replace(components, g_strdup("type"), g_strdup("Conference")); |
154 if (members) { | 154 if (members) { |
155 g_hash_table_replace(components, g_strdup("members"), g_strdup(members->str)); | 155 g_hash_table_replace(components, g_strdup("members"), g_strdup(members->str)); |
156 } | 156 } |
157 if (!yahoo_privacy_check(gc, who)) { | 157 if (!yahoo_privacy_check(gc, who) || |
158 (gaim_account_get_bool(gaim_connection_get_account(gc), "ignore_invites", FALSE))) { | |
158 gaim_debug_info("yahoo", | 159 gaim_debug_info("yahoo", |
159 "Invite to conference %s from %s has been dropped.\n", room, who); | 160 "Invite to conference %s from %s has been dropped.\n", room, who); |
160 g_string_free(members, TRUE); | 161 g_string_free(members, TRUE); |
161 return; | 162 return; |
162 } | 163 } |
599 if (room && who) { | 600 if (room && who) { |
600 GHashTable *components; | 601 GHashTable *components; |
601 | 602 |
602 components = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free); | 603 components = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free); |
603 g_hash_table_replace(components, g_strdup("room"), g_strdup(room)); | 604 g_hash_table_replace(components, g_strdup("room"), g_strdup(room)); |
604 if (!yahoo_privacy_check(gc, who)) { | 605 if (!yahoo_privacy_check(gc, who) || |
606 (gaim_account_get_bool(gaim_connection_get_account(gc), "ignore_invites", FALSE))) { | |
605 gaim_debug_info("yahoo", | 607 gaim_debug_info("yahoo", |
606 "Invite to room %s from %s has been dropped.\n", room, who); | 608 "Invite to room %s from %s has been dropped.\n", room, who); |
607 if (room != NULL) | 609 if (room != NULL) |
608 g_free(room); | 610 g_free(room); |
609 if (msg != NULL) | 611 if (msg != NULL) |