From a4cadf78faabc157e5db00e42302d495bba432c0 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Tue, 7 Jul 2020 13:53:30 +0200 Subject: Revert "Apply coding style" This reverts commit 9b55f2dec0ea27a9ce4856e303425e12f866cea2. Sorting the includes creates some problems. --- src/xmpp/session.c | 90 +++++++++++++++++++++++++++--------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) (limited to 'src/xmpp/session.c') diff --git a/src/xmpp/session.c b/src/xmpp/session.c index 1e2a3b11..21517305 100644 --- a/src/xmpp/session.c +++ b/src/xmpp/session.c @@ -36,30 +36,30 @@ #include "config.h" #include -#include #include +#include +#include "profanity.h" +#include "log.h" #include "common.h" #include "config/preferences.h" -#include "event/client_events.h" -#include "event/server_events.h" -#include "log.h" #include "plugins/plugins.h" -#include "profanity.h" -#include "xmpp/blocking.h" +#include "event/server_events.h" +#include "event/client_events.h" #include "xmpp/bookmark.h" -#include "xmpp/capabilities.h" -#include "xmpp/chat_session.h" +#include "xmpp/blocking.h" #include "xmpp/connection.h" +#include "xmpp/capabilities.h" +#include "xmpp/session.h" #include "xmpp/iq.h" -#include "xmpp/jid.h" #include "xmpp/message.h" -#include "xmpp/muc.h" #include "xmpp/presence.h" #include "xmpp/roster.h" -#include "xmpp/session.h" #include "xmpp/stanza.h" #include "xmpp/xmpp.h" +#include "xmpp/muc.h" +#include "xmpp/chat_session.h" +#include "xmpp/jid.h" #ifdef HAVE_OMEMO #include "omemo/omemo.h" @@ -67,21 +67,19 @@ #endif // for auto reconnect -static struct -{ - char* name; - char* passwd; +static struct { + char *name; + char *passwd; } saved_account; -static struct -{ - char* name; - char* jid; - char* passwd; - char* altdomain; +static struct { + char *name; + char *jid; + char *passwd; + char *altdomain; int port; - char* tls_policy; - char* auth_policy; + char *tls_policy; + char *auth_policy; } saved_details; typedef enum { @@ -91,10 +89,10 @@ typedef enum { ACTIVITY_ST_XA, } activity_state_t; -static GTimer* reconnect_timer; +static GTimer *reconnect_timer; static activity_state_t activity_state; static resource_presence_t saved_presence; -static char* saved_status; +static char *saved_status; static void _session_reconnect(void); @@ -111,7 +109,7 @@ session_init(void) } jabber_conn_status_t -session_connect_with_account(const ProfAccount* const account) +session_connect_with_account(const ProfAccount *const account) { assert(account != NULL); @@ -124,9 +122,9 @@ session_connect_with_account(const ProfAccount* const account) saved_account.name = strdup(account->name); saved_account.passwd = strdup(account->password); - char* jid = NULL; + char *jid = NULL; if (account->resource) { - Jid* jidp = jid_create_from_bare_and_resource(account->jid, account->resource); + Jid *jidp = jid_create_from_bare_and_resource(account->jid, account->resource); jid = strdup(jidp->fulljid); jid_destroy(jidp); } else { @@ -146,8 +144,8 @@ session_connect_with_account(const ProfAccount* const account) } jabber_conn_status_t -session_connect_with_details(const char* const jid, const char* const passwd, const char* const altdomain, - const int port, const char* const tls_policy, const char* const auth_policy) +session_connect_with_details(const char *const jid, const char *const passwd, const char *const altdomain, + const int port, const char *const tls_policy, const char *const auth_policy) { assert(jid != NULL); assert(passwd != NULL); @@ -180,10 +178,10 @@ session_connect_with_details(const char* const jid, const char* const passwd, co } // use 'profanity' when no resourcepart in provided jid - Jid* jidp = jid_create(jid); + Jid *jidp = jid_create(jid); if (jidp->resourcepart == NULL) { jid_destroy(jidp); - char* resource = jid_random_resource(); + char *resource = jid_random_resource(); jidp = jid_create_from_bare_and_resource(jid, resource); free(resource); saved_details.jid = strdup(jidp->fulljid); @@ -217,8 +215,8 @@ session_disconnect(void) if (connection_get_status() == JABBER_CONNECTED) { log_info("Closing connection"); - char* account_name = session_get_account_name(); - const char* fulljid = connection_get_fulljid(); + char *account_name = session_get_account_name(); + const char *fulljid = connection_get_fulljid(); plugins_on_disconnect(account_name, fulljid); accounts_set_last_activity(session_get_account_name()); @@ -258,7 +256,8 @@ session_process_events(void) int reconnect_sec; jabber_conn_status_t conn_status = connection_get_status(); - switch (conn_status) { + switch (conn_status) + { case JABBER_CONNECTED: case JABBER_CONNECTING: case JABBER_DISCONNECTING: @@ -298,7 +297,7 @@ session_login_success(gboolean secured) log_debug("Connection handler: logged in with account name: %s", saved_account.name); sv_ev_login_account_success(saved_account.name, secured); - // logged in without account, use details to create new account + // logged in without account, use details to create new account } else { log_debug("Connection handler: logged in with jid: %s", saved_details.name); accounts_add(saved_details.name, saved_details.altdomain, saved_details.port, saved_details.tls_policy, saved_details.auth_policy); @@ -317,10 +316,10 @@ session_login_success(gboolean secured) // items discovery connection_request_features(); - char* domain = connection_get_domain(); + char *domain = connection_get_domain(); iq_disco_items_request_onconnect(domain); - if (prefs_get_boolean(PREF_CARBONS)) { + if (prefs_get_boolean(PREF_CARBONS)){ iq_enable_carbons(); } @@ -379,16 +378,16 @@ session_check_autoaway(void) return; } - char* mode = prefs_get_string(PREF_AUTOAWAY_MODE); + char *mode = prefs_get_string(PREF_AUTOAWAY_MODE); gboolean check = prefs_get_boolean(PREF_AUTOAWAY_CHECK); gint away_time = prefs_get_autoaway_time(); gint xa_time = prefs_get_autoxa_time(); int away_time_ms = away_time * 60000; int xa_time_ms = xa_time * 60000; - char* account = session_get_account_name(); + char *account = session_get_account_name(); resource_presence_t curr_presence = accounts_get_last_presence(account); - char* curr_status = accounts_get_last_status(account); + char *curr_status = accounts_get_last_status(account); unsigned long idle_ms = ui_get_idle_time(); @@ -411,7 +410,7 @@ session_check_autoaway(void) } // send away presence with last activity - char* message = prefs_get_string(PREF_AUTOAWAY_MESSAGE); + char *message = prefs_get_string(PREF_AUTOAWAY_MESSAGE); connection_set_presence_msg(message); if (prefs_get_boolean(PREF_LASTACTIVITY)) { cl_ev_presence_send(RESOURCE_AWAY, idle_ms / 1000); @@ -454,7 +453,7 @@ session_check_autoaway(void) activity_state = ACTIVITY_ST_XA; // send extended away presence with last activity - char* message = prefs_get_string(PREF_AUTOXA_MESSAGE); + char *message = prefs_get_string(PREF_AUTOXA_MESSAGE); connection_set_presence_msg(message); if (prefs_get_boolean(PREF_LASTACTIVITY)) { cl_ev_presence_send(RESOURCE_XA, idle_ms / 1000); @@ -506,13 +505,13 @@ static void _session_reconnect(void) { // reconnect with account. - ProfAccount* account = accounts_get_account(saved_account.name); + ProfAccount *account = accounts_get_account(saved_account.name); if (account == NULL) { log_error("Unable to reconnect, account no longer exists: %s", saved_account.name); return; } - char* jid = NULL; + char *jid = NULL; if (account->resource) { jid = create_fulljid(account->jid, account->resource); } else { @@ -543,3 +542,4 @@ _session_free_saved_details(void) FREE_SET_NULL(saved_details.tls_policy); FREE_SET_NULL(saved_details.auth_policy); } + -- cgit 1.4.1-2-gfad0