From 591f8a8dbf10b7bd64825cfea63a7ac21b6c89e2 Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Sun, 10 Feb 2013 11:31:31 +0000
Subject: [PATCH] Renamed jabber_presence_t->presence_t

---
 src/command/command.c | 10 +++++-----
 src/common.h          |  2 +-
 src/config/accounts.c |  6 +++---
 src/config/accounts.h |  6 +++---
 src/profanity.c       |  2 +-
 src/ui/titlebar.c     |  4 ++--
 src/ui/ui.h           |  2 +-
 src/ui/windows.c      |  2 +-
 src/xmpp/connection.c |  6 +++---
 src/xmpp/connection.h |  2 +-
 src/xmpp/iq.c         |  2 +-
 src/xmpp/presence.c   |  6 +++---
 src/xmpp/stanza.c     |  2 +-
 src/xmpp/stanza.h     |  2 +-
 src/xmpp/xmpp.h       |  4 ++--
 15 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/command/command.c b/src/command/command.c
index 71f91e46..d1bc4ae4 100644
--- a/src/command/command.c
+++ b/src/command/command.c
@@ -68,7 +68,7 @@ struct cmd_t {
 };
 
 static struct cmd_t * _cmd_get_command(const char * const command);
-static void _update_presence(const jabber_presence_t presence,
+static void _update_presence(const presence_t presence,
     const char * const show, gchar **args);
 static gboolean _cmd_set_boolean_preference(gchar *arg, struct cmd_help_t help,
     const char * const display, preference_t pref);
@@ -85,7 +85,7 @@ static void _parameter_autocomplete_with_ac(char *input, int *size, char *comman
     Autocomplete ac);
 
 static int _strtoi(char *str, int *saveptr, int min, int max);
-static jabber_presence_t _presence_type_from_string(const char * const str);
+static presence_t _presence_type_from_string(const char * const str);
 
 // command prototypes
 static gboolean _cmd_quit(gchar **args, struct cmd_help_t help);
@@ -1175,7 +1175,7 @@ _cmd_account(gchar **args, struct cmd_help_t help)
                         int intval;
 
                         if (_strtoi(value, &intval, -128, 127) == 0) {
-                            jabber_presence_t presence_type = _presence_type_from_string(property);
+                            presence_t presence_type = _presence_type_from_string(property);
                             switch (presence_type)
                             {
                                 case (PRESENCE_ONLINE):
@@ -2348,7 +2348,7 @@ _cmd_xa(gchar **args, struct cmd_help_t help)
 // helper function for status change commands
 
 static void
-_update_presence(const jabber_presence_t presence,
+_update_presence(const presence_t presence,
     const char * const show, gchar **args)
 {
     char *msg = NULL;
@@ -2648,7 +2648,7 @@ _strtoi(char *str, int *saveptr, int min, int max)
     return 0;
 }
 
-static jabber_presence_t
+static presence_t
 _presence_type_from_string(const char * const str)
 {
     if (str == NULL) {
diff --git a/src/common.h b/src/common.h
index a996dc29..e2132186 100644
--- a/src/common.h
+++ b/src/common.h
@@ -62,7 +62,7 @@ typedef enum {
     PRESENCE_DND,
     PRESENCE_CHAT,
     PRESENCE_XA
-} jabber_presence_t;
+} presence_t;
 
 gchar* p_utf8_substring(const gchar *str, glong start_pos, glong end_pos);
 void p_slist_free_full(GSList *items, GDestroyNotify free_func);
diff --git a/src/config/accounts.c b/src/config/accounts.c
index e21fe1ad..6f3b07a0 100644
--- a/src/config/accounts.c
+++ b/src/config/accounts.c
@@ -403,7 +403,7 @@ accounts_set_priority_all(const char * const account_name, const gint value)
 
 gint
 accounts_get_priority_for_presence_type(const char * const account_name,
-    jabber_presence_t presence_type)
+    presence_t presence_type)
 {
     gint result;
 
@@ -453,7 +453,7 @@ accounts_set_login_presence(const char * const account_name, const char * const
     }
 }
 
-jabber_presence_t
+presence_t
 accounts_get_last_presence(const char * const account_name)
 {
     gchar *setting = g_key_file_get_string(accounts, account_name, "presence.last", NULL);
@@ -474,7 +474,7 @@ accounts_get_last_presence(const char * const account_name)
     }
 }
 
-jabber_presence_t
+presence_t
 accounts_get_login_presence(const char * const account_name)
 {
     gchar *setting = g_key_file_get_string(accounts, account_name, "presence.login", NULL);
diff --git a/src/config/accounts.h b/src/config/accounts.h
index a9292a02..f1b70aad 100644
--- a/src/config/accounts.h
+++ b/src/config/accounts.h
@@ -61,8 +61,8 @@ void accounts_set_server(const char * const account_name, const char * const val
 void accounts_set_resource(const char * const account_name, const char * const value);
 void accounts_set_last_presence(const char * const account_name, const char * const value);
 void accounts_set_login_presence(const char * const account_name, const char * const value);
-jabber_presence_t accounts_get_login_presence(const char * const account_name);
-jabber_presence_t accounts_get_last_presence(const char * const account_name);
+presence_t accounts_get_login_presence(const char * const account_name);
+presence_t accounts_get_last_presence(const char * const account_name);
 void accounts_set_priority_online(const char * const account_name, const gint value);
 void accounts_set_priority_chat(const char * const account_name, const gint value);
 void accounts_set_priority_away(const char * const account_name, const gint value);
@@ -70,6 +70,6 @@ void accounts_set_priority_xa(const char * const account_name, const gint value)
 void accounts_set_priority_dnd(const char * const account_name, const gint value);
 void accounts_set_priority_all(const char * const account_name, const gint value);
 gint accounts_get_priority_for_presence_type(const char * const account_name,
-    jabber_presence_t presence_type);
+    presence_t presence_type);
 
 #endif
diff --git a/src/profanity.c b/src/profanity.c
index 912ce3f1..0de647b0 100644
--- a/src/profanity.c
+++ b/src/profanity.c
@@ -189,7 +189,7 @@ void
 prof_handle_login_account_success(char *account_name)
 {
     ProfAccount *account = accounts_get_account(account_name);
-    jabber_presence_t presence = accounts_get_login_presence(account->name);
+    presence_t presence = accounts_get_login_presence(account->name);
     cons_show_login_success(account);
     title_bar_set_status(presence);
     log_info("%s logged in successfully", account->jid);
diff --git a/src/ui/titlebar.c b/src/ui/titlebar.c
index 2276986a..edeb79fd 100644
--- a/src/ui/titlebar.c
+++ b/src/ui/titlebar.c
@@ -32,7 +32,7 @@ static char *current_title = NULL;
 static char *recipient = NULL;
 static GTimer *typing_elapsed;
 static int dirty;
-static jabber_presence_t current_status;
+static presence_t current_status;
 
 static void _title_bar_draw_title(void);
 static void _title_bar_draw_status(void);
@@ -119,7 +119,7 @@ title_bar_show(const char * const title)
 }
 
 void
-title_bar_set_status(jabber_presence_t status)
+title_bar_set_status(presence_t status)
 {
     current_status = status;
     _title_bar_draw_status();
diff --git a/src/ui/ui.h b/src/ui/ui.h
index 95e67269..d317ce41 100644
--- a/src/ui/ui.h
+++ b/src/ui/ui.h
@@ -92,7 +92,7 @@ void title_bar_refresh(void);
 void title_bar_resize(void);
 void title_bar_show(const char * const title);
 void title_bar_title(void);
-void title_bar_set_status(jabber_presence_t status);
+void title_bar_set_status(presence_t status);
 void title_bar_set_recipient(char *from);
 void title_bar_set_typing(gboolean is_typing);
 void title_bar_draw(void);
diff --git a/src/ui/windows.c b/src/ui/windows.c
index 448fab63..a7fc6a24 100644
--- a/src/ui/windows.c
+++ b/src/ui/windows.c
@@ -1094,7 +1094,7 @@ cons_show_login_success(ProfAccount *account)
     _win_show_time(console->win, '-');
     wprintw(console->win, "%s logged in successfully, ", account->jid);
 
-    jabber_presence_t presence = accounts_get_login_presence(account->name);
+    presence_t presence = accounts_get_login_presence(account->name);
     char *presence_str;
     switch(presence)
     {
diff --git a/src/xmpp/connection.c b/src/xmpp/connection.c
index 2687fa70..7eb84076 100644
--- a/src/xmpp/connection.c
+++ b/src/xmpp/connection.c
@@ -47,7 +47,7 @@ static struct _jabber_conn_t {
     xmpp_ctx_t *ctx;
     xmpp_conn_t *conn;
     jabber_conn_status_t conn_status;
-    jabber_presence_t presence_type;
+    presence_t presence_type;
     char *presence_message;
     int priority;
     int tls_disabled;
@@ -228,7 +228,7 @@ jabber_get_jid(void)
     return xmpp_conn_get_jid(jabber_conn.conn);
 }
 
-jabber_presence_t
+presence_t
 jabber_get_presence_type(void)
 {
     return jabber_conn.presence_type;
@@ -247,7 +247,7 @@ jabber_get_account_name(void)
 }
 
 void
-connection_set_presence_type(const jabber_presence_t presence_type)
+connection_set_presence_type(const presence_t presence_type)
 {
     jabber_conn.presence_type = presence_type;
 }
diff --git a/src/xmpp/connection.h b/src/xmpp/connection.h
index 380e5cbc..3d27bf3e 100644
--- a/src/xmpp/connection.h
+++ b/src/xmpp/connection.h
@@ -29,7 +29,7 @@ void connection_free_resources(void);
 xmpp_conn_t *connection_get_conn(void);
 xmpp_ctx_t *connection_get_ctx(void);
 int connection_error_handler(xmpp_stanza_t * const stanza);
-void connection_set_presence_type(jabber_presence_t presence_type);
+void connection_set_presence_type(presence_t presence_type);
 void connection_set_priority(int priority);
 void connection_set_presence_message(const char * const message);
 
diff --git a/src/xmpp/iq.c b/src/xmpp/iq.c
index 6d9e9e6f..b32a6ef2 100644
--- a/src/xmpp/iq.c
+++ b/src/xmpp/iq.c
@@ -153,7 +153,7 @@ _iq_handle_roster_result(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
             item = xmpp_stanza_get_next(item);
         }
 
-        jabber_presence_t connect_presence = accounts_get_login_presence(jabber_get_account_name());
+        presence_t connect_presence = accounts_get_login_presence(jabber_get_account_name());
         presence_update(connect_presence, NULL, 0);
     }
 
diff --git a/src/xmpp/presence.c b/src/xmpp/presence.c
index 5d8861ac..bc2bc056 100644
--- a/src/xmpp/presence.c
+++ b/src/xmpp/presence.c
@@ -106,7 +106,7 @@ presence_free_sub_requests(void)
 }
 
 void
-presence_update(jabber_presence_t presence_type, const char * const msg,
+presence_update(presence_t presence_type, const char * const msg,
     int idle)
 {
     xmpp_ctx_t *ctx = connection_get_ctx();
@@ -161,7 +161,7 @@ presence_join_room(Jid *jid)
 {
     xmpp_ctx_t *ctx = connection_get_ctx();
     xmpp_conn_t *conn = connection_get_conn();
-    jabber_presence_t presence_type = jabber_get_presence_type();
+    presence_t presence_type = jabber_get_presence_type();
     const char *show = stanza_get_presence_string_from_type(presence_type);
     char *status = jabber_get_presence_message();
     int pri = accounts_get_priority_for_presence_type(jabber_get_account_name(),
@@ -184,7 +184,7 @@ presence_change_room_nick(const char * const room, const char * const nick)
 {
     xmpp_ctx_t *ctx = connection_get_ctx();
     xmpp_conn_t *conn = connection_get_conn();
-    jabber_presence_t presence_type = jabber_get_presence_type();
+    presence_t presence_type = jabber_get_presence_type();
     const char *show = stanza_get_presence_string_from_type(presence_type);
     char *status = jabber_get_presence_message();
     int pri = accounts_get_priority_for_presence_type(jabber_get_account_name(),
diff --git a/src/xmpp/stanza.c b/src/xmpp/stanza.c
index f7fe712c..69327552 100644
--- a/src/xmpp/stanza.c
+++ b/src/xmpp/stanza.c
@@ -664,7 +664,7 @@ stanza_attach_caps(xmpp_ctx_t * const ctx, xmpp_stanza_t * const presence)
 }
 
 const char *
-stanza_get_presence_string_from_type(jabber_presence_t presence_type)
+stanza_get_presence_string_from_type(presence_t presence_type)
 {
     switch(presence_type)
     {
diff --git a/src/xmpp/stanza.h b/src/xmpp/stanza.h
index 1ae08ac7..6c396de7 100644
--- a/src/xmpp/stanza.h
+++ b/src/xmpp/stanza.h
@@ -160,6 +160,6 @@ void stanza_attach_show(xmpp_ctx_t * const ctx, xmpp_stanza_t * const presence,
 void stanza_attach_status(xmpp_ctx_t * const ctx, xmpp_stanza_t * const presence,
     const char * const status);
 
-const char * stanza_get_presence_string_from_type(jabber_presence_t presence_type);
+const char * stanza_get_presence_string_from_type(presence_t presence_type);
 
 #endif
diff --git a/src/xmpp/xmpp.h b/src/xmpp/xmpp.h
index 41367e75..5bb3bc4a 100644
--- a/src/xmpp/xmpp.h
+++ b/src/xmpp/xmpp.h
@@ -66,7 +66,7 @@ void jabber_disconnect(void);
 void jabber_process_events(void);
 const char * jabber_get_jid(void);
 jabber_conn_status_t jabber_get_connection_status(void);
-jabber_presence_t jabber_get_presence_type(void);
+presence_t jabber_get_presence_type(void);
 char * jabber_get_presence_message(void);
 void jabber_set_autoping(int seconds);
 char* jabber_get_account_name(void);
@@ -85,7 +85,7 @@ GList* presence_get_subscription_requests(void);
 void presence_join_room(Jid *jid);
 void presence_change_room_nick(const char * const room, const char * const nick);
 void presence_leave_chat_room(const char * const room_jid);
-void presence_update(jabber_presence_t status, const char * const msg,
+void presence_update(presence_t status, const char * const msg,
     int idle);
 
 // caps functions