aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-09-22 19:45:54 -04:00
Code

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
Show Stats 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, "/");

21
src/profanity.c
View File

@ -171,6 +171,27 @@ prof_handle_failed_login(void)
log_info("disconnected");
}
void
prof_handle_room_history(const char * const room_jid, const char * const nick,
GTimeVal tv_stamp, const char * const message)
{
win_show_room_history(room_jid, nick, tv_stamp, message);
}
void
prof_handle_room_message(const char * const room_jid, const char * const nick,
const char * const message)
{
win_show_room_message(room_jid, nick, message);
}
void
prof_handle_chat_room_member(const char * const room_jid,
const char * const nick)
{
win_show_chat_room_member(room_jid, nick);
}
void
prof_handle_contact_online(char *contact, char *show, char *status)
{

7
src/profanity.h
View File

@ -35,5 +35,12 @@ void prof_handle_incoming_message(char *from, char *message);
void prof_handle_error_message(const char *from, const char *err_msg);
void prof_handle_roster(GSList *roster);
void prof_handle_gone(const char * const from);
void prof_handle_room_history(const char * const room_jid,
const char * const nick, GTimeVal tv_stamp, const char * const message);
void prof_handle_room_message(const char * const room_jid, const char * const nick,
const char * const message);
void
prof_handle_chat_room_member(const char * const room_jid,
const char * const nick);
#endif