From a948d741d987b7c94487ec379484c7557c1ea98e Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Wed, 10 Aug 2016 20:45:14 +0100
Subject: Rename plugin jid arguments

---
 src/plugins/plugins.c | 56 +++++++++++++++++++++++++--------------------------
 src/plugins/plugins.h | 30 +++++++++++++--------------
 2 files changed, 43 insertions(+), 43 deletions(-)

(limited to 'src/plugins')

diff --git a/src/plugins/plugins.c b/src/plugins/plugins.c
index cdade652..0505be6d 100644
--- a/src/plugins/plugins.c
+++ b/src/plugins/plugins.c
@@ -359,7 +359,7 @@ plugins_on_disconnect(const char * const account_name, const char * const fullji
 }
 
 char*
-plugins_pre_chat_message_display(const char * const jid, const char *message)
+plugins_pre_chat_message_display(const char * const barejid, const char *message)
 {
     char *new_message = NULL;
     char *curr_message = strdup(message);
@@ -368,7 +368,7 @@ plugins_pre_chat_message_display(const char * const jid, const char *message)
     GList *curr = values;
     while (curr) {
         ProfPlugin *plugin = curr->data;
-        new_message = plugin->pre_chat_message_display(plugin, jid, curr_message);
+        new_message = plugin->pre_chat_message_display(plugin, barejid, curr_message);
         if (new_message) {
             free(curr_message);
             curr_message = strdup(new_message);
@@ -382,20 +382,20 @@ plugins_pre_chat_message_display(const char * const jid, const char *message)
 }
 
 void
-plugins_post_chat_message_display(const char * const jid, const char *message)
+plugins_post_chat_message_display(const char * const barejid, const char *message)
 {
     GList *values = g_hash_table_get_values(plugins);
     GList *curr = values;
     while (curr) {
         ProfPlugin *plugin = curr->data;
-        plugin->post_chat_message_display(plugin, jid, message);
+        plugin->post_chat_message_display(plugin, barejid, message);
         curr = g_list_next(curr);
     }
     g_list_free(values);
 }
 
 char*
-plugins_pre_chat_message_send(const char * const jid, const char *message)
+plugins_pre_chat_message_send(const char * const barejid, const char *message)
 {
     char *new_message = NULL;
     char *curr_message = strdup(message);
@@ -404,7 +404,7 @@ plugins_pre_chat_message_send(const char * const jid, const char *message)
     GList *curr = values;
     while (curr) {
         ProfPlugin *plugin = curr->data;
-        new_message = plugin->pre_chat_message_send(plugin, jid, curr_message);
+        new_message = plugin->pre_chat_message_send(plugin, barejid, curr_message);
         if (new_message) {
             free(curr_message);
             curr_message = strdup(new_message);
@@ -418,20 +418,20 @@ plugins_pre_chat_message_send(const char * const jid, const char *message)
 }
 
 void
-plugins_post_chat_message_send(const char * const jid, const char *message)
+plugins_post_chat_message_send(const char * const barejid, const char *message)
 {
     GList *values = g_hash_table_get_values(plugins);
     GList *curr = values;
     while (curr) {
         ProfPlugin *plugin = curr->data;
-        plugin->post_chat_message_send(plugin, jid, message);
+        plugin->post_chat_message_send(plugin, barejid, message);
         curr = g_list_next(curr);
     }
     g_list_free(values);
 }
 
 char*
-plugins_pre_room_message_display(const char * const room, const char * const nick, const char *message)
+plugins_pre_room_message_display(const char * const barejid, const char * const nick, const char *message)
 {
     char *new_message = NULL;
     char *curr_message = strdup(message);
@@ -440,7 +440,7 @@ plugins_pre_room_message_display(const char * const room, const char * const nic
     GList *curr = values;
     while (curr) {
         ProfPlugin *plugin = curr->data;
-        new_message = plugin->pre_room_message_display(plugin, room, nick, curr_message);
+        new_message = plugin->pre_room_message_display(plugin, barejid, nick, curr_message);
         if (new_message) {
             free(curr_message);
             curr_message = strdup(new_message);
@@ -454,20 +454,20 @@ plugins_pre_room_message_display(const char * const room, const char * const nic
 }
 
 void
-plugins_post_room_message_display(const char * const room, const char * const nick, const char *message)
+plugins_post_room_message_display(const char * const barejid, const char * const nick, const char *message)
 {
     GList *values = g_hash_table_get_values(plugins);
     GList *curr = values;
     while (curr) {
         ProfPlugin *plugin = curr->data;
-        plugin->post_room_message_display(plugin, room, nick, message);
+        plugin->post_room_message_display(plugin, barejid, nick, message);
         curr = g_list_next(curr);
     }
     g_list_free(values);
 }
 
 char*
-plugins_pre_room_message_send(const char * const room, const char *message)
+plugins_pre_room_message_send(const char * const barejid, const char *message)
 {
     char *new_message = NULL;
     char *curr_message = strdup(message);
@@ -476,7 +476,7 @@ plugins_pre_room_message_send(const char * const room, const char *message)
     GList *curr = values;
     while (curr) {
         ProfPlugin *plugin = curr->data;
-        new_message = plugin->pre_room_message_send(plugin, room, curr_message);
+        new_message = plugin->pre_room_message_send(plugin, barejid, curr_message);
         if (new_message) {
             free(curr_message);
             curr_message = strdup(new_message);
@@ -490,20 +490,20 @@ plugins_pre_room_message_send(const char * const room, const char *message)
 }
 
 void
-plugins_post_room_message_send(const char * const room, const char *message)
+plugins_post_room_message_send(const char * const barejid, const char *message)
 {
     GList *values = g_hash_table_get_values(plugins);
     GList *curr = values;
     while (curr) {
         ProfPlugin *plugin = curr->data;
-        plugin->post_room_message_send(plugin, room, message);
+        plugin->post_room_message_send(plugin, barejid, message);
         curr = g_list_next(curr);
     }
     g_list_free(values);
 }
 
 void
-plugins_on_room_history_message(const char *const room, const char *const nick, const char *const message,
+plugins_on_room_history_message(const char *const barejid, const char *const nick, const char *const message,
     GDateTime *timestamp)
 {
     char *timestamp_str = NULL;
@@ -517,7 +517,7 @@ plugins_on_room_history_message(const char *const room, const char *const nick,
     GList *curr = values;
     while (curr) {
         ProfPlugin *plugin = curr->data;
-        plugin->on_room_history_message(plugin, room, nick, message, timestamp_str);
+        plugin->on_room_history_message(plugin, barejid, nick, message, timestamp_str);
         curr = g_list_next(curr);
     }
     g_list_free(values);
@@ -526,9 +526,9 @@ plugins_on_room_history_message(const char *const room, const char *const nick,
 }
 
 char*
-plugins_pre_priv_message_display(const char * const jid, const char *message)
+plugins_pre_priv_message_display(const char * const fulljid, const char *message)
 {
-    Jid *jidp = jid_create(jid);
+    Jid *jidp = jid_create(fulljid);
     char *new_message = NULL;
     char *curr_message = strdup(message);
 
@@ -551,9 +551,9 @@ plugins_pre_priv_message_display(const char * const jid, const char *message)
 }
 
 void
-plugins_post_priv_message_display(const char * const jid, const char *message)
+plugins_post_priv_message_display(const char * const fulljid, const char *message)
 {
-    Jid *jidp = jid_create(jid);
+    Jid *jidp = jid_create(fulljid);
 
     GList *values = g_hash_table_get_values(plugins);
     GList *curr = values;
@@ -568,9 +568,9 @@ plugins_post_priv_message_display(const char * const jid, const char *message)
 }
 
 char*
-plugins_pre_priv_message_send(const char * const jid, const char * const message)
+plugins_pre_priv_message_send(const char * const fulljid, const char * const message)
 {
-    Jid *jidp = jid_create(jid);
+    Jid *jidp = jid_create(fulljid);
     char *new_message = NULL;
     char *curr_message = strdup(message);
 
@@ -593,9 +593,9 @@ plugins_pre_priv_message_send(const char * const jid, const char * const message
 }
 
 void
-plugins_post_priv_message_send(const char * const jid, const char * const message)
+plugins_post_priv_message_send(const char * const fulljid, const char * const message)
 {
-    Jid *jidp = jid_create(jid);
+    Jid *jidp = jid_create(fulljid);
 
     GList *values = g_hash_table_get_values(plugins);
     GList *curr = values;
@@ -778,13 +778,13 @@ plugins_on_chat_win_focus(const char *const barejid)
 }
 
 void
-plugins_on_room_win_focus(const char *const roomjid)
+plugins_on_room_win_focus(const char *const barejid)
 {
     GList *values = g_hash_table_get_values(plugins);
     GList *curr = values;
     while (curr) {
         ProfPlugin *plugin = curr->data;
-        plugin->on_room_win_focus(plugin, roomjid);
+        plugin->on_room_win_focus(plugin, barejid);
         curr = g_list_next(curr);
     }
     g_list_free(values);
diff --git a/src/plugins/plugins.h b/src/plugins/plugins.h
index 4a324a5f..f3ed4082 100644
--- a/src/plugins/plugins.h
+++ b/src/plugins/plugins.h
@@ -117,22 +117,22 @@ void plugins_on_shutdown(void);
 void plugins_on_connect(const char *const account_name, const char *const fulljid);
 void plugins_on_disconnect(const char *const account_name, const char *const fulljid);
 
-char* plugins_pre_chat_message_display(const char *const jid, const char *message);
-void plugins_post_chat_message_display(const char *const jid, const char *message);
-char* plugins_pre_chat_message_send(const char *const jid, const char *message);
-void plugins_post_chat_message_send(const char *const jid, const char *message);
-
-char* plugins_pre_room_message_display(const char *const room, const char *const nick, const char *message);
-void plugins_post_room_message_display(const char *const room, const char *const nick, const char *message);
-char* plugins_pre_room_message_send(const char *const room, const char *message);
-void plugins_post_room_message_send(const char *const room, const char *message);
-void plugins_on_room_history_message(const char *const room, const char *const nick, const char *const message,
+char* plugins_pre_chat_message_display(const char *const barejid, const char *message);
+void plugins_post_chat_message_display(const char *const barejid, const char *message);
+char* plugins_pre_chat_message_send(const char *const barejid, const char *message);
+void plugins_post_chat_message_send(const char *const barejid, const char *message);
+
+char* plugins_pre_room_message_display(const char *const barejid, const char *const nick, const char *message);
+void plugins_post_room_message_display(const char *const barejid, const char *const nick, const char *message);
+char* plugins_pre_room_message_send(const char *const barejid, const char *message);
+void plugins_post_room_message_send(const char *const barejid, const char *message);
+void plugins_on_room_history_message(const char *const barejid, const char *const nick, const char *const message,
     GDateTime *timestamp);
 
-char* plugins_pre_priv_message_display(const char *const jid, const char *message);
-void plugins_post_priv_message_display(const char *const jid, const char *message);
-char* plugins_pre_priv_message_send(const char *const jid, const char *const message);
-void plugins_post_priv_message_send(const char *const jid, const char *const message);
+char* plugins_pre_priv_message_display(const char *const fulljid, const char *message);
+void plugins_post_priv_message_display(const char *const fulljid, const char *message);
+char* plugins_pre_priv_message_send(const char *const fulljid, const char *const message);
+void plugins_post_priv_message_send(const char *const fulljid, const char *const message);
 
 void plugins_win_process_line(char *win, const char *const line);
 void plugins_close_win(const char *const plugin_name, const char *const tag);
@@ -151,7 +151,7 @@ void plugins_on_contact_presence(const char *const barejid, const char *const re
     const char *const status, const int priority);
 
 void plugins_on_chat_win_focus(const char *const barejid);
-void plugins_on_room_win_focus(const char *const roomjid);
+void plugins_on_room_win_focus(const char *const barejid);
 
 gboolean plugins_run_command(const char * const cmd);
 void plugins_run_timed(void);
-- 
cgit 1.4.1-2-gfad0