im.pidgin.pidgin: 9434ad8c4736c82c89b91de919d8f91d16352224

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: 9434ad8c4736c82c89b91de919d8f91d16352224
Ancestor: e9bc260dad36332e2b8f90691c700cab2b50bfc1
Author: markdoliner at pidgin.im
Date: 2008-02-03T19:38:02
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/9434ad8c4736c82c89b91de919d8f91d16352224

Modified files:
        libpurple/protocols/zephyr/zephyr.c pidgin/gtkprivacy.c

ChangeLog: 

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.

-------------- next part --------------
============================================================
--- libpurple/protocols/zephyr/zephyr.c	21f87d0c083a609963b702cd49e141996643da0f
+++ libpurple/protocols/zephyr/zephyr.c	613b3120c82d44f4dc267b5ad1b410d8a7e852b6
@@ -2782,36 +2782,6 @@ static void zephyr_register_slash_comman
 }
 
 
-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_inf
 	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 */
============================================================
--- pidgin/gtkprivacy.c	db5da02e72c26ffffe50e000979828063ad21f0c
+++ pidgin/gtkprivacy.c	0539636ae120a83ed054e2fc0defb5fc235fd35a
@@ -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 */