Removed --disable-tls command line option

This commit is contained in:
James Booth
2015-10-18 00:17:45 +01:00
parent 31ecd41c8f
commit 9d2745e462
7 changed files with 11 additions and 22 deletions

View File

@@ -73,7 +73,7 @@
#include "config/tlscerts.h"
static void _check_autoaway(void);
static void _init(const int disable_tls, char *log_level);
static void _init(char *log_level);
static void _shutdown(void);
static void _create_directories(void);
static void _connect_default(const char * const account);
@@ -92,9 +92,9 @@ char *saved_status;
static gboolean cont = TRUE;
void
prof_run(const int disable_tls, char *log_level, char *account_name)
prof_run(char *log_level, char *account_name)
{
_init(disable_tls, log_level);
_init(log_level);
_connect_default(account_name);
ui_update();
@@ -297,7 +297,7 @@ _check_autoaway()
}
static void
_init(const int disable_tls, char *log_level)
_init(char *log_level)
{
setlocale(LC_ALL, "");
// ignore SIGPIPE
@@ -326,7 +326,7 @@ _init(const int disable_tls, char *log_level)
theme_init(theme);
prefs_free_string(theme);
ui_init();
jabber_init(disable_tls);
jabber_init();
cmd_init();
log_info("Initialising contact list");
roster_init();