From 9f7a8cea81256d8815c6a1d56e6adcf29ef846f5 Mon Sep 17 00:00:00 2001 From: James Booth Date: Sun, 21 Sep 2014 23:21:48 +0100 Subject: [PATCH] Show message when no capabilities available --- src/ui/console.c | 15 +++++++++------ src/xmpp/capabilities.c | 2 -- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/ui/console.c b/src/ui/console.c index 1bf76aa9..49e51912 100644 --- a/src/ui/console.c +++ b/src/ui/console.c @@ -286,15 +286,15 @@ _cons_show_caps(const char * const fulljid, Resource *resource) { ProfWin *console = wins_get_console(); cons_show(""); - const char *resource_presence = string_from_resource_presence(resource->presence); - - int presence_colour = win_presence_colour(resource_presence); - win_save_vprint(console, '-', NULL, NO_EOL, presence_colour, "", "%s", fulljid); - win_save_print(console, '-', NULL, NO_DATE, 0, "", ":"); Capabilities *caps = caps_lookup(fulljid); - if (caps) { + const char *resource_presence = string_from_resource_presence(resource->presence); + + int presence_colour = win_presence_colour(resource_presence); + win_save_vprint(console, '-', NULL, NO_EOL, presence_colour, "", "%s", fulljid); + win_save_print(console, '-', NULL, NO_DATE, 0, "", ":"); + // show identity if ((caps->category != NULL) || (caps->type != NULL) || (caps->name != NULL)) { win_save_print(console, '-', NULL, NO_EOL, 0, "", "Identity: "); @@ -342,6 +342,9 @@ _cons_show_caps(const char * const fulljid, Resource *resource) feature = g_slist_next(feature); } } + + } else { + cons_show("No capabilities found for %s", fulljid); } cons_alert(); diff --git a/src/xmpp/capabilities.c b/src/xmpp/capabilities.c index 51ba6a98..50e068ef 100644 --- a/src/xmpp/capabilities.c +++ b/src/xmpp/capabilities.c @@ -199,9 +199,7 @@ caps_create_sha1_str(xmpp_stanza_t * const query) curr = g_slist_next(curr); } - log_debug("Generating capabilities hash for: %s", s->str); char *result = p_sha1_hash(s->str); - log_debug("Hash: %s", result); g_string_free(s, TRUE); g_slist_free_full(identities, g_free);