diff options
| author | James Booth <boothj5@gmail.com> | 2013-05-21 22:00:42 +0100 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2013-05-21 22:00:42 +0100 |
| commit | 7b20d8d4f426e13e250687165ccb4c077b4ede5f (patch) | |
| tree | 477cddad7cb22a70b505e3b7ab284a995db16e26 /src/command | |
| parent | 5a8e667e5806d3850f02828fcf7aed8cf8ee3499 (diff) | |
| download | profani-tty-7b20d8d4f426e13e250687165ccb4c077b4ede5f.tar.gz | |
Refactored roster push handling
Diffstat (limited to 'src/command')
| -rw-r--r-- | src/command/command.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/command/command.c b/src/command/command.c index 84b7999a..840ce6a0 100644 --- a/src/command/command.c +++ b/src/command/command.c @@ -1122,7 +1122,7 @@ cmd_execute_default(const char * const inp) message_send(inp, recipient); if (prefs_get_boolean(PREF_CHLOG)) { - const char *jid = jabber_get_jid(); + const char *jid = jabber_get_fulljid(); Jid *jidp = jid_create(jid); chat_log_chat(jidp->barejid, recipient, inp, PROF_OUT_LOG, NULL); jid_destroy(jidp); @@ -1553,7 +1553,7 @@ static gboolean _cmd_disconnect(gchar **args, struct cmd_help_t help) { if (jabber_get_connection_status() == JABBER_CONNECTED) { - char *jid = strdup(jabber_get_jid()); + char *jid = strdup(jabber_get_fulljid()); prof_handle_disconnect(jid); free(jid); } else { @@ -1979,7 +1979,7 @@ _cmd_msg(gchar **args, struct cmd_help_t help) ui_outgoing_msg("me", usr_jid, msg); if (((win_type == WIN_CHAT) || (win_type == WIN_CONSOLE)) && prefs_get_boolean(PREF_CHLOG)) { - const char *jid = jabber_get_jid(); + const char *jid = jabber_get_fulljid(); Jid *jidp = jid_create(jid); chat_log_chat(jidp->barejid, usr_jid, msg, PROF_OUT_LOG, NULL); jid_destroy(jidp); @@ -2344,7 +2344,7 @@ _cmd_join(gchar **args, struct cmd_help_t help) char *nick = NULL; Jid *room_arg = jid_create(args[0]); GString *room_str = g_string_new(""); - Jid *my_jid = jid_create(jabber_get_jid()); + Jid *my_jid = jid_create(jabber_get_fulljid()); // full room jid supplied (room@server) if (room_arg->localpart != NULL) { @@ -2446,7 +2446,7 @@ _cmd_rooms(gchar **args, struct cmd_help_t help) } if (args[0] == NULL) { - Jid *jid = jid_create(jabber_get_jid()); + Jid *jid = jid_create(jabber_get_fulljid()); GString *conference_node = g_string_new("conference."); g_string_append(conference_node, strdup(jid->domainpart)); jid_destroy(jid); @@ -2473,7 +2473,7 @@ _cmd_disco(gchar **args, struct cmd_help_t help) if (args[1] != NULL) { jid = g_string_append(jid, args[1]); } else { - Jid *jidp = jid_create(jabber_get_jid()); + Jid *jidp = jid_create(jabber_get_fulljid()); jid = g_string_append(jid, strdup(jidp->domainpart)); jid_destroy(jidp); } @@ -2533,7 +2533,7 @@ _cmd_tiny(gchar **args, struct cmd_help_t help) message_send(tiny, recipient); if (prefs_get_boolean(PREF_CHLOG)) { - const char *jid = jabber_get_jid(); + const char *jid = jabber_get_fulljid(); Jid *jidp = jid_create(jid); chat_log_chat(jidp->barejid, recipient, tiny, PROF_OUT_LOG, NULL); jid_destroy(jidp); |