aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Merge branch 'master' into plugins

Browse Source
This commit is contained in:
James Booth 2014-04-13 02:28:36 +01:00
commit 883696c58c
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/xmpp/bookmark.c
View File

@ -128,25 +128,22 @@ _bookmark_remove(const char *jid, gboolean autojoin)
_bookmark_item_destroy(item); _bookmark_item_destroy(item);
gboolean removed = found != NULL; gboolean removed = found != NULL;
if (removed) {
// set autojoin FALSE // set autojoin FALSE
if (autojoin) { if (autojoin) {
if (found != NULL) {
Bookmark *bookmark = found->data; Bookmark *bookmark = found->data;
bookmark->autojoin = FALSE; bookmark->autojoin = FALSE;
g_list_free(found);
}
// remove bookmark // remove bookmark
} else { } else {
if (found != NULL) {
bookmark_list = g_list_remove_link(bookmark_list, found); bookmark_list = g_list_remove_link(bookmark_list, found);
_bookmark_item_destroy(found->data); _bookmark_item_destroy(found->data);
g_list_free(found); g_list_free(found);
}
autocomplete_remove(bookmark_ac, jid); autocomplete_remove(bookmark_ac, jid);
} }
_send_bookmarks(); _send_bookmarks();
}
return removed; return removed;
} }