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 roster_jid_from_handle -> roster_barejid_from_handle

Browse Source
This commit is contained in:
James Booth 2013-05-21 20:50:05 +01:00
parent 58bd4f2547
commit d16a31d096
4 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/command/command.c
View File

@ -1973,7 +1973,7 @@ _cmd_msg(gchar **args, struct cmd_help_t help)
return TRUE; return TRUE;
} else { } else {
char *usr_jid = roster_jid_from_handle(usr); char *usr_jid = roster_barejid_from_handle(usr);
if (msg != NULL) { if (msg != NULL) {
message_send(msg, usr_jid); message_send(msg, usr_jid);
ui_outgoing_msg("me", usr_jid, msg); ui_outgoing_msg("me", usr_jid, msg);
@ -2105,7 +2105,7 @@ _cmd_status(gchar **args, struct cmd_help_t help)
break; break;
case WIN_CONSOLE: case WIN_CONSOLE:
if (usr != NULL) { if (usr != NULL) {
usr_jid = roster_jid_from_handle(usr); usr_jid = roster_barejid_from_handle(usr);
if (usr_jid == NULL) { if (usr_jid == NULL) {
usr_jid = usr; usr_jid = usr;
} }
@ -2178,7 +2178,7 @@ _cmd_info(gchar **args, struct cmd_help_t help)
break; break;
case WIN_CONSOLE: case WIN_CONSOLE:
if (usr != NULL) { if (usr != NULL) {
usr_jid = roster_jid_from_handle(usr); usr_jid = roster_barejid_from_handle(usr);
if (usr_jid == NULL) { if (usr_jid == NULL) {
usr_jid = usr; usr_jid = usr;
} }

4
src/xmpp/message.c
View File

@ -62,8 +62,8 @@ message_send(const char * const msg, const char * const recipient)
{ {
const char * jid = NULL; const char * jid = NULL;
if (roster_jid_from_handle(recipient) != NULL) { if (roster_barejid_from_handle(recipient) != NULL) {
jid = roster_jid_from_handle(recipient); jid = roster_barejid_from_handle(recipient);
} else { } else {
jid = recipient; jid = recipient;
} }

12
src/xmpp/roster.c
View File

@ -40,12 +40,22 @@ static int _roster_handle_set(xmpp_conn_t * const conn,
static int _roster_handle_result(xmpp_conn_t * const conn, static int _roster_handle_result(xmpp_conn_t * const conn,
xmpp_stanza_t * const stanza, void * const userdata); xmpp_stanza_t * const stanza, void * const userdata);
// nicknames
static Autocomplete handle_ac; static Autocomplete handle_ac;
// barejids
static Autocomplete jid_ac; static Autocomplete jid_ac;
// fulljids
static Autocomplete resource_ac; static Autocomplete resource_ac;
// contacts, indexed on barejid
static GHashTable *contacts; static GHashTable *contacts;
// nickname to jid map
static GHashTable *handle_to_jid; static GHashTable *handle_to_jid;
// helper functions
static gboolean _key_equals(void *key1, void *key2); static gboolean _key_equals(void *key1, void *key2);
static gboolean _datetimes_equal(GDateTime *dt1, GDateTime *dt2); static gboolean _datetimes_equal(GDateTime *dt1, GDateTime *dt2);
@ -69,7 +79,7 @@ roster_request(void)
} }
char * char *
roster_jid_from_handle(const char * const handle) roster_barejid_from_handle(const char * const handle)
{ {
return g_hash_table_lookup(handle_to_jid, handle); return g_hash_table_lookup(handle_to_jid, handle);
} }

2
src/xmpp/xmpp.h
View File

@ -142,6 +142,6 @@ gboolean roster_add(const char * const barejid, const char * const name,
const char * const subscription, const char * const offline_message, const char * const subscription, const char * const offline_message,
gboolean pending_out); gboolean pending_out);
void roster_change_handle(const char * const barejid, const char * const handle); void roster_change_handle(const char * const barejid, const char * const handle);
char * roster_jid_from_handle(const char * const handle); char * roster_barejid_from_handle(const char * const handle);
#endif #endif