diff options
author | James Booth <boothj5@gmail.com> | 2014-04-13 02:05:12 +0100 |
---|---|---|
committer | James Booth <boothj5@gmail.com> | 2014-04-13 02:05:12 +0100 |
commit | f62cf772a77c2e71c73833aa7e858376f8eaf9a0 (patch) | |
tree | 5ce8bdfe339dd180147a276efa8722fa845f7aad | |
parent | 73c146c65ae8e2a5751d3f3138c5b8dc80379bef (diff) | |
download | profani-tty-f62cf772a77c2e71c73833aa7e858376f8eaf9a0.tar.gz |
Refactored bookmark_remove
Issue #194
-rw-r--r-- | src/xmpp/bookmark.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/xmpp/bookmark.c b/src/xmpp/bookmark.c index 2734b7c1..29847392 100644 --- a/src/xmpp/bookmark.c +++ b/src/xmpp/bookmark.c @@ -128,25 +128,23 @@ _bookmark_remove(const char *jid, gboolean autojoin) _bookmark_item_destroy(item); gboolean removed = found != NULL; - // set autojoin FALSE - if (autojoin) { - if (found != NULL) { + if (removed) { + // set autojoin FALSE + if (autojoin) { Bookmark *bookmark = found->data; bookmark->autojoin = FALSE; g_list_free(found); - } - // remove bookmark - } else { - if (found != NULL) { + // remove bookmark + } else { bookmark_list = g_list_remove_link(bookmark_list, found); _bookmark_item_destroy(found->data); g_list_free(found); + autocomplete_remove(bookmark_ac, jid); } - autocomplete_remove(bookmark_ac, jid); - } - _send_bookmarks(); + _send_bookmarks(); + } return removed; } |