Include a Other Software section in Help file

[geeqie.git] / src / search.c

diff --git a/src/search.c b/src/search.c
index 38c10b0..1b8da57 100644 (file)
--- a/src/search.c
+++ b/src/search.c
@@ -447,6 +447,7 @@ static gint search_result_find_row(SearchData *sd, FileData *fd, GtkTreeIter *it
        return -1;
 }
 
+
 static gboolean search_result_row_selected(SearchData *sd, FileData *fd)
 {
        GtkTreeModel *store;
@@ -469,7 +470,7 @@ static gboolean search_result_row_selected(SearchData *sd, FileData *fd)
                if (mfd_n->fd == fd) found = TRUE;
                work = work->next;
                }
-       g_list_foreach(slist, (GFunc)gtk_tree_path_free, NULL);
+       g_list_foreach(slist, (GFunc)tree_path_free_wrapper, NULL);
        g_list_free(slist);
 
        return found;
@@ -508,7 +509,7 @@ static gint search_result_selection_util(SearchData *sd, gint64 *bytes, GList **
 
                work = work->next;
                }
-       g_list_foreach(slist, (GFunc)gtk_tree_path_free, NULL);
+       g_list_foreach(slist, (GFunc)tree_path_free_wrapper, NULL);
        g_list_free(slist);
 
        if (bytes) *bytes = total;
@@ -726,7 +727,7 @@ static void search_result_remove_selection(SearchData *sd)
                flist = g_list_prepend(flist, mfd->fd);
                work = work->next;
                }
-       g_list_foreach(slist, (GFunc)gtk_tree_path_free, NULL);
+       g_list_foreach(slist, (GFunc)tree_path_free_wrapper, NULL);
        g_list_free(slist);
 
        work = flist;
@@ -1315,6 +1316,7 @@ static gboolean search_result_release_cb(GtkWidget *widget, GdkEventButton *beve
        return FALSE;
 }
 
+
 static gboolean search_result_keypress_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
        SearchData *sd = data;
@@ -1339,7 +1341,7 @@ static gboolean search_result_keypress_cb(GtkWidget *widget, GdkEventKey *event,
                gtk_tree_model_get_iter(store, &iter, tpath);
                gtk_tree_model_get(store, &iter, SEARCH_COLUMN_POINTER, &mfd, -1);
                }
-       g_list_foreach(slist, (GFunc)gtk_tree_path_free, NULL);
+       g_list_foreach(slist, (GFunc)tree_path_free_wrapper, NULL);
        g_list_free(slist);
 
        if (event->state & GDK_CONTROL_MASK)
@@ -1738,7 +1740,7 @@ static void search_file_load_process(SearchData *sd, CacheData *cd)
 
        pixbuf = image_loader_get_pixbuf(sd->img_loader);
 
-       /* Used to determnine if image is broken
+       /* Used to determine if image is broken
         */
        if (cd && !pixbuf)
                {
@@ -1826,7 +1828,7 @@ static gboolean search_file_do_extra(SearchData *sd, FileData *fd, gint *match,
 
        if (new_data)
                {
-               if ((sd->match_dimensions_enable && !sd->img_cd->dimensions) || (sd->match_similarity_enable && !sd->img_cd->similarity || sd->match_broken_enable))
+               if ((sd->match_dimensions_enable && !sd->img_cd->dimensions) || (sd->match_similarity_enable && !sd->img_cd->similarity) || sd->match_broken_enable)
                        {
                        sd->img_loader = image_loader_new(fd);
                        g_signal_connect(G_OBJECT(sd->img_loader), "error", (GCallback)search_file_load_done_cb, sd);
@@ -1890,7 +1892,7 @@ static gboolean search_file_do_extra(SearchData *sd, FileData *fd, gint *match,
                tmatch = FALSE;
                tested = TRUE;
 
-               /* fixme: implement similarity checking */
+               /** @FIXME implement similarity checking */
                if (sd->search_similarity_cd && sd->search_similarity_cd->similarity)
                        {
                        gdouble result;
@@ -2272,6 +2274,7 @@ static gboolean search_file_next(SearchData *sd)
                        if (fd->format_class == FORMAT_CLASS_IMAGE || fd->format_class == FORMAT_CLASS_RAWIMAGE || fd->format_class == FORMAT_CLASS_VIDEO || fd->format_class == FORMAT_CLASS_DOCUMENT)
                                {
                                sd->match_broken_enable = TRUE;
+                               match = TRUE;
                                }
                        else
                                {
@@ -2387,7 +2390,7 @@ static gboolean search_file_next(SearchData *sd)
                        }
                }
 
-       if (((match || extra_only) && sd->match_dimensions_enable || sd->match_similarity_enable || sd->match_broken_enable))
+       if ((match || extra_only) && (sd->match_dimensions_enable || sd->match_similarity_enable || sd->match_broken_enable))
                {
                tested = TRUE;
 
@@ -3243,7 +3246,7 @@ static void select_collection_dialog_ok_cb(FileDialog *fdlg, gpointer data)
        g_free(collection);
 }
 
-static gboolean select_collection_clicked_cb(GtkWidget *widget, gpointer data)
+static void select_collection_clicked_cb(GtkWidget *widget, gpointer data)
 {
        SearchData *sd = data;
        FileDialog *fdlg;