Merge branch 'master' into openpgp

5 files changed, 13 insertions, 18 deletions

diff --git a/src/command/commands.c b/src/command/commands.c
index f446ad59..dfc55c15 100644
--- a/src/command/commands.c
+++ b/src/command/commands.c
@@ -514,7 +514,7 @@ cmd_account(gchar **args, struct cmd_help_t help)
 
                             if (presence_type == last_presence) {
                                 char *message = jabber_get_presence_message();
-                                presence_update(last_presence, message, 0);
+                                presence_send(last_presence, message, 0);
                             }
                         }
                         cons_show("Updated %s priority for account %s: %s", property, account_name, value);
@@ -3819,7 +3819,7 @@ cmd_priority(gchar **args, struct cmd_help_t help)
     if (res) {
         accounts_set_priority_all(jabber_get_account_name(), intval);
         resource_presence_t last_presence = accounts_get_last_presence(jabber_get_account_name());
-        presence_update(last_presence, jabber_get_presence_message(), 0);
+        presence_send(last_presence, jabber_get_presence_message(), 0);
         cons_show("Priority set to %d.", intval);
     } else {
         cons_show(err_msg);
@@ -4396,7 +4396,7 @@ _update_presence(const resource_presence_t resource_presence,
     if (conn_status != JABBER_CONNECTED) {
         cons_show("You are not currently connected.");
     } else {
-        presence_update(resource_presence, msg, 0);
+        presence_send(resource_presence, msg, 0);
         ui_update_presence(resource_presence, msg, show);
     }
 }
diff --git a/src/profanity.c b/src/profanity.c
index 215b6db5..03559690 100644
--- a/src/profanity.c
+++ b/src/profanity.c
@@ -175,12 +175,12 @@ _check_autoaway()
 
                 // handle away mode
                 if (strcmp(pref_autoaway_mode, "away") == 0) {
-                    presence_update(RESOURCE_AWAY, pref_autoaway_message, 0);
+                    presence_send(RESOURCE_AWAY, pref_autoaway_message, 0);
                     ui_auto_away();
 
                 // handle idle mode
                 } else if (strcmp(pref_autoaway_mode, "idle") == 0) {
-                    presence_update(RESOURCE_ONLINE, pref_autoaway_message, idle_ms / 1000);
+                    presence_send(RESOURCE_ONLINE, pref_autoaway_message, idle_ms / 1000);
                 }
 
                 prefs_free_string(pref_autoaway_message);
@@ -194,10 +194,10 @@ _check_autoaway()
             // handle check
             if (prefs_get_boolean(PREF_AUTOAWAY_CHECK)) {
                 if (strcmp(pref_autoaway_mode, "away") == 0) {
-                    presence_update(RESOURCE_ONLINE, NULL, 0);
+                    presence_send(RESOURCE_ONLINE, NULL, 0);
                     ui_end_auto_away();
                 } else if (strcmp(pref_autoaway_mode, "idle") == 0) {
-                    presence_update(RESOURCE_ONLINE, NULL, 0);
+                    presence_send(RESOURCE_ONLINE, NULL, 0);
                     ui_titlebar_presence(CONTACT_ONLINE);
                 }
             }
diff --git a/src/xmpp/presence.c b/src/xmpp/presence.c
index 0a7b5c45..ba2af538 100644
--- a/src/xmpp/presence.c
+++ b/src/xmpp/presence.c
@@ -196,8 +196,7 @@ presence_reset_sub_request_search(void)
 }
 
 void
-presence_update(const resource_presence_t presence_type, const char * const msg,
-    const int idle)
+presence_send(const resource_presence_t presence_type, const char * const msg, const int idle)
 {
     if (jabber_get_connection_status() != JABBER_CONNECTED) {
         log_warning("Error setting presence, not connected.");
@@ -205,18 +204,14 @@ presence_update(const resource_presence_t presence_type, const char * const msg,
     }
 
     if (msg) {
-        log_debug("Updating presence: %s, \"%s\"",
-            string_from_resource_presence(presence_type), msg);
+        log_debug("Updating presence: %s, \"%s\"", string_from_resource_presence(presence_type), msg);
     } else {
-        log_debug("Updating presence: %s",
-            string_from_resource_presence(presence_type));
+        log_debug("Updating presence: %s", string_from_resource_presence(presence_type));
     }
 
     xmpp_ctx_t * const ctx = connection_get_ctx();
     xmpp_conn_t * const conn = connection_get_conn();
-    const int pri =
-        accounts_get_priority_for_presence_type(jabber_get_account_name(),
-                                                presence_type);
+    const int pri = accounts_get_priority_for_presence_type(jabber_get_account_name(), presence_type);
     const char *show = stanza_get_presence_string_from_type(presence_type);
 
     connection_set_presence_message(msg);
diff --git a/src/xmpp/roster.c b/src/xmpp/roster.c
index 2f2bc77f..9ee4ec86 100644
--- a/src/xmpp/roster.c
+++ b/src/xmpp/roster.c
@@ -331,7 +331,7 @@ _roster_result_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza, v
     sv_ev_roster_received();
 
     resource_presence_t conn_presence = accounts_get_login_presence(jabber_get_account_name());
-    presence_update(conn_presence, NULL, 0);
+    presence_send(conn_presence, NULL, 0);
 
     return 1;
 }
diff --git a/src/xmpp/xmpp.h b/src/xmpp/xmpp.h
index 1dc0c131..398c9f46 100644
--- a/src/xmpp/xmpp.h
+++ b/src/xmpp/xmpp.h
@@ -168,7 +168,7 @@ char * presence_sub_request_find(const char * const search_str);
 void presence_join_room(char *room, char *nick, char * passwd);
 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(resource_presence_t status, const char * const msg,
+void presence_send(resource_presence_t status, const char * const msg,
     int idle);
 gboolean presence_sub_request_exists(const char * const bare_jid);