/soc/2013/ankitkv/gobjectification: f80a806325a4: Made pidgin_{p...

[Ankit Vani]

Changeset: f80a806325a49572141bc875d3b6cd09fc053563
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-10-24 16:34 +0530
Branch:	 soc.2013.gobjectification
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/f80a806325a4

Description:

Made pidgin_{permit|deny}_{added|removed} static

diffstat:

 pidgin/gtkaccount.c |  12 ++++--------
 pidgin/gtkprivacy.c |  12 +++++++-----
 2 files changed, 11 insertions(+), 13 deletions(-)

diffs (76 lines):

diff --git a/pidgin/gtkaccount.c b/pidgin/gtkaccount.c
--- a/pidgin/gtkaccount.c
+++ b/pidgin/gtkaccount.c
@@ -165,10 +165,6 @@ static void add_account_to_liststore(Pur
 static void set_account(GtkListStore *store, GtkTreeIter *iter,
 						  PurpleAccount *account, GdkPixbuf *global_buddyicon);
 
-/* privacy UI ops */
-void pidgin_permit_added_removed(PurpleAccount *account, const char *name);
-void pidgin_deny_added_removed(PurpleAccount *account, const char *name);
-
 /**************************************************************************
  * Add/Modify Account dialog
  **************************************************************************/
@@ -2904,10 +2900,10 @@ static PurpleAccountUiOps ui_ops =
 	pidgin_accounts_request_add,
 	pidgin_accounts_request_authorization,
 	pidgin_accounts_request_close,
-	pidgin_permit_added_removed,
-	pidgin_permit_added_removed,
-	pidgin_deny_added_removed,
-	pidgin_deny_added_removed,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
 	NULL, NULL, NULL, NULL
 };
 
diff --git a/pidgin/gtkprivacy.c b/pidgin/gtkprivacy.c
--- a/pidgin/gtkprivacy.c
+++ b/pidgin/gtkprivacy.c
@@ -31,6 +31,7 @@
 #include "request.h"
 #include "util.h"
 
+#include "gtkaccount.h"
 #include "gtkblist.h"
 #include "gtkprivacy.h"
 #include "gtkutils.h"
@@ -90,9 +91,6 @@ static const size_t menu_entry_count = s
 
 static PidginPrivacyDialog *privacy_dialog = NULL;
 
-void pidgin_permit_added_removed(PurpleAccount *account, const char *name);
-void pidgin_deny_added_removed(PurpleAccount *account, const char *name);
-
 static void
 rebuild_allow_list(PidginPrivacyDialog *dialog)
 {
@@ -559,14 +557,14 @@ pidgin_request_add_block(PurpleAccount *
 	}
 }
 
-void
+static void
 pidgin_permit_added_removed(PurpleAccount *account, const char *name)
 {
 	if (privacy_dialog != NULL)
 		rebuild_allow_list(privacy_dialog);
 }
 
-void
+static void
 pidgin_deny_added_removed(PurpleAccount *account, const char *name)
 {
 	if (privacy_dialog != NULL)
@@ -576,4 +574,8 @@ pidgin_deny_added_removed(PurpleAccount 
 void
 pidgin_privacy_init(void)
 {
+	PurpleAccountUiOps *ops = pidgin_accounts_get_ui_ops();
+
+	ops->permit_added = ops->permit_removed = pidgin_permit_added_removed;
+	ops->deny_added = ops->deny_removed = pidgin_deny_added_removed;
 }