comparison: src/protocols/yahoo/yahoochat.c
src/protocols/yahoo/yahoochat.c
- changeset 12999
- 7479d16384c0
- parent 12998
- 3b9228370784
- child 13000
- 6345d0df7ad0
equal
deleted
inserted
replaced
| 12998:3b9228370784 | 12999:7479d16384c0 |
|---|---|
| 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) |
