Remove redundant tls secured function

5 files changed, 4 insertions, 12 deletions

diff --git a/src/xmpp/connection.c b/src/xmpp/connection.c
index 98d241f6..26968797 100644
--- a/src/xmpp/connection.c
+++ b/src/xmpp/connection.c
@@ -281,12 +281,6 @@ connection_set_domain(char *domain)
     conn.domain = strdup(domain);
 }
 
-int
-connection_is_secured(void)
-{
-    return xmpp_conn_is_secured(conn.conn);
-}
-
 #ifdef HAVE_LIBMESODE
 TLSCertificate*
 connection_get_tls_peer_cert(void)
@@ -312,7 +306,7 @@ connection_get_tls_peer_cert(void)
 #endif
 
 gboolean
-connection_conn_is_secured(void)
+connection_is_secured(void)
 {
     if (conn.conn_status == JABBER_CONNECTED) {
         return xmpp_conn_is_secured(conn.conn) == 0 ? FALSE : TRUE;
diff --git a/src/xmpp/connection.h b/src/xmpp/connection.h
index 50ef82f8..9a731c2c 100644
--- a/src/xmpp/connection.h
+++ b/src/xmpp/connection.h
@@ -49,8 +49,6 @@ void connection_set_presence_msg(const char *const message);
 void connection_set_priority(const int priority);
 void connection_set_domain(char *domain);
 
-int connection_is_secured(void);
-
 void connection_free_conn(void);
 void connection_free_ctx(void);
 void connection_free_presence_msg(void);
diff --git a/src/xmpp/session.c b/src/xmpp/session.c
index 3381baab..c513b233 100644
--- a/src/xmpp/session.c
+++ b/src/xmpp/session.c
@@ -327,7 +327,7 @@ session_remove_available_resource(const char *const resource)
 }
 
 void
-session_login_success(int secured)
+session_login_success(gboolean secured)
 {
     // logged in with account
     if (saved_account.name) {
diff --git a/src/xmpp/session.h b/src/xmpp/session.h
index cc1d4829..d9ec7b8d 100644
--- a/src/xmpp/session.h
+++ b/src/xmpp/session.h
@@ -46,7 +46,7 @@
 
 #include "resource.h"
 
-void session_login_success(int secured);
+void session_login_success(gboolean secured);
 void session_login_failed(void);
 void session_lost_connection(void);
 GSList* session_get_disco_items(void);
diff --git a/src/xmpp/xmpp.h b/src/xmpp/xmpp.h
index dbea4e40..ff75ab58 100644
--- a/src/xmpp/xmpp.h
+++ b/src/xmpp/xmpp.h
@@ -130,7 +130,7 @@ void connection_free_uuid(char *uuid);
 #ifdef HAVE_LIBMESODE
 TLSCertificate* connection_get_tls_peer_cert(void);
 #endif
-gboolean connection_conn_is_secured(void);
+gboolean connection_is_secured(void);
 gboolean connection_send_stanza(const char *const stanza);
 
 char* message_send_chat(const char *const barejid, const char *const msg, const char *const oob_url);