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

Removed jabber.c dependency on ui.h

Browse Source
This commit is contained in:
James Booth
2012-11-06 22:40:38 +00:00
parent 7e9299c240
commit 4493f55530
3 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/jabber.c
View File

@@ -34,9 +34,6 @@
#include "profanity.h"
#include "room_chat.h"
// TODO REMOVE
#include "ui.h"
#define PING_INTERVAL 120000 // 2 minutes
static struct _jabber_conn_t {
@@ -461,7 +458,8 @@ _message_handler(xmpp_conn_t * const conn,
char **tokens = g_strsplit(from, "/", 0);
char *room_jid = tokens[0];
char *nick = tokens[1];
win_show_room_history(room_jid, nick, tv_stamp, message);
prof_handle_room_history(room_jid, nick, tv_stamp, message);
g_strfreev(tokens);
}
} else {
log_error("Couldn't parse datetime string receiving room history: %s", utc_stamp);
@@ -473,7 +471,8 @@ _message_handler(xmpp_conn_t * const conn,
char **tokens = g_strsplit(from, "/", 0);
char *room_jid = tokens[0];
char *nick = tokens[1];
win_show_room_message(room_jid, nick, message);
prof_handle_room_message(room_jid, nick, message);
g_strfreev(tokens);
}
}
@@ -684,7 +683,7 @@ _presence_handler(xmpp_conn_t * const conn,
char *room_jid = tokens[0];
char *nick = tokens[1];
if (strcmp(room_get_nick_for_room(room_jid), nick) != 0) {
win_show_chat_room_member(room_jid, nick);
prof_handle_chat_room_member(room_jid, nick);
}
} else {
char *short_from = strtok(from, "/");