Mercurial > geeqie
diff src/bar_keywords.c @ 1465:400ecfc3d8b1
do not add duplicate keywords from config file
| author | nadvornik |
|---|---|
| date | Fri, 20 Mar 2009 11:52:29 +0000 |
| parents | 1b3751ac4743 |
| children | 607c60506863 |
line wrap: on
line diff
--- a/src/bar_keywords.c Fri Mar 20 10:12:29 2009 +0000 +++ b/src/bar_keywords.c Fri Mar 20 11:52:29 2009 +0000 @@ -535,7 +535,7 @@ } src_name = keyword_get_name(keyword_tree, src_kw_iter); - if (keyword_exists(keyword_tree, NULL, dest_kw_iter, src_name, FALSE)) + if (keyword_exists(keyword_tree, NULL, dest_kw_iter, src_name, FALSE, NULL)) { g_free(src_name); return FALSE; @@ -551,7 +551,7 @@ while (work) { gchar *keyword = work->data; - if (keyword_exists(keyword_tree, NULL, dest_kw_iter, keyword, FALSE)) + if (keyword_exists(keyword_tree, NULL, dest_kw_iter, keyword, FALSE, NULL)) { GList *next = work->next; g_free(keyword); @@ -781,7 +781,7 @@ if (cdd->edit_existing) { if (keywords && keywords->data && /* there should be one keyword */ - !keyword_exists(keyword_tree, NULL, &kw_iter, keywords->data, TRUE)) + !keyword_exists(keyword_tree, NULL, &kw_iter, keywords->data, TRUE, NULL)) { keyword_set(GTK_TREE_STORE(keyword_tree), &kw_iter, keywords->data, cdd->is_keyword); } @@ -793,7 +793,7 @@ while (work) { GtkTreeIter add; - if (keyword_exists(keyword_tree, NULL, have_dest ? &kw_iter : NULL, work->data, FALSE)) + if (keyword_exists(keyword_tree, NULL, have_dest ? &kw_iter : NULL, work->data, FALSE, NULL)) { work = work->next; continue;