Mercurial > pidgin.yaz
changeset 6375:72023626d5b8
[gaim-migrate @ 6880]
Removed some unnecessary stuff. Oh yeah, and I think privacy is broken. I
can block, but not unblock. I'll fix it tomorrow.
committer: Tailor Script <tailor@pidgin.im>
| author | Christian Hammond <chipx86@chipx86.com> |
|---|---|
| date | Tue, 05 Aug 2003 11:33:18 +0000 |
| parents | ca73fdf3eb38 |
| children | 05b488eda686 |
| files | src/gtkprivacy.c src/privacy.c |
| diffstat | 2 files changed, 9 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gtkprivacy.c Tue Aug 05 11:18:27 2003 +0000 +++ b/src/gtkprivacy.c Tue Aug 05 11:33:18 2003 +0000 @@ -236,11 +236,6 @@ dialog->account = account; - gaim_debug(GAIM_DEBUG_MISC, "select_account_cb", - "dialog = %p\n", dialog); - gaim_debug(GAIM_DEBUG_MISC, "select_account_cb", - "menu_entry_count = %d\n", menu_entry_count); - for (i = 0; i < menu_entry_count; i++) { if (menu_entries[i].num == account->perm_deny) { gtk_option_menu_set_history(GTK_OPTION_MENU(dialog->type_menu), i); @@ -315,20 +310,12 @@ return; if (dialog->in_allow_list) { - const char *new_name; - - new_name = find_permit_block_by_name(dialog->account->permit, name); - - if (new_name != NULL) - gaim_privacy_permit_remove(dialog->account, new_name); + if (find_permit_block_by_name(dialog->account->permit, name)) + gaim_privacy_permit_remove(dialog->account, name); } else { - const char *new_name; - - new_name = find_permit_block_by_name(dialog->account->deny, name); - - if (new_name != NULL) - gaim_privacy_deny_remove(dialog->account, new_name); + if (find_permit_block_by_name(dialog->account->deny, name)) + gaim_privacy_deny_remove(dialog->account, name); } }
--- a/src/privacy.c Tue Aug 05 11:18:27 2003 +0000 +++ b/src/privacy.c Tue Aug 05 11:33:18 2003 +0000 @@ -20,6 +20,7 @@ #include "internal.h" #include "account.h" +#include "debug.h" #include "privacy.h" #include "server.h" #include "util.h" @@ -153,8 +154,11 @@ account->deny = g_slist_remove(account->deny, l->data); g_free(l->data); - if (gaim_account_is_connected(account)) + if (gaim_account_is_connected(account)) { + gaim_debug(GAIM_DEBUG_INFO, "privacy", + "Removing %s from server-side deny list\n", who); serv_rem_deny(gaim_account_get_connection(account), who); + } gaim_blist_save();