From 619496f5dde61cccec8e5234ebe5ce34788e934c Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Sun, 27 May 2012 19:20:17 +0100
Subject: [PATCH] Renamed jabber_status_t -> jabber_conn_status_t

---
 command.c | 8 ++++----
 jabber.c  | 7 ++++---
 jabber.h  | 7 ++++---
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/command.c b/command.c
index 2d5ebf3b..1cde6293 100644
--- a/command.c
+++ b/command.c
@@ -110,7 +110,7 @@ static gboolean _handle_command(const char * const command, const char * const i
 static gboolean _cmd_connect(const char * const inp)
 {
     gboolean result = FALSE;
-    jabber_status_t conn_status = jabber_connection_status();
+    jabber_conn_status_t conn_status = jabber_connection_status();
 
     if ((conn_status != JABBER_DISCONNECTED) && (conn_status != JABBER_STARTED)) {
         cons_show("You are either connected already, or a login is in process.");
@@ -154,7 +154,7 @@ static gboolean _cmd_help(void)
 
 static gboolean _cmd_ros(void)
 {
-    jabber_status_t conn_status = jabber_connection_status();
+    jabber_conn_status_t conn_status = jabber_connection_status();
 
     if (conn_status != JABBER_CONNECTED)
         cons_show("You are not currently connected.");
@@ -166,7 +166,7 @@ static gboolean _cmd_ros(void)
 
 static gboolean _cmd_who(void)
 {
-    jabber_status_t conn_status = jabber_connection_status();
+    jabber_conn_status_t conn_status = jabber_connection_status();
 
     if (conn_status != JABBER_CONNECTED) {
         cons_show("You are not currently connected.");
@@ -183,7 +183,7 @@ static gboolean _cmd_msg(const char * const inp)
     char *usr = NULL;
     char *msg = NULL;
 
-    jabber_status_t conn_status = jabber_connection_status();
+    jabber_conn_status_t conn_status = jabber_connection_status();
 
     if (conn_status != JABBER_CONNECTED) {
         cons_show("You are not currently connected.");
diff --git a/jabber.c b/jabber.c
index 88b69323..e657bc29 100644
--- a/jabber.c
+++ b/jabber.c
@@ -39,7 +39,7 @@ static struct _jabber_conn_t {
     xmpp_log_t *log;
     xmpp_ctx_t *ctx;
     xmpp_conn_t *conn;
-    jabber_status_t conn_status;
+    jabber_conn_status_t conn_status;
     int tls_disabled;
 } jabber_conn;
 
@@ -81,12 +81,13 @@ void jabber_init(const int disable_tls)
     jabber_conn.tls_disabled = disable_tls;
 }
 
-jabber_status_t jabber_connection_status(void)
+jabber_conn_status_t jabber_connection_status(void)
 {
     return (jabber_conn.conn_status);
 }
 
-jabber_status_t jabber_connect(const char * const user, const char * const passwd)
+jabber_conn_status_t jabber_connect(const char * const user, 
+    const char * const passwd)
 {
     xmpp_initialize();
 
diff --git a/jabber.h b/jabber.h
index dd331f8b..5de93a84 100644
--- a/jabber.h
+++ b/jabber.h
@@ -28,11 +28,12 @@ typedef enum {
     JABBER_CONNECTING,
     JABBER_CONNECTED,
     JABBER_DISCONNECTED
-} jabber_status_t;
+} jabber_conn_status_t;
 
 void jabber_init(const int disable_tls);
-jabber_status_t jabber_connection_status(void);
-jabber_status_t jabber_connect(const char * const user, const char * const passwd);
+jabber_conn_status_t jabber_connection_status(void);
+jabber_conn_status_t jabber_connect(const char * const user, 
+    const char * const passwd);
 void jabber_disconnect(void);
 void jabber_roster_request(void);
 void jabber_process_events(void);