diff options
| author | Mark Doliner <markdoliner@pidgin.im> | 2008-02-03 19:38:02 +0000 |
|---|---|---|
| committer | Mark Doliner <markdoliner@pidgin.im> | 2008-02-03 19:38:02 +0000 |
| commit | 1208da4ce47552da9ae049683920b96321a81c1b (patch) | |
| tree | b4dec1e763e3afe8dd990d18e95b701ba9dd05c8 | |
| parent | 0e974ba806a171ffa24e59217a0312c16770c12b (diff) | |
| download | pidgin-1208da4ce47552da9ae049683920b96321a81c1b.tar.gz | |
Remove the privacy prpl callbacks in Zephyr since they're basically a
no-op. purple_privacy_permit_add calls serv_add_permit which calls
zephyr_add_permit which calls purple_privacy_permit_add which does
nothing because the buddy already exists in the permit list. Likewise
for the other three functions. And zephyr_set_permit_deny wasn't
even doing anything.
| -rw-r--r-- | libpurple/protocols/zephyr/zephyr.c | 40 | ||||
| -rw-r--r-- | pidgin/gtkprivacy.c | 1 |
2 files changed, 6 insertions, 35 deletions
diff --git a/libpurple/protocols/zephyr/zephyr.c b/libpurple/protocols/zephyr/zephyr.c index 1b86e7db42..559df186af 100644 --- a/libpurple/protocols/zephyr/zephyr.c +++ b/libpurple/protocols/zephyr/zephyr.c @@ -2782,36 +2782,6 @@ static void zephyr_register_slash_commands(void) } -static void -zephyr_add_deny(PurpleConnection *gc, const char *who) -{ - purple_privacy_deny_add(gc->account,who,1); -} - -static void -zephyr_remove_deny(PurpleConnection *gc, const char *who) -{ - purple_privacy_deny_remove(gc->account,who,1); -} - -static void -zephyr_add_permit(PurpleConnection *gc, const char *who) -{ - purple_privacy_permit_add(gc->account,who,1); -} - -static void -zephyr_remove_permit(PurpleConnection *gc, const char *who) -{ - purple_privacy_permit_remove(gc->account,who,1); -} - -static void -zephyr_set_permit_deny(PurpleConnection *gc) -{ - /* This doesn't have to do anything, since really, we can just check account->perm_deny when deciding whether to di */ - return; -} static int zephyr_resubscribe(PurpleConnection *gc) { /* Resubscribe to the in-memory list of subscriptions and also @@ -2920,11 +2890,11 @@ static PurplePluginProtocolInfo prpl_info = { NULL, /* add_buddies */ NULL, /* remove_buddy */ NULL, /* remove_buddies */ - zephyr_add_permit, /* add_permit */ - zephyr_add_deny, /* add_deny */ - zephyr_remove_permit, /* remove_permit */ - zephyr_remove_deny, /* remove_deny */ - zephyr_set_permit_deny, /* set_permit_deny */ + NULL, /* add_permit */ + NULL, /* add_deny */ + NULL, /* remove_permit */ + NULL, /* remove_deny */ + NULL, /* set_permit_deny */ zephyr_join_chat, /* join_chat */ NULL, /* reject_chat -- No chat invites*/ zephyr_get_chat_name, /* get_chat_name */ diff --git a/pidgin/gtkprivacy.c b/pidgin/gtkprivacy.c index 71d449cee4..518b03d508 100644 --- a/pidgin/gtkprivacy.c +++ b/pidgin/gtkprivacy.c @@ -410,6 +410,7 @@ privacy_dialog_new(void) /* Remove button */ button = pidgin_dialog_add_button(GTK_DIALOG(dialog->win), GTK_STOCK_REMOVE, G_CALLBACK(remove_cb), dialog); dialog->remove_button = button; + /* TODO: This button should be sensitive/invisitive more cleverly */ gtk_widget_set_sensitive(button, FALSE); /* Remove All button */ |