mirror of
https://github.com/profanity-im/profanity.git
synced 2024-12-04 14:46:46 -05:00
Merge branch 'master' into plugins
This commit is contained in:
commit
883696c58c
@ -128,25 +128,22 @@ _bookmark_remove(const char *jid, gboolean autojoin)
|
||||
_bookmark_item_destroy(item);
|
||||
gboolean removed = found != NULL;
|
||||
|
||||
if (removed) {
|
||||
// set autojoin FALSE
|
||||
if (autojoin) {
|
||||
if (found != NULL) {
|
||||
Bookmark *bookmark = found->data;
|
||||
bookmark->autojoin = FALSE;
|
||||
g_list_free(found);
|
||||
}
|
||||
|
||||
// remove bookmark
|
||||
} else {
|
||||
if (found != NULL) {
|
||||
bookmark_list = g_list_remove_link(bookmark_list, found);
|
||||
_bookmark_item_destroy(found->data);
|
||||
g_list_free(found);
|
||||
}
|
||||
autocomplete_remove(bookmark_ac, jid);
|
||||
}
|
||||
|
||||
_send_bookmarks();
|
||||
}
|
||||
|
||||
return removed;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user