aniani/profanity
1
1
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-02-02 15:08:15 -05:00
Code

Renamed roster_change_handle -> roster_change_name

Browse Source
This commit is contained in:
James Booth 2013-05-21 21:18:12 +01:00
parent f4a3dd84ea
commit 5a8e667e58
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/command/command.c
View File

@ -2001,7 +2001,7 @@ _cmd_roster(gchar **args, struct cmd_help_t help)
return TRUE; return TRUE;
} else { } else {
char *jid = args[1]; char *jid = args[1];
char *handle = args[2]; char *name = args[2];
jabber_conn_status_t conn_status = jabber_get_connection_status(); jabber_conn_status_t conn_status = jabber_get_connection_status();
if (conn_status != JABBER_CONNECTED) { if (conn_status != JABBER_CONNECTED) {
@ -2016,12 +2016,12 @@ _cmd_roster(gchar **args, struct cmd_help_t help)
return TRUE; return TRUE;
} }
roster_change_handle(jid, handle); roster_change_name(jid, name);
if (handle == NULL) { if (name == NULL) {
cons_show("Nickname for %s removed.", jid); cons_show("Nickname for %s removed.", jid);
} else { } else {
cons_show("Nickname for %s set to: %s.", jid, handle); cons_show("Nickname for %s set to: %s.", jid, name);
} }
return TRUE; return TRUE;
} }

32
src/xmpp/roster.c
View File

@ -271,43 +271,43 @@ roster_contact_offline(const char * const barejid,
} }
void void
roster_change_handle(const char * const barejid, const char * const new_handle) roster_change_name(const char * const barejid, const char * const new_name)
{ {
PContact contact = g_hash_table_lookup(contacts, barejid); PContact contact = g_hash_table_lookup(contacts, barejid);
const char * current_handle = NULL; const char * current_name = NULL;
if (p_contact_name(contact) != NULL) { if (p_contact_name(contact) != NULL) {
current_handle = strdup(p_contact_name(contact)); current_name = strdup(p_contact_name(contact));
} }
if (contact != NULL) { if (contact != NULL) {
p_contact_set_name(contact, new_handle); p_contact_set_name(contact, new_name);
// current handle exists already // current name exists already
if (current_handle != NULL) { if (current_name != NULL) {
autocomplete_remove(name_ac, current_handle); autocomplete_remove(name_ac, current_name);
g_hash_table_remove(name_to_barejid, current_handle); g_hash_table_remove(name_to_barejid, current_name);
if (new_handle != NULL) { if (new_name != NULL) {
autocomplete_add(name_ac, strdup(new_handle)); autocomplete_add(name_ac, strdup(new_name));
g_hash_table_insert(name_to_barejid, strdup(new_handle), strdup(barejid)); g_hash_table_insert(name_to_barejid, strdup(new_name), strdup(barejid));
} else { } else {
autocomplete_add(name_ac, strdup(barejid)); autocomplete_add(name_ac, strdup(barejid));
g_hash_table_insert(name_to_barejid, strdup(barejid), strdup(barejid)); g_hash_table_insert(name_to_barejid, strdup(barejid), strdup(barejid));
} }
// no current handle // no current name
} else { } else {
if (new_handle != NULL) { if (new_name != NULL) {
autocomplete_remove(name_ac, barejid); autocomplete_remove(name_ac, barejid);
g_hash_table_remove(name_to_barejid, barejid); g_hash_table_remove(name_to_barejid, barejid);
autocomplete_add(name_ac, strdup(new_handle)); autocomplete_add(name_ac, strdup(new_name));
g_hash_table_insert(name_to_barejid, strdup(new_handle), strdup(barejid)); g_hash_table_insert(name_to_barejid, strdup(new_name), strdup(barejid));
} }
} }
xmpp_conn_t * const conn = connection_get_conn(); xmpp_conn_t * const conn = connection_get_conn();
xmpp_ctx_t * const ctx = connection_get_ctx(); xmpp_ctx_t * const ctx = connection_get_ctx();
xmpp_stanza_t *iq = stanza_create_roster_set(ctx, barejid, new_handle); xmpp_stanza_t *iq = stanza_create_roster_set(ctx, barejid, new_name);
xmpp_send(conn, iq); xmpp_send(conn, iq);
xmpp_stanza_release(iq); xmpp_stanza_release(iq);
} }

2
src/xmpp/xmpp.h
View File

@ -141,7 +141,7 @@ char * roster_find_resource(char *search_str);
gboolean roster_add(const char * const barejid, const char * const name, 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_name(const char * const barejid, const char * const new_name);
char * roster_barejid_from_name(const char * const name); char * roster_barejid_from_name(const char * const name);
#endif #endif