keyword_list_find() -> find_string_in_list(), return gboolean.

diff --git a/src/bar_info.c b/src/bar_info.c
index 145129a..b3408bb 100644 (file)
--- a/src/bar_info.c
+++ b/src/bar_info.c
@@ -471,7 +471,7 @@ static void bar_keyword_list_sync(BarInfoData *bd, GList *keywords)
                gchar *key = list->data;
 
                gtk_list_store_append(store, &iter);
-               gtk_list_store_set(store, &iter, KEYWORD_COLUMN_TOGGLE, keyword_list_find(keywords, key),
+               gtk_list_store_set(store, &iter, KEYWORD_COLUMN_TOGGLE, find_string_in_list(keywords, key),
                                                 KEYWORD_COLUMN_TEXT, key, -1);
 
                list = list->prev;
@@ -589,7 +589,7 @@ static void bar_info_keyword_set(BarInfoData *bd, const gchar *keyword, gint act
        if (!keyword) return;
 
        list = keyword_list_pull(bd->keyword_view);
-       found = keyword_list_find(list, keyword);
+       found = find_string_in_list(list, keyword);
 
        if (active != found)
                {

diff --git a/src/metadata.c b/src/metadata.c
index 42051c2..f110188 100644 (file)
--- a/src/metadata.c
+++ b/src/metadata.c
@@ -519,13 +519,13 @@ void metadata_set(FileData *fd, GList *keywords_to_use, gchar *comment_to_use, g
        g_free(comment);
 }
 
-gint keyword_list_find(GList *list, const gchar *keyword)
+gboolean find_string_in_list(GList *list, const gchar *string)
 {
        while (list)
                {
                gchar *haystack = list->data;
 
-               if (haystack && keyword && strcmp(haystack, keyword) == 0) return TRUE;
+               if (haystack && string && strcmp(haystack, string) == 0) return TRUE;
 
                list = list->next;
                }
@@ -562,7 +562,7 @@ GList *string_to_keywords_list(const gchar *text)
                        gchar *keyword = g_strndup(begin, l);
 
                        /* only add if not already in the list */
-                       if (keyword_list_find(list, keyword) == FALSE)
+                       if (find_string_in_list(list, keyword) == FALSE)
                                list = g_list_append(list, keyword);
                        else
                                g_free(keyword);

diff --git a/src/metadata.h b/src/metadata.h
index 8fd9125..0e0e4ab 100644 (file)
--- a/src/metadata.h
+++ b/src/metadata.h
@@ -19,7 +19,7 @@ gint metadata_write(FileData *fd, GList *keywords, const gchar *comment);
 gint metadata_read(FileData *fd, GList **keywords, gchar **comment);
 
 void metadata_set(FileData *fd, GList *keywords_to_use, gchar *comment_to_use, gboolean append);
-gint keyword_list_find(GList *list, const gchar *keyword);
+gboolean find_string_in_list(GList *list, const gchar *keyword);
 GList *string_to_keywords_list(const gchar *text);
 
 #endif