aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Moved handle_login_account_success to server_events

Browse Source
This commit is contained in:
James Booth 2014-01-05 20:58:19 +00:00
parent 87cdbe015a
commit da03617e8b
5 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/log.h
View File

@ -23,6 +23,8 @@
#ifndef LOG_H #ifndef LOG_H
#define LOG_H #define LOG_H
#include "glib.h"
// log levels // log levels
typedef enum { typedef enum {
PROF_LEVEL_DEBUG, PROF_LEVEL_DEBUG,

16
src/profanity.c
View File

@ -242,22 +242,6 @@ prof_handle_roster_remove(const char * const barejid)
ui_current_page_off(); ui_current_page_off();
} }
void
prof_handle_login_account_success(char *account_name)
{
ProfAccount *account = accounts_get_account(account_name);
resource_presence_t resource_presence = accounts_get_login_presence(account->name);
contact_presence_t contact_presence = contact_presence_from_resource_presence(resource_presence);
cons_show_login_success(account);
title_bar_set_status(contact_presence);
log_info("%s logged in successfully", account->jid);
ui_current_page_off();
status_bar_print_message(account->jid);
status_bar_refresh();
accounts_free_account(account);
}
void void
prof_handle_gone(const char * const from) prof_handle_gone(const char * const from)
{ {

19
src/server_events.c
View File

@ -20,8 +20,9 @@
* *
*/ */
#include "ui/ui.h" #include "log.h"
#include "muc.h" #include "muc.h"
#include "ui/ui.h"
void void
handle_error_message(const char *from, const char *err_msg) handle_error_message(const char *from, const char *err_msg)
@ -38,3 +39,19 @@ handle_error_message(const char *from, const char *err_msg)
} }
} }
void
handle_login_account_success(char *account_name)
{
ProfAccount *account = accounts_get_account(account_name);
resource_presence_t resource_presence = accounts_get_login_presence(account->name);
contact_presence_t contact_presence = contact_presence_from_resource_presence(resource_presence);
cons_show_login_success(account);
title_bar_set_status(contact_presence);
log_info("%s logged in successfully", account->jid);
ui_current_page_off();
status_bar_print_message(account->jid);
status_bar_refresh();
accounts_free_account(account);
}

1
src/server_events.h
View File

@ -24,5 +24,6 @@
#define SERVER_EVENTS_H #define SERVER_EVENTS_H
void handle_error_message(const char *from, const char *err_msg); void handle_error_message(const char *from, const char *err_msg);
void handle_login_account_success(char *account_name);
#endif #endif

4
src/xmpp/connection.c
View File

@ -463,7 +463,7 @@ _connection_handler(xmpp_conn_t * const conn,
// logged in with account // logged in with account
if (saved_account.name != NULL) { if (saved_account.name != NULL) {
log_debug("Connection handler: logged in with account name: %s", saved_account.name); log_debug("Connection handler: logged in with account name: %s", saved_account.name);
prof_handle_login_account_success(saved_account.name); handle_login_account_success(saved_account.name);
// logged in without account, use details to create new account // logged in without account, use details to create new account
} else { } else {
@ -471,7 +471,7 @@ _connection_handler(xmpp_conn_t * const conn,
accounts_add(saved_details.name, saved_details.altdomain); accounts_add(saved_details.name, saved_details.altdomain);
accounts_set_jid(saved_details.name, saved_details.jid); accounts_set_jid(saved_details.name, saved_details.jid);
prof_handle_login_account_success(saved_details.name); handle_login_account_success(saved_details.name);
saved_account.name = strdup(saved_details.name); saved_account.name = strdup(saved_details.name);
saved_account.passwd = strdup(saved_details.passwd); saved_account.passwd = strdup(saved_details.passwd);