about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorJasper van Bourgognie <jvb@softkinetic.com>2013-12-27 20:50:43 +0100
committerJasper van Bourgognie <jvb@softkinetic.com>2013-12-27 20:50:43 +0100
commit7127a934c79a6851bc8c384a41893f98afd6b479 (patch)
treec30df525ae66b24001aaab19e53061937078d218
parentc3fbaf8b2a75fc28df933e5f48fda2e8468b7e80 (diff)
downloadprofani-tty-7127a934c79a6851bc8c384a41893f98afd6b479.tar.gz
Fixed types of presence variables to resource_presence_type (avoid useless and implicit casts)
-rw-r--r--src/xmpp/presence.c4
-rw-r--r--src/xmpp/roster.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/xmpp/presence.c b/src/xmpp/presence.c
index 5698b520..3ca2f63e 100644
--- a/src/xmpp/presence.c
+++ b/src/xmpp/presence.c
@@ -261,7 +261,7 @@ _presence_join_room(Jid *jid)
     log_debug("Sending room join presence to: %s", jid->fulljid);
     xmpp_ctx_t *ctx = connection_get_ctx();
     xmpp_conn_t *conn = connection_get_conn();
-    contact_presence_t presence_type =
+    resource_presence_t presence_type =
         accounts_get_last_presence(jabber_get_account_name());
     const char *show = stanza_get_presence_string_from_type(presence_type);
     char *status = jabber_get_presence_message();
@@ -289,7 +289,7 @@ _presence_change_room_nick(const char * const room, const char * const nick)
     log_debug("Sending room nickname change to: %s, nick: %s", room, nick);
     xmpp_ctx_t *ctx = connection_get_ctx();
     xmpp_conn_t *conn = connection_get_conn();
-    contact_presence_t presence_type =
+    resource_presence_t presence_type =
         accounts_get_last_presence(jabber_get_account_name());
     const char *show = stanza_get_presence_string_from_type(presence_type);
     char *status = jabber_get_presence_message();
diff --git a/src/xmpp/roster.c b/src/xmpp/roster.c
index 7d4b0efe..e84de155 100644
--- a/src/xmpp/roster.c
+++ b/src/xmpp/roster.c
@@ -297,7 +297,7 @@ _roster_handle_result(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
             item = xmpp_stanza_get_next(item);
         }
 
-        contact_presence_t conn_presence =
+        resource_presence_t conn_presence =
             accounts_get_login_presence(jabber_get_account_name());
         presence_update(conn_presence, NULL, 0);
     }