From aebca570a48a8c20c6f879dd916a870cb7697291 Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Sat, 10 Nov 2012 18:28:45 +0000
Subject: Renamed params in jabber_join

---
 src/command.c | 14 +++++++-------
 src/jabber.c  |  6 +++---
 src/jabber.h  |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/command.c b/src/command.c
index b91a1180..7621cd9a 100644
--- a/src/command.c
+++ b/src/command.c
@@ -997,7 +997,7 @@ _cmd_msg(const char * const inp, struct cmd_help_t help)
 static gboolean
 _cmd_join(const char * const inp, struct cmd_help_t help)
 {
-    char *room_jid = NULL;
+    char *room = NULL;
     char *nick = NULL;
 
     jabber_conn_status_t conn_status = jabber_get_connection_status();
@@ -1011,12 +1011,12 @@ _cmd_join(const char * const inp, struct cmd_help_t help)
 
         // get room jid
         strtok(inp_cpy, " ");
-        room_jid = strtok(NULL, " ");
-        if (room_jid == NULL) {
+        room = strtok(NULL, " ");
+        if (room == NULL) {
             cons_show("Usage: %s", help.usage);
         } else {
-            if ((strlen(inp) > (6 + strlen(room_jid) + 1))) {
-                nick = strndup(inp+6+strlen(room_jid)+1, strlen(inp)-(6+strlen(room_jid)+1));
+            if ((strlen(inp) > (6 + strlen(room) + 1))) {
+                nick = strndup(inp+6+strlen(room)+1, strlen(inp)-(6+strlen(room)+1));
             }
 
             // if no nick, set to first part of jid
@@ -1026,8 +1026,8 @@ _cmd_join(const char * const inp, struct cmd_help_t help)
                 strcpy(jid_cpy, jid);
                 nick = strdup(strtok(jid_cpy, "@"));
             }
-            jabber_join(room_jid, nick);
-            win_join_chat(room_jid, nick);
+            jabber_join(room, nick);
+            win_join_chat(room, nick);
         }
     }
 
diff --git a/src/jabber.c b/src/jabber.c
index f390a8ba..d93feb94 100644
--- a/src/jabber.c
+++ b/src/jabber.c
@@ -232,14 +232,14 @@ jabber_subscribe(const char * const recipient)
 }
 
 void
-jabber_join(const char * const room_jid, const char * const nick)
+jabber_join(const char * const room, const char * const nick)
 {
     xmpp_stanza_t *presence = stanza_create_room_join_presence(jabber_conn.ctx,
-        room_jid, nick);
+        room, nick);
     xmpp_send(jabber_conn.conn, presence);
     xmpp_stanza_release(presence);
 
-    room_join(room_jid, nick);
+    room_join(room, nick);
 }
 
 void
diff --git a/src/jabber.h b/src/jabber.h
index 7abb4631..e15c6fff 100644
--- a/src/jabber.h
+++ b/src/jabber.h
@@ -46,7 +46,7 @@ jabber_conn_status_t jabber_connect(const char * const user,
 void jabber_disconnect(void);
 void jabber_process_events(void);
 void jabber_subscribe(const char * const recipient);
-void jabber_join(const char * const room_jid, const char * const nick);
+void jabber_join(const char * const room, const char * const nick);
 void jabber_leave_chat_room(const char * const room_jid);
 void jabber_send(const char * const msg, const char * const recipient);
 void jabber_send_groupchat(const char * const msg, const char * const recipient);
-- 
cgit 1.4.1-2-gfad0