diff options
| author | James Booth <boothj5@gmail.com> | 2013-05-21 21:12:00 +0100 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2013-05-21 21:12:00 +0100 |
| commit | f4a3dd84ea0ab2baa3899d9cc1e15d04969b7e63 (patch) | |
| tree | 339f3d2a7dec30f597edcfc22a51c0a888296e8a /src | |
| parent | 8e4dd4b80fd363712bffd35fd465bfed80903e9e (diff) | |
| download | profani-tty-f4a3dd84ea0ab2baa3899d9cc1e15d04969b7e63.tar.gz | |
Renamed roster_barejid_from_handle -> roster_barejid_from_name
Diffstat (limited to 'src')
| -rw-r--r-- | src/command/command.c | 6 | ||||
| -rw-r--r-- | src/xmpp/message.c | 4 | ||||
| -rw-r--r-- | src/xmpp/roster.c | 4 | ||||
| -rw-r--r-- | src/xmpp/xmpp.h | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/command/command.c b/src/command/command.c index 3a6853be..cdcf8264 100644 --- a/src/command/command.c +++ b/src/command/command.c @@ -1973,7 +1973,7 @@ _cmd_msg(gchar **args, struct cmd_help_t help) return TRUE; } else { - char *usr_jid = roster_barejid_from_handle(usr); + char *usr_jid = roster_barejid_from_name(usr); if (msg != NULL) { message_send(msg, usr_jid); ui_outgoing_msg("me", usr_jid, msg); @@ -2105,7 +2105,7 @@ _cmd_status(gchar **args, struct cmd_help_t help) break; case WIN_CONSOLE: if (usr != NULL) { - usr_jid = roster_barejid_from_handle(usr); + usr_jid = roster_barejid_from_name(usr); if (usr_jid == NULL) { usr_jid = usr; } @@ -2178,7 +2178,7 @@ _cmd_info(gchar **args, struct cmd_help_t help) break; case WIN_CONSOLE: if (usr != NULL) { - usr_jid = roster_barejid_from_handle(usr); + usr_jid = roster_barejid_from_name(usr); if (usr_jid == NULL) { usr_jid = usr; } diff --git a/src/xmpp/message.c b/src/xmpp/message.c index 8a390039..6e7ece0a 100644 --- a/src/xmpp/message.c +++ b/src/xmpp/message.c @@ -62,8 +62,8 @@ message_send(const char * const msg, const char * const recipient) { const char * jid = NULL; - if (roster_barejid_from_handle(recipient) != NULL) { - jid = roster_barejid_from_handle(recipient); + if (roster_barejid_from_name(recipient) != NULL) { + jid = roster_barejid_from_name(recipient); } else { jid = recipient; } diff --git a/src/xmpp/roster.c b/src/xmpp/roster.c index 500e8b89..85d7a2db 100644 --- a/src/xmpp/roster.c +++ b/src/xmpp/roster.c @@ -79,9 +79,9 @@ roster_request(void) } char * -roster_barejid_from_handle(const char * const handle) +roster_barejid_from_name(const char * const name) { - return g_hash_table_lookup(name_to_barejid, handle); + return g_hash_table_lookup(name_to_barejid, name); } static int diff --git a/src/xmpp/xmpp.h b/src/xmpp/xmpp.h index 91ee844e..7a05df0f 100644 --- a/src/xmpp/xmpp.h +++ b/src/xmpp/xmpp.h @@ -142,6 +142,6 @@ gboolean roster_add(const char * const barejid, const char * const name, const char * const subscription, const char * const offline_message, gboolean pending_out); void roster_change_handle(const char * const barejid, const char * const handle); -char * roster_barejid_from_handle(const char * const handle); +char * roster_barejid_from_name(const char * const name); #endif |