aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Renamed win_current_get_recipient -> ui_current_win_recipient

Browse Source
This commit is contained in:
James Booth 2013-04-21 18:47:37 +01:00
parent bf740d9997
commit 954c9ededc
4 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/command/command.c
View File

@ -918,7 +918,7 @@ cmd_reset_autocomplete()
autocomplete_reset(sub_ac); autocomplete_reset(sub_ac);
if (ui_current_win_type() == WIN_MUC) { if (ui_current_win_type() == WIN_MUC) {
Autocomplete nick_ac = muc_get_roster_ac(win_current_get_recipient()); Autocomplete nick_ac = muc_get_roster_ac(ui_current_win_recipient());
if (nick_ac != NULL) { if (nick_ac != NULL) {
autocomplete_reset(nick_ac); autocomplete_reset(nick_ac);
} }
@ -1010,7 +1010,7 @@ cmd_execute_default(const char * const inp)
{ {
win_type_t win_type = ui_current_win_type(); win_type_t win_type = ui_current_win_type();
jabber_conn_status_t status = jabber_get_connection_status(); jabber_conn_status_t status = jabber_get_connection_status();
char *recipient = win_current_get_recipient(); char *recipient = ui_current_win_recipient();
switch (win_type) switch (win_type)
{ {
@ -1088,7 +1088,7 @@ _cmd_complete_parameters(char *input, int *size)
prefs_autocomplete_boolean_choice); prefs_autocomplete_boolean_choice);
if (ui_current_win_type() == WIN_MUC) { if (ui_current_win_type() == WIN_MUC) {
Autocomplete nick_ac = muc_get_roster_ac(win_current_get_recipient()); Autocomplete nick_ac = muc_get_roster_ac(ui_current_win_recipient());
if (nick_ac != NULL) { if (nick_ac != NULL) {
_parameter_autocomplete_with_ac(input, size, "/msg", nick_ac); _parameter_autocomplete_with_ac(input, size, "/msg", nick_ac);
_parameter_autocomplete_with_ac(input, size, "/info", nick_ac); _parameter_autocomplete_with_ac(input, size, "/info", nick_ac);
@ -1411,7 +1411,7 @@ _cmd_sub(gchar **args, struct cmd_help_t help)
if (jid != NULL) { if (jid != NULL) {
jid = strdup(jid); jid = strdup(jid);
} else { } else {
jid = win_current_get_recipient(); jid = ui_current_win_recipient();
} }
bare_jid = strtok(jid, "/"); bare_jid = strtok(jid, "/");
@ -1665,7 +1665,7 @@ _cmd_who(gchar **args, struct cmd_help_t help)
// valid arg // valid arg
} else { } else {
if (win_type == WIN_MUC) { if (win_type == WIN_MUC) {
char *room = win_current_get_recipient(); char *room = ui_current_win_recipient();
GList *list = muc_get_roster(room); GList *list = muc_get_roster(room);
// no arg, show all contacts // no arg, show all contacts
@ -1859,7 +1859,7 @@ _cmd_msg(gchar **args, struct cmd_help_t help)
} }
if (win_type == WIN_MUC) { if (win_type == WIN_MUC) {
char *room_name = win_current_get_recipient(); char *room_name = ui_current_win_recipient();
if (muc_nick_in_roster(room_name, usr)) { if (muc_nick_in_roster(room_name, usr)) {
GString *full_jid = g_string_new(room_name); GString *full_jid = g_string_new(room_name);
g_string_append(full_jid, "/"); g_string_append(full_jid, "/");
@ -1968,7 +1968,7 @@ _cmd_info(gchar **args, struct cmd_help_t help)
{ {
case WIN_MUC: case WIN_MUC:
if (usr != NULL) { if (usr != NULL) {
pcontact = muc_get_participant(win_current_get_recipient(), usr); pcontact = muc_get_participant(ui_current_win_recipient(), usr);
if (pcontact != NULL) { if (pcontact != NULL) {
cons_show_info(pcontact); cons_show_info(pcontact);
} else { } else {
@ -1982,11 +1982,11 @@ _cmd_info(gchar **args, struct cmd_help_t help)
if (usr != NULL) { if (usr != NULL) {
cons_show("No parameter required for /info in chat."); cons_show("No parameter required for /info in chat.");
} else { } else {
pcontact = contact_list_get_contact(win_current_get_recipient()); pcontact = contact_list_get_contact(ui_current_win_recipient());
if (pcontact != NULL) { if (pcontact != NULL) {
cons_show_info(pcontact); cons_show_info(pcontact);
} else { } else {
cons_show("No such contact \"%s\" in roster.", win_current_get_recipient()); cons_show("No such contact \"%s\" in roster.", ui_current_win_recipient());
} }
} }
break; break;
@ -1994,7 +1994,7 @@ _cmd_info(gchar **args, struct cmd_help_t help)
if (usr != NULL) { if (usr != NULL) {
win_current_show("No parameter required when in chat."); win_current_show("No parameter required when in chat.");
} else { } else {
Jid *jid = jid_create(win_current_get_recipient()); Jid *jid = jid_create(ui_current_win_recipient());
pcontact = muc_get_participant(jid->barejid, jid->resourcepart); pcontact = muc_get_participant(jid->barejid, jid->resourcepart);
if (pcontact != NULL) { if (pcontact != NULL) {
cons_show_info(pcontact); cons_show_info(pcontact);
@ -2039,7 +2039,7 @@ _cmd_caps(gchar **args, struct cmd_help_t help)
{ {
case WIN_MUC: case WIN_MUC:
if (args[0] != NULL) { if (args[0] != NULL) {
pcontact = muc_get_participant(win_current_get_recipient(), args[0]); pcontact = muc_get_participant(ui_current_win_recipient(), args[0]);
if (pcontact != NULL) { if (pcontact != NULL) {
Resource *resource = p_contact_get_resource(pcontact, args[0]); Resource *resource = p_contact_get_resource(pcontact, args[0]);
cons_show_caps(args[0], resource); cons_show_caps(args[0], resource);
@ -2078,7 +2078,7 @@ _cmd_caps(gchar **args, struct cmd_help_t help)
if (args[0] != NULL) { if (args[0] != NULL) {
cons_show("No parameter needed to /caps when in private chat."); cons_show("No parameter needed to /caps when in private chat.");
} else { } else {
Jid *jid = jid_create(win_current_get_recipient()); Jid *jid = jid_create(ui_current_win_recipient());
pcontact = muc_get_participant(jid->barejid, jid->resourcepart); pcontact = muc_get_participant(jid->barejid, jid->resourcepart);
Resource *resource = p_contact_get_resource(pcontact, jid->resourcepart); Resource *resource = p_contact_get_resource(pcontact, jid->resourcepart);
cons_show_caps(jid->resourcepart, resource); cons_show_caps(jid->resourcepart, resource);
@ -2108,9 +2108,9 @@ _cmd_software(gchar **args, struct cmd_help_t help)
{ {
case WIN_MUC: case WIN_MUC:
if (args[0] != NULL) { if (args[0] != NULL) {
pcontact = muc_get_participant(win_current_get_recipient(), args[0]); pcontact = muc_get_participant(ui_current_win_recipient(), args[0]);
if (pcontact != NULL) { if (pcontact != NULL) {
Jid *jid = jid_create_from_bare_and_resource(win_current_get_recipient(), args[0]); Jid *jid = jid_create_from_bare_and_resource(ui_current_win_recipient(), args[0]);
iq_send_software_version(jid->fulljid); iq_send_software_version(jid->fulljid);
jid_destroy(jid); jid_destroy(jid);
} else { } else {
@ -2138,7 +2138,7 @@ _cmd_software(gchar **args, struct cmd_help_t help)
if (args[0] != NULL) { if (args[0] != NULL) {
cons_show("No parameter needed to /software when in private chat."); cons_show("No parameter needed to /software when in private chat.");
} else { } else {
iq_send_software_version(win_current_get_recipient()); iq_send_software_version(ui_current_win_recipient());
} }
break; break;
default: default:
@ -2223,7 +2223,7 @@ _cmd_invite(gchar **args, struct cmd_help_t help)
return TRUE; return TRUE;
} }
room = win_current_get_recipient(); room = ui_current_win_recipient();
message_send_invite(room, contact, reason); message_send_invite(room, contact, reason);
if (reason != NULL) { if (reason != NULL) {
cons_show("Room invite sent, contact: %s, room: %s, reason: \"%s\".", cons_show("Room invite sent, contact: %s, room: %s, reason: \"%s\".",
@ -2304,7 +2304,7 @@ _cmd_nick(gchar **args, struct cmd_help_t help)
return TRUE; return TRUE;
} }
char *room = win_current_get_recipient(); char *room = ui_current_win_recipient();
char *nick = args[0]; char *nick = args[0];
presence_change_room_nick(room, nick); presence_change_room_nick(room, nick);
@ -2330,7 +2330,7 @@ _cmd_tiny(gchar **args, struct cmd_help_t help)
if (tiny != NULL) { if (tiny != NULL) {
if (win_type == WIN_CHAT) { if (win_type == WIN_CHAT) {
char *recipient = win_current_get_recipient(); char *recipient = ui_current_win_recipient();
message_send(tiny, recipient); message_send(tiny, recipient);
if (prefs_get_boolean(PREF_CHLOG)) { if (prefs_get_boolean(PREF_CHLOG)) {
@ -2343,12 +2343,12 @@ _cmd_tiny(gchar **args, struct cmd_help_t help)
win_show_outgoing_msg("me", recipient, tiny); win_show_outgoing_msg("me", recipient, tiny);
free(recipient); free(recipient);
} else if (win_type == WIN_PRIVATE) { } else if (win_type == WIN_PRIVATE) {
char *recipient = win_current_get_recipient(); char *recipient = ui_current_win_recipient();
message_send(tiny, recipient); message_send(tiny, recipient);
win_show_outgoing_msg("me", recipient, tiny); win_show_outgoing_msg("me", recipient, tiny);
free(recipient); free(recipient);
} else { // groupchat } else { // groupchat
char *recipient = win_current_get_recipient(); char *recipient = ui_current_win_recipient();
message_send_groupchat(tiny, recipient); message_send_groupchat(tiny, recipient);
free(recipient); free(recipient);
} }
@ -2385,12 +2385,12 @@ _cmd_close(gchar **args, struct cmd_help_t help)
// handle leaving rooms, or chat // handle leaving rooms, or chat
if (conn_status == JABBER_CONNECTED) { if (conn_status == JABBER_CONNECTED) {
if (win_type == WIN_MUC) { if (win_type == WIN_MUC) {
char *room_jid = win_current_get_recipient(); char *room_jid = ui_current_win_recipient();
presence_leave_chat_room(room_jid); presence_leave_chat_room(room_jid);
} else if ((win_type == WIN_CHAT) || (win_type == WIN_PRIVATE)) { } else if ((win_type == WIN_CHAT) || (win_type == WIN_PRIVATE)) {
if (prefs_get_boolean(PREF_STATES)) { if (prefs_get_boolean(PREF_STATES)) {
char *recipient = win_current_get_recipient(); char *recipient = ui_current_win_recipient();
// send <gone/> chat state before closing // send <gone/> chat state before closing
if (chat_session_get_recipient_supports(recipient)) { if (chat_session_get_recipient_supports(recipient)) {

2
src/profanity.c
View File

@ -393,7 +393,7 @@ prof_handle_activity(void)
jabber_conn_status_t status = jabber_get_connection_status(); jabber_conn_status_t status = jabber_get_connection_status();
if ((status == JABBER_CONNECTED) && (win_type == WIN_CHAT)) { if ((status == JABBER_CONNECTED) && (win_type == WIN_CHAT)) {
char *recipient = win_current_get_recipient(); char *recipient = ui_current_win_recipient();
chat_session_set_composing(recipient); chat_session_set_composing(recipient);
if (!chat_session_get_sent(recipient) || if (!chat_session_get_sent(recipient) ||
chat_session_is_paused(recipient)) { chat_session_is_paused(recipient)) {

8
src/ui/core.c
View File

@ -543,7 +543,7 @@ ui_current_win_type(void)
} }
char * char *
win_current_get_recipient(void) ui_current_win_recipient(void)
{ {
return strdup(current->from); return strdup(current->from);
} }
@ -1044,7 +1044,7 @@ win_show_room_broadcast(const char * const room_jid, const char * const message)
void void
win_show_status(void) win_show_status(void)
{ {
char *recipient = win_current_get_recipient(); char *recipient = ui_current_win_recipient();
PContact pcontact = contact_list_get_contact(recipient); PContact pcontact = contact_list_get_contact(recipient);
if (pcontact != NULL) { if (pcontact != NULL) {
@ -1057,7 +1057,7 @@ win_show_status(void)
void void
win_private_show_status(void) win_private_show_status(void)
{ {
Jid *jid = jid_create(win_current_get_recipient()); Jid *jid = jid_create(ui_current_win_recipient());
PContact pcontact = muc_get_participant(jid->barejid, jid->resourcepart); PContact pcontact = muc_get_participant(jid->barejid, jid->resourcepart);
@ -1073,7 +1073,7 @@ win_private_show_status(void)
void void
win_room_show_status(const char * const contact) win_room_show_status(const char * const contact)
{ {
PContact pcontact = muc_get_participant(win_current_get_recipient(), contact); PContact pcontact = muc_get_participant(ui_current_win_recipient(), contact);
if (pcontact != NULL) { if (pcontact != NULL) {
window_show_contact(current, pcontact); window_show_contact(current, pcontact);

2
src/ui/ui.h
View File

@ -87,7 +87,7 @@ void title_bar_draw(void);
void ui_close_current(void); void ui_close_current(void);
void ui_clear_current(void); void ui_clear_current(void);
win_type_t ui_current_win_type(void); win_type_t ui_current_win_type(void);
char* win_current_get_recipient(void); char* ui_current_win_recipient(void);
void win_current_show(const char * const msg, ...); void win_current_show(const char * const msg, ...);
void win_current_bad_show(const char * const msg); void win_current_bad_show(const char * const msg);
void win_current_page_off(void); void win_current_page_off(void);