devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-21 17:26:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into chatstates

Browse Source 
Conflicts:
	docs/profanity.1
This commit is contained in:
James Booth
2012-10-27 19:34:26 +01:00
parent 053a5f3120 847850742c
commit d4fb72f6c9
6 changed files with 48 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/profanity.c
View File

@@ -43,7 +43,6 @@ static gboolean _process_input(char *inp);
static void _create_config_directory();
static void _free_roster_entry(jabber_roster_entry *entry);
static void _init(const int disable_tls, char *log_level);
static void _shutdown_init(void);
static void _shutdown(void);
void
@@ -137,7 +136,7 @@ loop_out:
void
prof_handle_login_success(const char *jid)
{
const char *msg = " logged in successfully.";
const char *msg = "logged in successfully.";
cons_show("%s %s", jid, msg);
title_bar_set_status(PRESENCE_ONLINE);
log_info("%s %s", jid, msg);
@@ -204,7 +203,7 @@ prof_handle_roster(GSList *roster)
}
static void
_create_config_directory()
_create_config_directory(void)
{
GString *dir = g_string_new(getenv("HOME"));
g_string_append(dir, "/.profanity");
@@ -289,27 +288,13 @@ _init(const int disable_tls, char *log_level)
cmd_init();
log_info("Initialising contact list");
contact_list_init();
atexit(_shutdown_init);
}
static void
_shutdown_init(void)
{
gboolean wait_response = jabber_disconnect();
if (wait_response) {
while (jabber_get_connection_status() == JABBER_DISCONNECTING) {
jabber_process_events();
}
jabber_free_resources();
}
_shutdown();
atexit(_shutdown);
}
static void
_shutdown(void)
{
jabber_disconnect();
contact_list_clear();
gui_close();
chat_log_close();