aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00
Code

Merge branch 'master' into plugins

Browse Source 
Conflicts:
	src/event/client_events.c
This commit is contained in:
James Booth 2015-05-04 01:10:20 +01:00
commit b64a5aca10
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -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

2
configure-plugins
View File

@ -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'

4
src/command/commands.c
View File

@ -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:

8
src/event/client_events.c
View File

@ -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);
}

2
src/event/client_events.h
View File

@ -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