aniani/profanity
0
1
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-07-26 12:14:28 -04:00
Code

Applied coding style to src/event/

Browse Source
This commit is contained in:
James Booth 2015-10-25 22:32:46 +00:00
parent 5863292094
commit afbd2693cd
6 changed files with 86 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/event/client_events.c
View File

@ -48,7 +48,7 @@
#endif #endif
jabber_conn_status_t jabber_conn_status_t
cl_ev_connect_jid(const char * const jid, const char * const passwd, const char * const altdomain, const int port, const char *const tls_policy) cl_ev_connect_jid(const char *const jid, const char *const passwd, const char *const altdomain, const int port, const char *const tls_policy)
{ {
cons_show("Connecting as %s", jid); cons_show("Connecting as %s", jid);
return jabber_connect_with_details(jid, passwd, altdomain, port, tls_policy); return jabber_connect_with_details(jid, passwd, altdomain, port, tls_policy);
@ -65,7 +65,7 @@ cl_ev_connect_account(ProfAccount *account)
} }
void void
cl_ev_presence_send(const resource_presence_t presence_type, const char * const msg, const int idle_secs) cl_ev_presence_send(const resource_presence_t presence_type, const char *const msg, const int idle_secs)
{ {
char *signed_status = NULL; char *signed_status = NULL;
@ -84,7 +84,7 @@ cl_ev_presence_send(const resource_presence_t presence_type, const char * const
} }
void void
cl_ev_send_msg(ProfChatWin *chatwin, const char * const msg) cl_ev_send_msg(ProfChatWin *chatwin, const char *const msg)
{ {
chat_state_active(chatwin->state); chat_state_active(chatwin->state);
@ -154,13 +154,13 @@ cl_ev_send_msg(ProfChatWin *chatwin, const char * const msg)
} }
void void
cl_ev_send_muc_msg(ProfMucWin *mucwin, const char * const msg) cl_ev_send_muc_msg(ProfMucWin *mucwin, const char *const msg)
{ {
message_send_groupchat(mucwin->roomjid, msg); message_send_groupchat(mucwin->roomjid, msg);
} }
void void
cl_ev_send_priv_msg(ProfPrivateWin *privwin, const char * const msg) cl_ev_send_priv_msg(ProfPrivateWin *privwin, const char *const msg)
{ {
message_send_private(privwin->fulljid, msg); message_send_private(privwin->fulljid, msg);
ui_outgoing_private_msg(privwin, msg); ui_outgoing_private_msg(privwin, msg);

10
src/event/client_events.h
View File

@ -35,13 +35,13 @@
#ifndef CLIENT_EVENTS_H #ifndef CLIENT_EVENTS_H
#define CLIENT_EVENTS_H #define CLIENT_EVENTS_H
jabber_conn_status_t cl_ev_connect_jid(const char * const jid, const char * const passwd, const char * const altdomain, const int port, const char *const tls_policy); jabber_conn_status_t cl_ev_connect_jid(const char *const jid, const char *const passwd, const char *const altdomain, const int port, const char *const tls_policy);
jabber_conn_status_t cl_ev_connect_account(ProfAccount *account); jabber_conn_status_t cl_ev_connect_account(ProfAccount *account);
void cl_ev_presence_send(const resource_presence_t presence_type, const char * const msg, const int idle_secs); void cl_ev_presence_send(const resource_presence_t presence_type, const char *const msg, const int idle_secs);
void cl_ev_send_msg(ProfChatWin *chatwin, const char * const msg); void cl_ev_send_msg(ProfChatWin *chatwin, const char *const msg);
void cl_ev_send_muc_msg(ProfMucWin *mucwin, const char * const msg); void cl_ev_send_muc_msg(ProfMucWin *mucwin, const char *const msg);
void cl_ev_send_priv_msg(ProfPrivateWin *privwin, const char * const msg); void cl_ev_send_priv_msg(ProfPrivateWin *privwin, const char *const msg);
#endif #endif

73
src/event/server_events.c
View File

@ -123,8 +123,8 @@ sv_ev_failed_login(void)
void void
sv_ev_room_invite(jabber_invite_t invite_type, sv_ev_room_invite(jabber_invite_t invite_type,
const char * const invitor, const char * const room, const char *const invitor, const char *const room,
const char * const reason, const char * const password) const char *const reason, const char *const password)
{ {
if (!muc_active(room) && !muc_invites_contain(room)) { if (!muc_active(room) && !muc_invites_contain(room)) {
cons_show_room_invite(invitor, room, reason); cons_show_room_invite(invitor, room, reason);
@ -133,8 +133,7 @@ sv_ev_room_invite(jabber_invite_t invite_type,
} }
void void
sv_ev_room_broadcast(const char *const room_jid, sv_ev_room_broadcast(const char *const room_jid, const char *const message)
const char * const message)
{ {
if (muc_roster_complete(room_jid)) { if (muc_roster_complete(room_jid)) {
ui_room_broadcast(room_jid, message); ui_room_broadcast(room_jid, message);
@ -144,7 +143,7 @@ sv_ev_room_broadcast(const char *const room_jid,
} }
void void
sv_ev_room_subject(const char * const room, const char * const nick, const char * const subject) sv_ev_room_subject(const char *const room, const char *const nick, const char *const subject)
{ {
muc_set_subject(room, subject); muc_set_subject(room, subject);
if (muc_roster_complete(room)) { if (muc_roster_complete(room)) {
@ -153,15 +152,15 @@ sv_ev_room_subject(const char * const room, const char * const nick, const char
} }
void void
sv_ev_room_history(const char * const room_jid, const char * const nick, sv_ev_room_history(const char *const room_jid, const char *const nick,
GDateTime *timestamp, const char * const message) GDateTime *timestamp, const char *const message)
{ {
ui_room_history(room_jid, nick, timestamp, message); ui_room_history(room_jid, nick, timestamp, message);
} }
void void
sv_ev_room_message(const char * const room_jid, const char * const nick, sv_ev_room_message(const char *const room_jid, const char *const nick,
const char * const message) const char *const message)
{ {
ui_room_message(room_jid, nick, message); ui_room_message(room_jid, nick, message);
@ -173,7 +172,7 @@ sv_ev_room_message(const char * const room_jid, const char * const nick,
} }
void void
sv_ev_incoming_private_message(const char * const fulljid, char *message) sv_ev_incoming_private_message(const char *const fulljid, char *message)
{ {
ui_incoming_private_msg(fulljid, message, NULL); ui_incoming_private_msg(fulljid, message, NULL);
} }
@ -304,7 +303,7 @@ sv_ev_incoming_message(char *barejid, char *resource, char *message, char *pgp_m
} }
void void
sv_ev_delayed_private_message(const char * const fulljid, char *message, GDateTime *timestamp) sv_ev_delayed_private_message(const char *const fulljid, char *message, GDateTime *timestamp)
{ {
ui_incoming_private_msg(fulljid, message, timestamp); ui_incoming_private_msg(fulljid, message, timestamp);
} }
@ -341,7 +340,7 @@ sv_ev_inactive(char *barejid, char *resource)
} }
void void
sv_ev_gone(const char * const barejid, const char * const resource) sv_ev_gone(const char *const barejid, const char *const resource)
{ {
ui_recipient_gone(barejid, resource); ui_recipient_gone(barejid, resource);
if (ui_chat_win_exists(barejid)) { if (ui_chat_win_exists(barejid)) {
@ -350,7 +349,7 @@ sv_ev_gone(const char * const barejid, const char * const resource)
} }
void void
sv_ev_activity(const char * const barejid, const char * const resource, gboolean send_states) sv_ev_activity(const char *const barejid, const char *const resource, gboolean send_states)
{ {
if (ui_chat_win_exists(barejid)) { if (ui_chat_win_exists(barejid)) {
chat_session_recipient_active(barejid, resource, send_states); chat_session_recipient_active(barejid, resource, send_states);
@ -419,44 +418,44 @@ sv_ev_contact_online(char *barejid, Resource *resource, GDateTime *last_activity
} }
void void
sv_ev_leave_room(const char * const room) sv_ev_leave_room(const char *const room)
{ {
muc_leave(room); muc_leave(room);
ui_leave_room(room); ui_leave_room(room);
} }
void void
sv_ev_room_destroy(const char * const room) sv_ev_room_destroy(const char *const room)
{ {
muc_leave(room); muc_leave(room);
ui_room_destroy(room); ui_room_destroy(room);
} }
void void
sv_ev_room_destroyed(const char * const room, const char * const new_jid, const char * const password, sv_ev_room_destroyed(const char *const room, const char *const new_jid, const char *const password,
const char * const reason) const char *const reason)
{ {
muc_leave(room); muc_leave(room);
ui_room_destroyed(room, reason, new_jid, password); ui_room_destroyed(room, reason, new_jid, password);
} }
void void
sv_ev_room_kicked(const char * const room, const char * const actor, const char * const reason) sv_ev_room_kicked(const char *const room, const char *const actor, const char *const reason)
{ {
muc_leave(room); muc_leave(room);
ui_room_kicked(room, actor, reason); ui_room_kicked(room, actor, reason);
} }
void void
sv_ev_room_banned(const char * const room, const char * const actor, const char * const reason) sv_ev_room_banned(const char *const room, const char *const actor, const char *const reason)
{ {
muc_leave(room); muc_leave(room);
ui_room_banned(room, actor, reason); ui_room_banned(room, actor, reason);
} }
void void
sv_ev_room_occupant_offline(const char * const room, const char * const nick, sv_ev_room_occupant_offline(const char *const room, const char *const nick,
const char * const show, const char * const status) const char *const show, const char *const status)
{ {
muc_roster_remove(room, nick); muc_roster_remove(room, nick);
@ -469,8 +468,8 @@ sv_ev_room_occupant_offline(const char * const room, const char * const nick,
} }
void void
sv_ev_room_occupent_kicked(const char * const room, const char * const nick, const char * const actor, sv_ev_room_occupent_kicked(const char *const room, const char *const nick, const char *const actor,
const char * const reason) const char *const reason)
{ {
muc_roster_remove(room, nick); muc_roster_remove(room, nick);
ui_room_member_kicked(room, nick, actor, reason); ui_room_member_kicked(room, nick, actor, reason);
@ -478,8 +477,8 @@ sv_ev_room_occupent_kicked(const char * const room, const char * const nick, con
} }
void void
sv_ev_room_occupent_banned(const char * const room, const char * const nick, const char * const actor, sv_ev_room_occupent_banned(const char *const room, const char *const nick, const char *const actor,
const char * const reason) const char *const reason)
{ {
muc_roster_remove(room, nick); muc_roster_remove(room, nick);
ui_room_member_banned(room, nick, actor, reason); ui_room_member_banned(room, nick, actor, reason);
@ -487,23 +486,23 @@ sv_ev_room_occupent_banned(const char * const room, const char * const nick, con
} }
void void
sv_ev_roster_update(const char * const barejid, const char * const name, sv_ev_roster_update(const char *const barejid, const char *const name,
GSList *groups, const char * const subscription, gboolean pending_out) GSList *groups, const char *const subscription, gboolean pending_out)
{ {
roster_update(barejid, name, groups, subscription, pending_out); roster_update(barejid, name, groups, subscription, pending_out);
rosterwin_roster(); rosterwin_roster();
} }
void void
sv_ev_xmpp_stanza(const char * const msg) sv_ev_xmpp_stanza(const char *const msg)
{ {
ui_handle_stanza(msg); ui_handle_stanza(msg);
} }
void void
sv_ev_muc_self_online(const char * const room, const char * const nick, gboolean config_required, sv_ev_muc_self_online(const char *const room, const char *const nick, gboolean config_required,
const char * const role, const char * const affiliation, const char * const actor, const char * const reason, const char *const role, const char *const affiliation, const char *const actor, const char *const reason,
const char * const jid, const char * const show, const char * const status) const char *const jid, const char *const show, const char *const status)
{ {
muc_roster_add(room, nick, jid, role, affiliation, show, status); muc_roster_add(room, nick, jid, role, affiliation, show, status);
char *old_role = muc_role_str(room); char *old_role = muc_role_str(room);
@ -578,9 +577,9 @@ sv_ev_muc_self_online(const char * const room, const char * const nick, gboolean
} }
void void
sv_ev_muc_occupant_online(const char * const room, const char * const nick, const char * const jid, sv_ev_muc_occupant_online(const char *const room, const char *const nick, const char *const jid,
const char * const role, const char * const affiliation, const char * const actor, const char * const reason, const char *const role, const char *const affiliation, const char *const actor, const char *const reason,
const char * const show, const char * const status) const char *const show, const char *const status)
{ {
Occupant *occupant = muc_roster_item(room, nick); Occupant *occupant = muc_roster_item(room, nick);
@ -648,8 +647,8 @@ sv_ev_muc_occupant_online(const char * const room, const char * const nick, cons
} }
int int
sv_ev_certfail(const char * const errormsg, const char * const certname, const char * const certfp, sv_ev_certfail(const char *const errormsg, const char *const certname, const char *const certfp,
const char * const notbefore, const char * const notafter) const char *const notbefore, const char *const notafter)
{ {
if (tlscerts_exists(certfp)) { if (tlscerts_exists(certfp)) {
return 1; return 1;
@ -739,7 +738,7 @@ sv_ev_certfail(const char * const errormsg, const char * const certname, const c
} }
void void
sv_ev_lastactivity_response(const char * const from, const int seconds, const char * const msg) sv_ev_lastactivity_response(const char *const from, const int seconds, const char *const msg)
{ {
Jid *jidp = jid_create(from); Jid *jidp = jid_create(from);

71
src/event/server_events.h
View File

@ -41,53 +41,52 @@ void sv_ev_login_account_success(char *account_name, int secured);
void sv_ev_lost_connection(void); void sv_ev_lost_connection(void);
void sv_ev_failed_login(void); void sv_ev_failed_login(void);
void sv_ev_room_invite(jabber_invite_t invite_type, void sv_ev_room_invite(jabber_invite_t invite_type,
const char * const invitor, const char * const room, const char *const invitor, const char *const room,
const char * const reason, const char * const password); const char *const reason, const char *const password);
void sv_ev_room_broadcast(const char *const room_jid, void sv_ev_room_broadcast(const char *const room_jid, const char *const message);
const char * const message); void sv_ev_room_subject(const char *const room, const char *const nick, const char *const subject);
void sv_ev_room_subject(const char * const room, const char * const nick, const char * const subject); void sv_ev_room_history(const char *const room_jid, const char *const nick,
void sv_ev_room_history(const char * const room_jid, const char * const nick, GDateTime *timestamp, const char *const message);
GDateTime *timestamp, const char * const message); void sv_ev_room_message(const char *const room_jid, const char *const nick,
void sv_ev_room_message(const char * const room_jid, const char * const nick, const char *const message);
const char * const message);
void sv_ev_incoming_message(char *barejid, char *resource, char *message, char *pgp_message, GDateTime *timestamp); void sv_ev_incoming_message(char *barejid, char *resource, char *message, char *pgp_message, GDateTime *timestamp);
void sv_ev_incoming_private_message(const char * const fulljid, char *message); void sv_ev_incoming_private_message(const char *const fulljid, char *message);
void sv_ev_delayed_private_message(const char * const fulljid, char *message, GDateTime *timestamp); void sv_ev_delayed_private_message(const char *const fulljid, char *message, GDateTime *timestamp);
void sv_ev_typing(char *barejid, char *resource); void sv_ev_typing(char *barejid, char *resource);
void sv_ev_paused(char *barejid, char *resource); void sv_ev_paused(char *barejid, char *resource);
void sv_ev_inactive(char *barejid, char *resource); void sv_ev_inactive(char *barejid, char *resource);
void sv_ev_activity(char *barejid, char *resource, gboolean send_states); void sv_ev_activity(char *barejid, char *resource, gboolean send_states);
void sv_ev_gone(const char * const barejid, const char * const resource); void sv_ev_gone(const char *const barejid, const char *const resource);
void sv_ev_subscription(const char *from, jabber_subscr_t type); void sv_ev_subscription(const char *from, jabber_subscr_t type);
void sv_ev_message_receipt(char *barejid, char *id); void sv_ev_message_receipt(char *barejid, char *id);
void sv_ev_contact_offline(char *contact, char *resource, char *status); void sv_ev_contact_offline(char *contact, char *resource, char *status);
void sv_ev_contact_online(char *contact, Resource *resource, GDateTime *last_activity, char *pgpkey); void sv_ev_contact_online(char *contact, Resource *resource, GDateTime *last_activity, char *pgpkey);
void sv_ev_leave_room(const char * const room); void sv_ev_leave_room(const char *const room);
void sv_ev_room_destroy(const char * const room); void sv_ev_room_destroy(const char *const room);
void sv_ev_room_occupant_offline(const char * const room, const char * const nick, void sv_ev_room_occupant_offline(const char *const room, const char *const nick,
const char * const show, const char * const status); const char *const show, const char *const status);
void sv_ev_room_destroyed(const char * const room, const char * const new_jid, const char * const password, void sv_ev_room_destroyed(const char *const room, const char *const new_jid, const char *const password,
const char * const reason); const char *const reason);
void sv_ev_room_kicked(const char * const room, const char * const actor, const char * const reason); void sv_ev_room_kicked(const char *const room, const char *const actor, const char *const reason);
void sv_ev_room_occupent_kicked(const char * const room, const char * const nick, const char * const actor, void sv_ev_room_occupent_kicked(const char *const room, const char *const nick, const char *const actor,
const char * const reason); const char *const reason);
void sv_ev_room_banned(const char * const room, const char * const actor, const char * const reason); void sv_ev_room_banned(const char *const room, const char *const actor, const char *const reason);
void sv_ev_room_occupent_banned(const char * const room, const char * const nick, const char * const actor, void sv_ev_room_occupent_banned(const char *const room, const char *const nick, const char *const actor,
const char * const reason); const char *const reason);
void sv_ev_outgoing_carbon(char *barejid, char *message); void sv_ev_outgoing_carbon(char *barejid, char *message);
void sv_ev_incoming_carbon(char *barejid, char *resource, char *message); void sv_ev_incoming_carbon(char *barejid, char *resource, char *message);
void sv_ev_xmpp_stanza(const char * const msg); void sv_ev_xmpp_stanza(const char *const msg);
void sv_ev_muc_self_online(const char * const room, const char * const nick, gboolean config_required, void sv_ev_muc_self_online(const char *const room, const char *const nick, gboolean config_required,
const char * const role, const char * const affiliation, const char * const actor, const char * const reason, const char *const role, const char *const affiliation, const char *const actor, const char *const reason,
const char * const jid, const char * const show, const char * const status); const char *const jid, const char *const show, const char *const status);
void sv_ev_muc_occupant_online(const char * const room, const char * const nick, const char * const jid, void sv_ev_muc_occupant_online(const char *const room, const char *const nick, const char *const jid,
const char * const role, const char * const affiliation, const char * const actor, const char * const reason, const char *const role, const char *const affiliation, const char *const actor, const char *const reason,
const char * const show_str, const char * const status_str); const char *const show_str, const char *const status_str);
void sv_ev_roster_update(const char * const barejid, const char * const name, void sv_ev_roster_update(const char *const barejid, const char *const name,
GSList *groups, const char * const subscription, gboolean pending_out); GSList *groups, const char *const subscription, gboolean pending_out);
void sv_ev_roster_received(void); void sv_ev_roster_received(void);
int sv_ev_certfail(const char * const errormsg, const char * const certname, const char * const certfp, int sv_ev_certfail(const char *const errormsg, const char *const certname, const char *const certfp,
const char * const notbefore, const char * const notafter); const char *const notbefore, const char *const notafter);
void sv_ev_lastactivity_response(const char * const from, const int seconds, const char * const msg); void sv_ev_lastactivity_response(const char *const from, const int seconds, const char *const msg);
#endif #endif

4
src/event/ui_events.c
View File

@ -44,13 +44,13 @@ ui_ev_focus_win(ProfWin *win)
} }
ProfChatWin* ProfChatWin*
ui_ev_new_chat_win(const char * const barejid) ui_ev_new_chat_win(const char *const barejid)
{ {
return ui_new_chat_win(barejid); return ui_new_chat_win(barejid);
} }
ProfPrivateWin* ProfPrivateWin*
ui_ev_new_private_win(const char * const fulljid) ui_ev_new_private_win(const char *const fulljid)
{ {
return ui_new_private_win(fulljid); return ui_new_private_win(fulljid);
} }

6
src/event/ui_events.h
View File

@ -36,7 +36,7 @@
#define UI_EVENTS_H #define UI_EVENTS_H
void ui_ev_focus_win(ProfWin *win); void ui_ev_focus_win(ProfWin *win);
ProfChatWin* ui_ev_new_chat_win(const char * const barejid); ProfChatWin* ui_ev_new_chat_win(const char *const barejid);
ProfPrivateWin* ui_ev_new_private_win(const char * const fulljid); ProfPrivateWin* ui_ev_new_private_win(const char *const fulljid);
#endif #endif