diff options
| -rw-r--r-- | src/input_win.c | 6 | ||||
| -rw-r--r-- | src/jabber.c | 3 | ||||
| -rw-r--r-- | src/ui.h | 1 | ||||
| -rw-r--r-- | src/windows.c | 11 |
4 files changed, 18 insertions, 3 deletions
diff --git a/src/input_win.c b/src/input_win.c index c5de7538..eb7ebe19 100644 --- a/src/input_win.c +++ b/src/input_win.c @@ -149,7 +149,7 @@ inp_get_char(int *ch, char *input, int *size) // if not got char, and in chat window, flag as no activity // send inactive or gone, depending how long inactive if (*ch == ERR) { - if (win_in_chat()) { + if (win_in_chat() && !win_in_groupchat()) { char *recipient = win_get_recipient(); chat_session_no_activity(recipient); @@ -168,8 +168,8 @@ inp_get_char(int *ch, char *input, int *size) } // if got char and in chat window, chat session active - if (prefs_get_outtype() && (*ch != ERR) && win_in_chat() && !in_command && - _printable(*ch)) { + if (prefs_get_outtype() && (*ch != ERR) && win_in_chat() && + !win_in_groupchat() && !in_command && _printable(*ch)) { char *recipient = win_get_recipient(); chat_session_set_composing(recipient); if (!chat_session_get_sent(recipient) || diff --git a/src/jabber.c b/src/jabber.c index 776a31fd..d700255b 100644 --- a/src/jabber.c +++ b/src/jabber.c @@ -401,6 +401,9 @@ _message_handler(xmpp_conn_t * const conn, from = xmpp_stanza_get_attribute(stanza, "from"); if (room_jid_is_room_chat(from)) { + + + cons_show("CHAT ROOM MESSAGE RECIEVED"); } else { diff --git a/src/ui.h b/src/ui.h index c8e44cee..90326bc6 100644 --- a/src/ui.h +++ b/src/ui.h @@ -106,6 +106,7 @@ void win_remind(void); void win_join_chat(const char * const room_jid, const char * const nick); void win_show_chat_room_member(const char * const room_jid, const char * const nick); +int win_in_groupchat(void); // console window actions void cons_about(void); diff --git a/src/windows.c b/src/windows.c index a4308454..c5169201 100644 --- a/src/windows.c +++ b/src/windows.c @@ -43,6 +43,7 @@ #include "log.h" #include "preferences.h" #include "release.h" +#include "room_chat.h" #include "ui.h" #define CONS_WIN_TITLE "_cons" @@ -196,6 +197,16 @@ win_in_chat(void) (strcmp(_wins[_curr_prof_win].from, "") != 0)); } +int +win_in_groupchat(void) +{ + if (room_jid_is_room_chat(_wins[_curr_prof_win].from)) { + return 1; + } else { + return 0; + } +} + char * win_get_recipient(void) { |