From 0cc25e1b763cbf396a0bb397183761fc7399b4fe Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Sat, 18 Oct 2014 19:19:01 +0100
Subject: [PATCH] Removed debug messages when setting roles/affiliations

---
 src/server_events.c | 12 ------------
 src/server_events.h |  2 --
 src/ui/core.c       | 20 --------------------
 src/ui/ui.h         |  2 --
 src/xmpp/iq.c       |  4 ----
 5 files changed, 40 deletions(-)

diff --git a/src/server_events.c b/src/server_events.c
index 7dfff16e..de02aa6d 100644
--- a/src/server_events.c
+++ b/src/server_events.c
@@ -205,12 +205,6 @@ handle_room_role_set_error(const char * const room, const char * const nick, con
     ui_handle_room_role_set_error(room, nick, role, error);
 }
 
-void
-handle_room_role_set(const char * const room, const char * const nick, const char * const role)
-{
-    ui_handle_room_role_set(room, nick, role);
-}
-
 void
 handle_room_role_list_result_error(const char * const room, const char * const role, const char * const error)
 {
@@ -232,12 +226,6 @@ handle_room_affiliation_set_error(const char * const room, const char * const ji
     ui_handle_room_affiliation_set_error(room, jid, affiliation, error);
 }
 
-void
-handle_room_affiliation_set(const char * const room, const char * const jid, const char * const affiliation)
-{
-    ui_handle_room_affiliation_set(room, jid, affiliation);
-}
-
 void
 handle_disco_items(GSList *items, const char *jid)
 {
diff --git a/src/server_events.h b/src/server_events.h
index ea366083..1155b9d1 100644
--- a/src/server_events.h
+++ b/src/server_events.h
@@ -64,12 +64,10 @@ void handle_room_affiliation_list_result_error(const char * const room, const ch
 void handle_room_affiliation_list(const char * const room, const char * const affiliation, GSList *jids);
 void handle_room_affiliation_set_error(const char * const room, const char * const jid, const char * const affiliation,
     const char * const error);
-void handle_room_affiliation_set(const char * const room, const char * const jid, const char * const affiliation);
 void handle_room_role_list_result_error(const char * const from, const char * const role, const char * const error);
 void handle_room_role_list(const char * const from, const char * const role, GSList *nicks);
 void handle_room_role_set_error(const char * const room, const char * const nick, const char * const role,
     const char * const error);
-void handle_room_role_set(const char * const from, const char * const nick, const char * const role);
 void handle_room_kick_result_error(const char * const room, const char * const nick, const char * const error);
 void handle_incoming_message(char *from, char *message, gboolean priv);
 void handle_delayed_message(char *from, char *message, GTimeVal tv_stamp,
diff --git a/src/ui/core.c b/src/ui/core.c
index 40157716..5868f5e6 100644
--- a/src/ui/core.c
+++ b/src/ui/core.c
@@ -2043,15 +2043,6 @@ _ui_handle_room_affiliation_set_error(const char * const room, const char * cons
     }
 }
 
-static void
-_ui_handle_room_affiliation_set(const char * const room, const char * const jid, const char * const affiliation)
-{
-    ProfWin *window = wins_get_by_recipient(room);
-    if (window) {
-        win_save_vprint(window, '!', NULL, 0, 0, "", "Affiliation for %s set: %s", jid, affiliation);
-    }
-}
-
 static void
 _ui_handle_room_role_set_error(const char * const room, const char * const nick, const char * const role,
     const char * const error)
@@ -2062,15 +2053,6 @@ _ui_handle_room_role_set_error(const char * const room, const char * const nick,
     }
 }
 
-static void
-_ui_handle_room_role_set(const char * const room, const char * const nick, const char * const role)
-{
-    ProfWin *window = wins_get_by_recipient(room);
-    if (window) {
-        win_save_vprint(window, '!', NULL, 0, 0, "", "Role for %s set: %s", nick, role);
-    }
-}
-
 static void
 _ui_status(void)
 {
@@ -3135,7 +3117,6 @@ ui_init_module(void)
     ui_handle_room_affiliation_list_error = _ui_handle_room_affiliation_list_error;
     ui_handle_room_affiliation_list = _ui_handle_room_affiliation_list;
     ui_handle_room_affiliation_set_error = _ui_handle_room_affiliation_set_error;
-    ui_handle_room_affiliation_set = _ui_handle_room_affiliation_set;
     ui_handle_room_kick_error = _ui_handle_room_kick_error;
     ui_room_destroyed = _ui_room_destroyed;
     ui_room_kicked = _ui_room_kicked;
@@ -3144,7 +3125,6 @@ ui_init_module(void)
     ui_room_member_kicked = _ui_room_member_kicked;
     ui_room_member_banned = _ui_room_member_banned;
     ui_handle_room_role_set_error = _ui_handle_room_role_set_error;
-    ui_handle_room_role_set = _ui_handle_room_role_set;
     ui_handle_room_role_list_error = _ui_handle_room_role_list_error;
     ui_handle_room_role_list = _ui_handle_room_role_list;
     ui_muc_roster = _ui_muc_roster;
diff --git a/src/ui/ui.h b/src/ui/ui.h
index 7c86e933..4048b3a5 100644
--- a/src/ui/ui.h
+++ b/src/ui/ui.h
@@ -199,10 +199,8 @@ void (*ui_handle_room_affiliation_list_error)(const char * const room, const cha
 void (*ui_handle_room_affiliation_list)(const char * const room, const char * const affiliation, GSList *jids);
 void (*ui_handle_room_affiliation_set_error)(const char * const room, const char * const jid,
     const char * const affiliation, const char * const error);
-void (*ui_handle_room_affiliation_set)(const char * const room, const char * const jid, const char * const affiliation);
 void (*ui_handle_room_role_set_error)(const char * const room, const char * const nick, const char * const role,
     const char * const error);
-void (*ui_handle_room_role_set)(const char * const room, const char * const nick, const char * const role);
 void (*ui_handle_room_role_list_error)(const char * const room, const char * const role, const char * const error);
 void (*ui_handle_room_role_list)(const char * const room, const char * const role, GSList *nicks);
 void (*ui_handle_room_kick_error)(const char * const room, const char * const nick, const char * const error);
diff --git a/src/xmpp/iq.c b/src/xmpp/iq.c
index b9a646af..b8530b7c 100644
--- a/src/xmpp/iq.c
+++ b/src/xmpp/iq.c
@@ -892,8 +892,6 @@ static int _room_affiliation_set_result_handler(xmpp_conn_t * const conn, xmpp_s
         char *error_message = stanza_get_error_message(stanza);
         handle_room_affiliation_set_error(from, affiliation_set->item, affiliation_set->privilege, error_message);
         free(error_message);
-    } else {
-        handle_room_affiliation_set(from, affiliation_set->item, affiliation_set->privilege);
     }
 
     free(affiliation_set->item);
@@ -922,8 +920,6 @@ static int _room_role_set_result_handler(xmpp_conn_t * const conn, xmpp_stanza_t
         char *error_message = stanza_get_error_message(stanza);
         handle_room_role_set_error(from, role_set->item, role_set->privilege, error_message);
         free(error_message);
-    } else {
-        handle_room_role_set(from, role_set->item, role_set->privilege);
     }
 
     free(role_set->item);