devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 6 Actions Packages Projects 1 Releases Wiki Activity

Merge branch 'master' into type_out

Browse Source
This commit is contained in:
James Booth
2012-10-22 22:21:55 +01:00
parent d2be692992 f9b4abe3da
commit a5e4e52567
39 changed files with 722 additions and 623 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
src/profanity.c
View File

@@ -1,8 +1,8 @@
/*
/*
* profanity.c
*
* Copyright (C) 2012 James Booth <boothj5@gmail.com>
*
*
* This file is part of Profanity.
*
* Profanity is free software: you can redistribute it and/or modify
@@ -65,7 +65,7 @@ prof_run(const int disable_tls, char *log_level)
while(ch != '\n') {
gdouble elapsed = g_timer_elapsed(timer, NULL);
gint remind_period = prefs_get_remind();
// 0 means to not remind
@@ -79,10 +79,10 @@ prof_run(const int disable_tls, char *log_level)
if (ch == KEY_RESIZE) {
gui_resize(ch, inp, size);
}
gui_refresh();
jabber_process_events();
inp_get_char(&ch, inp, &size);
}
@@ -105,15 +105,33 @@ prof_handle_incoming_message(char *from, char *message)
{
win_show_incomming_msg(from, message);
win_page_off();
if (prefs_get_chlog()) {
char from_cpy[strlen(from) + 1];
strcpy(from_cpy, from);
char *short_from = strtok(from_cpy, "/");
const char *jid = jabber_get_jid();
chat_log_chat(jid, short_from, message, IN);
}
if (prefs_get_chlog()) {
char from_cpy[strlen(from) + 1];
strcpy(from_cpy, from);
char *short_from = strtok(from_cpy, "/");
const char *jid = jabber_get_jid();
chat_log_chat(jid, short_from, message, IN);
}
}
void
prof_handle_error_message(const char *from, const char *err_msg)
{
char *msg, *fmt;
if (err_msg != NULL) {
fmt = "Error received from server: %s";
msg = (char *)malloc(strlen(err_msg) + strlen(fmt) - 1);
if (msg == NULL)
goto loop_out;
sprintf(msg, fmt, err_msg);
cons_bad_show(msg);
free(msg);
}
loop_out:
win_show_error_msg(from, err_msg);
}
void
@@ -173,16 +191,16 @@ prof_handle_roster(GSList *roster)
{
while (roster != NULL) {
jabber_roster_entry *entry = roster->data;
// if contact not in contact list add them as offline
if (find_contact(entry->jid) == NULL) {
if (contact_list_find_contact(entry->jid) == NULL) {
contact_list_add(entry->jid, "offline", NULL);
}
roster = g_slist_next(roster);
}
g_slist_free_full(roster, (GDestroyNotify)_free_roster_entry);
g_slist_free_full(roster, (GDestroyNotify)_free_roster_entry);
}
static void
@@ -204,7 +222,7 @@ _free_roster_entry(jabber_roster_entry *entry)
free(entry->jid);
}
static log_level_t
static log_level_t
_get_log_level(char *log_level)
{
if (strcmp(log_level, "DEBUG") == 0) {
@@ -218,8 +236,8 @@ _get_log_level(char *log_level)
}
}
/*
* Take a line of input and process it, return TRUE if profanity is to
/*
* Take a line of input and process it, return TRUE if profanity is to
* continue, FALSE otherwise
*/
static gboolean
@@ -228,7 +246,7 @@ _process_input(char *inp)
log_debug("Input recieved: %s", inp);
gboolean result = FALSE;
g_strstrip(inp);
// add line to history if something typed
if (strlen(inp) > 0) {
history_append(inp);
@@ -251,7 +269,7 @@ _process_input(char *inp)
}
inp_clear();
reset_search_attempts();
contact_list_reset_search_attempts();
win_page_off();
return result;
@@ -283,6 +301,7 @@ _shutdown_init(void)
while (jabber_get_connection_status() == JABBER_DISCONNECTING) {
jabber_process_events();
}
jabber_free_resources();
}
_shutdown();
@@ -291,8 +310,10 @@ _shutdown_init(void)
static void
_shutdown(void)
{
gui_close();
chat_log_close();
prefs_close();
log_close();
contact_list_clear();
gui_close();
chat_log_close();
prefs_close();
cmd_close();
log_close();
}