diff options
author | James Booth <boothj5@gmail.com> | 2014-02-02 00:49:02 +0000 |
---|---|---|
committer | James Booth <boothj5@gmail.com> | 2014-02-02 00:49:02 +0000 |
commit | 92b85bb7f121dd5ad852b9c0702e9fccc4ef6d18 (patch) | |
tree | 58b727a02052ee3fde4fd1a15f39decbfe74c52d /src | |
parent | a8ecbccc9c29a4d9b0ba21fa0a7b6e804f226626 (diff) | |
download | profani-tty-92b85bb7f121dd5ad852b9c0702e9fccc4ef6d18.tar.gz |
Added message when bookmark updated
Diffstat (limited to 'src')
-rw-r--r-- | src/command/commands.c | 28 | ||||
-rw-r--r-- | src/xmpp/bookmark.c | 4 | ||||
-rw-r--r-- | src/xmpp/xmpp.h | 2 |
3 files changed, 20 insertions, 14 deletions
diff --git a/src/command/commands.c b/src/command/commands.c index f28bea4c..d07d15cc 100644 --- a/src/command/commands.c +++ b/src/command/commands.c @@ -1763,19 +1763,23 @@ cmd_bookmark(gchar **args, struct cmd_help_t help) } if (strcmp(cmd, "add") == 0) { - bookmark_add(jid, nick, autojoin); - GString *msg = g_string_new("Bookmark added for "); - g_string_append(msg, jid); - if (nick != NULL) { - g_string_append(msg, ", nickname: "); - g_string_append(msg, nick); - } - if (autojoin) { - g_string_append(msg, ", autojoin enabled"); + gboolean added = bookmark_add(jid, nick, autojoin); + if (added) { + GString *msg = g_string_new("Bookmark added for "); + g_string_append(msg, jid); + if (nick != NULL) { + g_string_append(msg, ", nickname: "); + g_string_append(msg, nick); + } + if (autojoin) { + g_string_append(msg, ", autojoin enabled"); + } + g_string_append(msg, "."); + cons_show(msg->str); + g_string_free(msg, TRUE); + } else { + cons_show("Bookmark updated for %s.", jid); } - g_string_append(msg, "."); - cons_show(msg->str); - g_string_free(msg, TRUE); } else if (strcmp(cmd, "remove") == 0) { bookmark_remove(jid, autojoin); if (autojoin) { diff --git a/src/xmpp/bookmark.c b/src/xmpp/bookmark.c index 726772a2..11fe95c8 100644 --- a/src/xmpp/bookmark.c +++ b/src/xmpp/bookmark.c @@ -58,7 +58,7 @@ bookmark_request(void) xmpp_stanza_release(iq); } -static void +static gboolean _bookmark_add(const char *jid, const char *nick, gboolean autojoin) { /* TODO: send request */ @@ -67,6 +67,8 @@ _bookmark_add(const char *jid, const char *nick, gboolean autojoin) /* this may be command for modifying */ autocomplete_remove(bookmark_ac, jid); autocomplete_add(bookmark_ac, jid); + + return FALSE; } static void diff --git a/src/xmpp/xmpp.h b/src/xmpp/xmpp.h index dd91e398..31ddfccd 100644 --- a/src/xmpp/xmpp.h +++ b/src/xmpp/xmpp.h @@ -132,7 +132,7 @@ void (*iq_set_autoping)(int seconds); Capabilities* (*caps_get)(const char * const caps_str); void (*caps_close)(void); -void (*bookmark_add)(const char *jid, const char *nick, gboolean autojoin); +gboolean (*bookmark_add)(const char *jid, const char *nick, gboolean autojoin); void (*bookmark_remove)(const char *jid, gboolean autojoin); const GList * (*bookmark_get_list)(void); char * (*bookmark_find)(char *search_str); |