diff --git a/.travis.yml b/.travis.yml index 126ce6ba..a7e1d3cd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,4 +23,4 @@ install: - cd ../.. - rm -rf cmocka-1.0.0 - ./bootstrap.sh -script: ./configure --enable-ruby-plugins --enable-python-plugins --enable-c-plugins --disable-lua-plugins && make && make check +script: ./configure --disable-ruby-plugins --enable-python-plugins --enable-c-plugins --disable-lua-plugins && make && make check diff --git a/configure-plugins b/configure-plugins index a8f06d4e..05abb4e6 100755 --- a/configure-plugins +++ b/configure-plugins @@ -1,4 +1,4 @@ #!/bin/sh -./configure --enable-python-plugins --enable-ruby-plugins --enable-c-plugins --disable-lua-plugins CFLAGS='-g -O0' CXXFLAGS='-g -O0' +./configure --enable-python-plugins --disable-ruby-plugins --enable-c-plugins --disable-lua-plugins CFLAGS='-g -O0' CXXFLAGS='-g -O0' diff --git a/src/command/commands.c b/src/command/commands.c index 5c703413..a6478db1 100644 --- a/src/command/commands.c +++ b/src/command/commands.c @@ -130,7 +130,7 @@ cmd_execute_default(const char * inp) case WIN_MUC: { ProfMucWin *mucwin = wins_get_current_muc(); - cl_ev_send_muc_msg(mucwin->roomjid, inp); + cl_ev_send_muc_msg(mucwin, inp); break; } default: @@ -3163,7 +3163,7 @@ cmd_tiny(gchar **args, struct cmd_help_t help) case WIN_MUC: { ProfMucWin *mucwin = wins_get_current_muc(); - cl_ev_send_muc_msg(mucwin->roomjid, tiny); + cl_ev_send_muc_msg(mucwin, tiny); break; } default: diff --git a/src/event/client_events.c b/src/event/client_events.c index bec94c80..a9bf1964 100644 --- a/src/event/client_events.c +++ b/src/event/client_events.c @@ -82,13 +82,13 @@ cl_ev_send_msg(ProfChatWin *chatwin, const char * const msg) } void -cl_ev_send_muc_msg(const char * const roomjid, const char * const msg) +cl_ev_send_muc_msg(ProfMucWin *mucwin, const char * const msg) { - char *plugin_msg = plugins_pre_room_message_send(roomjid, msg); + char *plugin_msg = plugins_pre_room_message_send(mucwin->roomjid, msg); - message_send_groupchat(roomjid, msg); + message_send_groupchat(mucwin->roomjid, plugin_msg); - plugins_post_room_message_send(roomjid, plugin_msg); + plugins_post_room_message_send(mucwin->roomjid, plugin_msg); free(plugin_msg); } diff --git a/src/event/client_events.h b/src/event/client_events.h index c074b230..3685cb2d 100644 --- a/src/event/client_events.h +++ b/src/event/client_events.h @@ -39,7 +39,7 @@ jabber_conn_status_t cl_ev_connect_jid(const char * const jid, const char * cons jabber_conn_status_t cl_ev_connect_account(ProfAccount *account); void cl_ev_send_msg(ProfChatWin *chatwin, const char * const msg); -void cl_ev_send_muc_msg(const char * const roomjid, const char * const msg); +void cl_ev_send_muc_msg(ProfMucWin *mucwin, const char * const msg); void cl_ev_send_priv_msg(const char * const fulljid, const char * const msg); #endif \ No newline at end of file