From 4493f5553038ef181228d5382a83ef6950c168c1 Mon Sep 17 00:00:00 2001 From: James Booth Date: Tue, 6 Nov 2012 22:40:38 +0000 Subject: Removed jabber.c dependency on ui.h --- src/jabber.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/jabber.c') diff --git a/src/jabber.c b/src/jabber.c index d294ba0a..5ec61665 100644 --- a/src/jabber.c +++ b/src/jabber.c @@ -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, "/"); -- cgit 1.4.1-2-gfad0