/*
* Geeqie
* (C) 2005 John Ellis
- * Copyright (C) 2008 The Geeqie Team
+ * Copyright (C) 2008 - 2012 The Geeqie Team
*
* Author: John Ellis
*
#include "main.h"
#include "search.h"
-#include "bar_info.h"
#include "cache.h"
#include "collect.h"
#include "collect-table.h"
#include "filedata.h"
#include "image-load.h"
#include "img-view.h"
-#include "info.h"
-#include "layout_image.h"
+#include "layout.h"
#include "menu.h"
#include "metadata.h"
#include "misc.h"
#include "uri_utils.h"
#include "utilops.h"
#include "window.h"
+#include "bar_keywords.h"
#include <gdk/gdkkeysyms.h> /* for keyboard values */
GtkWidget *entry_comment;
FileData *search_dir_fd;
- gint search_path_recurse;
+ gboolean search_path_recurse;
gchar *search_name;
- gint search_name_match_case;
+ gboolean search_name_match_case;
gint64 search_size;
gint64 search_size_end;
gint search_date_y;
CacheData *search_similarity_cd;
GList *search_keyword_list;
gchar *search_comment;
- gint search_comment_match_case;
+ gboolean search_comment_match_case;
MatchType search_type;
gint search_total;
gint search_buffer_count;
- gint search_idle_id;
- gint update_idle_id;
+ guint search_idle_id; /* event source id */
+ guint update_idle_id; /* event source id */
ImageLoader *img_loader;
CacheData *img_cd;
FileData *click_fd;
ThumbLoader *thumb_loader;
- gint thumb_enable;
+ gboolean thumb_enable;
FileData *thumb_fd;
};
t = search_result_count(sd, &t_bytes);
s = search_result_selection_count(sd, &s_bytes);
-
+
tt = text_from_size_abrev(t_bytes);
if (s > 0)
g_free(buf);
}
-static void search_progress_update(SearchData *sd, gint search, gdouble thumbs)
+static void search_progress_update(SearchData *sd, gboolean search, gdouble thumbs)
{
if (search || thumbs >= 0.0)
static gint search_result_find_row(SearchData *sd, FileData *fd, GtkTreeIter *iter)
{
GtkTreeModel *store;
- gint valid;
+ gboolean valid;
gint n = 0;
store = gtk_tree_view_get_model(GTK_TREE_VIEW(sd->result_view));
return -1;
}
-static gint search_result_row_selected(SearchData *sd, FileData *fd)
+static gboolean search_result_row_selected(SearchData *sd, FileData *fd)
{
GtkTreeModel *store;
GtkTreeSelection *selection;
GList *slist;
GList *work;
- gint found = FALSE;
+ gboolean found = FALSE;
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(sd->result_view));
slist = gtk_tree_selection_get_selected_rows(selection, &store);
{
GtkTreeModel *store;
GtkTreeIter iter;
- gint valid;
+ gboolean valid;
gint n = 0;
gint64 total = 0;
GList *plist = NULL;
GList *list = NULL;
GtkTreeModel *store;
GtkTreeIter iter;
- gint valid;
+ gboolean valid;
store = gtk_tree_view_get_model(GTK_TREE_VIEW(sd->result_view));
{
GtkTreeModel *store;
GtkTreeIter iter;
- gint valid;
+ gboolean valid;
store = gtk_tree_view_get_model(GTK_TREE_VIEW(sd->result_view));
valid = gtk_tree_model_get_iter_first(store, &iter);
search_status_update(sd);
}
-static void search_result_edit_selected(SearchData *sd, gint n)
+static void search_result_edit_selected(SearchData *sd, const gchar *key)
{
- GList *list;
-
- list = search_result_selection_list(sd);
- file_util_start_editor_from_filelist(n, list, sd->window);
- filelist_free(list);
+ file_util_start_editor_from_filelist(key, search_result_selection_list(sd), NULL, sd->window);
}
static void search_result_collection_from_selection(SearchData *sd)
filelist_free(list);
}
-static gint search_result_update_idle_cb(gpointer data)
+static gboolean search_result_update_idle_cb(gpointer data)
{
SearchData *sd = data;
search_status_update(sd);
- sd->update_idle_id = -1;
+ sd->update_idle_id = 0;
return FALSE;
}
static void search_result_update_idle_cancel(SearchData *sd)
{
- if (sd->update_idle_id != -1) g_source_remove(sd->update_idle_id);
- sd->update_idle_id = -1;
+ if (sd->update_idle_id)
+ {
+ g_source_remove(sd->update_idle_id);
+ sd->update_idle_id = 0;
+ }
}
static gboolean search_result_select_cb(GtkTreeSelection *selection, GtkTreeModel *store,
{
SearchData *sd = data;
- if (sd->update_idle_id == -1)
+ if (!sd->update_idle_id)
{
sd->update_idle_id = g_idle_add(search_result_update_idle_cb, sd);
}
GtkTreeModel *store;
GtkTreeIter iter;
MatchFileData *mfd = NULL;
- gint valid;
+ gboolean valid;
gint row = 0;
gint length = 0;
gtk_tree_view_column_set_fixed_width(column, (sd->thumb_enable) ? options->thumbnails.max_width : 4);
- list = gtk_tree_view_column_get_cell_renderers(column);
+ list = gtk_cell_layout_get_cells(GTK_CELL_LAYOUT(column));
if (!list) return;
cell = list->data;
g_list_free(list);
gtk_tree_view_columns_autosize(GTK_TREE_VIEW(sd->result_view));
}
-static void search_result_thumb_enable(SearchData *sd, gint enable)
+static void search_result_thumb_enable(SearchData *sd, gboolean enable)
{
if (sd->thumb_enable == enable) return;
{
GtkTreeModel *store;
GtkTreeIter iter;
- gint valid;
+ gboolean valid;
thumb_loader_free(sd->thumb_loader);
sd->thumb_loader = NULL;
{
SearchData *sd = data;
- if (sd->click_fd) layout_image_set_fd(NULL, sd->click_fd);
+ if (sd->click_fd) layout_set_fd(NULL, sd->click_fd);
}
static void sr_menu_viewnew_cb(GtkWidget *widget, gpointer data)
static void sr_menu_edit_cb(GtkWidget *widget, gpointer data)
{
SearchData *sd;
- gint n;
+ const gchar *key = data;
sd = submenu_item_get_data(widget);
- n = GPOINTER_TO_INT(data);
if (!sd) return;
- search_result_edit_selected(sd, n);
-}
-
-static void sr_menu_info_cb(GtkWidget *widget, gpointer data)
-{
- SearchData *sd = data;
-
- info_window_new(NULL, search_result_selection_list(sd), NULL);
+ search_result_edit_selected(sd, key);
}
static void sr_menu_collection_cb(GtkWidget *widget, gpointer data)
search_result_clear(sd);
}
-static GtkWidget *search_result_menu(SearchData *sd, gint on_row, gint empty)
+static void search_result_menu_destroy_cb(GtkWidget *widget, gpointer data)
+{
+ GList *editmenu_fd_list = data;
+
+ filelist_free(editmenu_fd_list);
+}
+
+static GtkWidget *search_result_menu(SearchData *sd, gboolean on_row, gboolean empty)
{
GtkWidget *menu;
GtkWidget *item;
+ GList *editmenu_fd_list;
menu = popup_menu_short_lived();
+
menu_item_add_sensitive(menu, _("_View"), on_row,
G_CALLBACK(sr_menu_view_cb), sd);
menu_item_add_stock_sensitive(menu, _("View in _new window"), GTK_STOCK_NEW, on_row,
menu_item_add_sensitive(menu, _("Select none"), !empty,
G_CALLBACK(sr_menu_select_none_cb), sd);
menu_item_add_divider(menu);
- submenu_add_edit(menu, &item, G_CALLBACK(sr_menu_edit_cb), sd);
+
+ editmenu_fd_list = search_result_selection_list(sd);
+ g_signal_connect(G_OBJECT(menu), "destroy",
+ G_CALLBACK(search_result_menu_destroy_cb), editmenu_fd_list);
+ submenu_add_edit(menu, &item, G_CALLBACK(sr_menu_edit_cb), sd, editmenu_fd_list);
if (!on_row) gtk_widget_set_sensitive(item, FALSE);
- menu_item_add_stock_sensitive(menu, _("_Properties"), GTK_STOCK_PROPERTIES, on_row,
- G_CALLBACK(sr_menu_info_cb), sd);
menu_item_add_stock_sensitive(menu, _("Add to new collection"), GTK_STOCK_INDEX, on_row,
G_CALLBACK(sr_menu_collection_cb), sd);
menu_item_add_stock_sensitive(menu, _("Print..."), GTK_STOCK_PRINT, on_row,
G_CALLBACK(sr_menu_rename_cb), sd);
menu_item_add_stock_sensitive(menu, _("_Delete..."), GTK_STOCK_DELETE, on_row,
G_CALLBACK(sr_menu_delete_cb), sd);
- if (options->show_copy_path)
- menu_item_add_sensitive(menu, _("_Copy path"), on_row,
- G_CALLBACK(sr_menu_copy_path_cb), sd);
+ menu_item_add_sensitive(menu, _("_Copy path"), on_row,
+ G_CALLBACK(sr_menu_copy_path_cb), sd);
menu_item_add_divider(menu);
menu_item_add_stock_sensitive(menu, _("Rem_ove"), GTK_STOCK_REMOVE, on_row,
G_CALLBACK(sr_menu_remove_cb), sd);
*-------------------------------------------------------------------
*/
-static gint search_result_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
+static gboolean search_result_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
{
SearchData *sd = data;
GtkTreeModel *store;
if (bevent->button == MOUSE_BUTTON_LEFT && bevent->type == GDK_2BUTTON_PRESS)
{
- layout_image_set_fd(NULL, mfd->fd);
+ layout_set_fd(NULL, mfd->fd);
}
if (bevent->button == MOUSE_BUTTON_MIDDLE) return TRUE;
return FALSE;
}
-static gint search_result_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
+static gboolean search_result_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
{
SearchData *sd = data;
GtkTreeModel *store;
return FALSE;
}
-static gint search_result_keypress_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
+static gboolean search_result_keypress_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
SearchData *sd = data;
- gint stop_signal = FALSE;
+ gboolean stop_signal = FALSE;
GtkTreeModel *store;
GtkTreeSelection *selection;
GList *slist;
if (event->state & GDK_CONTROL_MASK)
{
- gint edit_val = -1;
-
stop_signal = TRUE;
switch (event->keyval)
{
case '1':
- edit_val = 0;
- break;
case '2':
- edit_val = 1;
- break;
case '3':
- edit_val = 2;
- break;
case '4':
- edit_val = 3;
- break;
case '5':
- edit_val = 4;
- break;
case '6':
- edit_val = 5;
- break;
case '7':
- edit_val = 6;
- break;
case '8':
- edit_val = 7;
- break;
case '9':
- edit_val = 8;
- break;
case '0':
- edit_val = 9;
break;
case 'C': case 'c':
file_util_copy(NULL, search_result_selection_list(sd), NULL, widget);
case 'D': case 'd':
file_util_delete(NULL, search_result_selection_list(sd), widget);
break;
- case 'P': case 'p':
- info_window_new(NULL, search_result_selection_list(sd), NULL);
- break;
case 'A': case 'a':
if (event->state & GDK_SHIFT_MASK)
{
gtk_tree_selection_select_all(selection);
}
break;
- case GDK_Delete: case GDK_KP_Delete:
+ case GDK_KEY_Delete: case GDK_KEY_KP_Delete:
search_result_clear(sd);
break;
default:
stop_signal = FALSE;
break;
}
-
- if (edit_val >= 0)
- {
- search_result_edit_selected(sd, edit_val);
- }
}
else
{
stop_signal = TRUE;
switch (event->keyval)
{
- case GDK_Return: case GDK_KP_Enter:
- if (mfd) layout_image_set_fd(NULL, mfd->fd);
+ case GDK_KEY_Return: case GDK_KEY_KP_Enter:
+ if (mfd) layout_set_fd(NULL, mfd->fd);
break;
case 'V': case 'v':
{
filelist_free(list);
}
break;
- case GDK_Delete: case GDK_KP_Delete:
+ case GDK_KEY_Delete: case GDK_KEY_KP_Delete:
search_result_remove_selection(sd);
break;
case 'C': case 'c':
search_result_collection_from_selection(sd);
break;
- case GDK_Menu:
- case GDK_F10:
+ case GDK_KEY_Menu:
+ case GDK_KEY_F10:
{
GtkWidget *menu;
return stop_signal;
}
-static gint search_window_keypress_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
+static gboolean search_window_keypress_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
SearchData *sd = data;
- gint stop_signal = FALSE;
+ gboolean stop_signal = FALSE;
if (event->state & GDK_CONTROL_MASK)
{
guint time, gpointer data)
{
SearchData *sd = data;
- gchar *uri_text;
- gint length;
GList *list;
- switch (info)
- {
- case TARGET_URI_LIST:
- case TARGET_TEXT_PLAIN:
- list = search_result_selection_list(sd);
- if (!list) return;
- uri_text = uri_text_from_filelist(list, &length, (info == TARGET_TEXT_PLAIN));
- filelist_free(list);
- break;
- default:
- uri_text = NULL;
- break;
- }
+ list = search_result_selection_list(sd);
+ if (!list) return;
- if (uri_text) gtk_selection_data_set(selection_data, selection_data->target,
- 8, (guchar *)uri_text, length);
- g_free(uri_text);
+ uri_selection_data_set_uris_from_filelist(selection_data, list);
+ filelist_free(list);
}
static void search_dnd_begin(GtkWidget *widget, GdkDragContext *context, gpointer data)
G_CALLBACK(search_dnd_data_set), sd);
g_signal_connect(G_OBJECT(sd->result_view), "drag_begin",
G_CALLBACK(search_dnd_begin), sd);
-#if 0
- g_signal_connect(G_OBJECT(sd->result_view), "drag_end",
- G_CALLBACK(search_dnd_end), sd);
-#endif
-
}
/*
#define MATCH_IS_BETWEEN(val, a, b) (b > a ? (val >= a && val <= b) : (val >= b && val <= a))
-static gint search_step_cb(gpointer data);
+static gboolean search_step_cb(gpointer data);
static void search_buffer_flush(SearchData *sd)
static void search_stop(SearchData *sd)
{
- if (sd->search_idle_id != -1)
+ if (sd->search_idle_id)
{
g_source_remove(sd->search_idle_id);
- sd->search_idle_id = -1;
+ sd->search_idle_id = 0;
}
image_loader_free(sd->img_loader);
search_file_load_process(sd, sd->img_cd);
}
-static gint search_file_do_extra(SearchData *sd, FileData *fd, gint *match,
- gint *width, gint *height, gint *simval)
+static gboolean search_file_do_extra(SearchData *sd, FileData *fd, gint *match,
+ gint *width, gint *height, gint *simval)
{
- gint new_data = FALSE;
- gint tmatch = TRUE;
- gint tested = FALSE;
+ gboolean new_data = FALSE;
+ gboolean tmatch = TRUE;
+ gboolean tested = FALSE;
if (!sd->img_cd)
{
(sd->match_similarity_enable && !sd->img_cd->similarity))
{
sd->img_loader = image_loader_new(fd);
- g_signal_connect (G_OBJECT(sd->img_loader), "error", (GCallback)search_file_load_done_cb, sd);
- g_signal_connect (G_OBJECT(sd->img_loader), "done", (GCallback)search_file_load_done_cb, sd);
+ g_signal_connect(G_OBJECT(sd->img_loader), "error", (GCallback)search_file_load_done_cb, sd);
+ g_signal_connect(G_OBJECT(sd->img_loader), "done", (GCallback)search_file_load_done_cb, sd);
if (image_loader_start(sd->img_loader))
{
return TRUE;
return FALSE;
}
-static gint search_file_next(SearchData *sd)
+static gboolean search_file_next(SearchData *sd)
{
FileData *fd;
- gint match = TRUE;
- gint tested = FALSE;
- gint extra_only = FALSE;
+ gboolean match = TRUE;
+ gboolean tested = FALSE;
+ gboolean extra_only = FALSE;
gint width = 0;
gint height = 0;
gint sim = 0;
}
else
{
- match = (strcasecmp(fd->name, sd->search_name) == 0);
+ match = (g_ascii_strcasecmp(fd->name, sd->search_name) == 0);
}
}
else if (sd->match_name == SEARCH_MATCH_CONTAINS)
tested = TRUE;
match = FALSE;
- if (metadata_read(fd, &list, NULL))
+ list = metadata_read_list(fd, KEYWORD_KEY, METADATA_PLAIN);
+
+ if (list)
{
GList *needle;
GList *haystack;
if (sd->match_keywords == SEARCH_MATCH_ALL)
{
- gint found = TRUE;
+ gboolean found = TRUE;
needle = sd->search_keyword_list;
while (needle && found)
haystack = list;
while (haystack && !found)
{
- found = (strcasecmp((gchar *)needle->data,
+ found = (g_ascii_strcasecmp((gchar *)needle->data,
(gchar *)haystack->data) == 0);
haystack = haystack->next;
}
}
else if (sd->match_keywords == SEARCH_MATCH_ANY)
{
- gint found = FALSE;
+ gboolean found = FALSE;
needle = sd->search_keyword_list;
while (needle && !found)
haystack = list;
while (haystack && !found)
{
- found = (strcasecmp((gchar *)needle->data,
+ found = (g_ascii_strcasecmp((gchar *)needle->data,
(gchar *)haystack->data) == 0);
haystack = haystack->next;
}
}
else if (sd->match_keywords == SEARCH_MATCH_NONE)
{
- gint found = FALSE;
+ gboolean found = FALSE;
needle = sd->search_keyword_list;
while (needle && !found)
haystack = list;
while (haystack && !found)
{
- found = (strcasecmp((gchar *)needle->data,
+ found = (g_ascii_strcasecmp((gchar *)needle->data,
(gchar *)haystack->data) == 0);
haystack = haystack->next;
}
tested = TRUE;
match = FALSE;
- if (metadata_read(fd, NULL, &comment))
+ comment = metadata_read_string(fd, COMMENT_KEY, METADATA_PLAIN);
+
+ if (comment)
{
- if (! sd->search_comment_match_case)
+ if (!sd->search_comment_match_case)
{
gchar *tmp = g_utf8_strdown(comment, -1);
g_free(comment);
return FALSE;
}
-static gint search_step_cb(gpointer data)
+static gboolean search_step_cb(gpointer data)
{
SearchData *sd = data;
FileData *fd;
{
if (search_file_next(sd))
{
- sd->search_idle_id = -1;
+ sd->search_idle_id = 0;
return FALSE;
}
return TRUE;
if (!sd->search_file_list && !sd->search_folder_list)
{
- sd->search_idle_id = -1;
+ sd->search_idle_id = 0;
search_stop(sd);
search_result_thumb_step(sd);
{
GList *list = NULL;
GList *dlist = NULL;
- gint success = FALSE;
+ gboolean success = FALSE;
sd->search_done_list = g_list_prepend(sd->search_done_list, fd);
path = fd->path + strlen(sd->search_dir_fd->path);
if (path != fd->path)
{
- FileData *dir_fd = file_data_new_simple(path);
+ FileData *dir_fd = file_data_new_dir(path);
success = filelist_read(dir_fd, &list, NULL);
file_data_unref(dir_fd);
}
sd->search_similarity_cd = cache_sim_data_new();
}
- sd->img_loader = image_loader_new(file_data_new_simple(sd->search_similarity_path));
- g_signal_connect (G_OBJECT(sd->img_loader), "error", (GCallback)search_similarity_load_done_cb, sd);
- g_signal_connect (G_OBJECT(sd->img_loader), "done", (GCallback)search_similarity_load_done_cb, sd);
+ sd->img_loader = image_loader_new(file_data_new_group(sd->search_similarity_path));
+ g_signal_connect(G_OBJECT(sd->img_loader), "error", (GCallback)search_similarity_load_done_cb, sd);
+ g_signal_connect(G_OBJECT(sd->img_loader), "done", (GCallback)search_similarity_load_done_cb, sd);
if (image_loader_start(sd->img_loader))
{
return;
if (isdir(path))
{
file_data_unref(sd->search_dir_fd);
- sd->search_dir_fd = file_data_new_simple(path);
+ sd->search_dir_fd = file_data_new_dir(path);
tab_completion_append_to_history(sd->path_entry, sd->search_dir_fd->path);
{
/* search metadata */
file_data_unref(sd->search_dir_fd);
- sd->search_dir_fd = file_data_new_simple(get_metadata_cache_dir());
+ sd->search_dir_fd = file_data_new_dir(get_metadata_cache_dir());
search_start(sd);
}
else if (sd->search_type == SEARCH_MATCH_CONTAINS)
return 0;
}
-static void search_result_add_column(SearchData * sd, gint n, const gchar *title, gint image, gint right_justify)
+static void search_result_add_column(SearchData * sd, gint n, const gchar *title, gboolean image, gboolean right_justify)
{
GtkTreeViewColumn *column;
GtkCellRenderer *renderer;
gtk_tree_view_append_column(GTK_TREE_VIEW(sd->result_view), column);
}
-static void menu_choice_set_visible(GtkWidget *widget, gint visible)
+static void menu_choice_set_visible(GtkWidget *widget, gboolean visible)
{
if (visible)
{
- if (!GTK_WIDGET_VISIBLE(widget)) gtk_widget_show(widget);
+ if (!gtk_widget_get_visible(widget)) gtk_widget_show(widget);
}
else
{
- if (GTK_WIDGET_VISIBLE(widget)) gtk_widget_hide(widget);
+ if (gtk_widget_get_visible(widget)) gtk_widget_hide(widget);
}
}
gtk_widget_destroy(sd->window);
}
-static gint search_window_delete_cb(GtkWidget *widget, GdkEventAny *event, gpointer data)
+static gboolean search_window_delete_cb(GtkWidget *widget, GdkEventAny *event, gpointer data)
{
SearchData *sd = data;
sd->search_height = 480;
sd->search_width_end = 1024;
sd->search_height_end = 768;
- sd->search_name = NULL;
- sd->search_name_match_case = FALSE;
- sd->search_comment = NULL;
- sd->search_comment_match_case = FALSE;
sd->search_type = SEARCH_MATCH_NONE;
sd->match_comment = SEARCH_MATCH_CONTAINS;
sd->match_name_enable = TRUE;
- sd->match_size_enable = FALSE;
- sd->match_date_enable = FALSE;
- sd->match_dimensions_enable = FALSE;
- sd->match_similarity_enable = FALSE;
- sd->match_keywords_enable = FALSE;
- sd->match_comment_enable = FALSE;
sd->search_similarity = 95;
- sd->search_similarity_path = example_file ? g_strdup(example_file->path) : NULL;
- sd->search_similarity_cd = NULL;
- sd->search_idle_id = -1;
- sd->update_idle_id = -1;
+ if (example_file)
+ {
+ sd->search_similarity_path = g_strdup(example_file->path);
+ }
sd->window = window_new(GTK_WINDOW_TOPLEVEL, "search", NULL, NULL, _("Image search"));
gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(sd->result_view), TRUE);
gtk_tree_view_set_enable_search(GTK_TREE_VIEW(sd->result_view), FALSE);
-#if 0
- gtk_tree_view_set_search_column(GTK_TREE_VIEW(sd->result_view), SEARCH_COLUMN_NAME);
-#endif
-
search_result_add_column(sd, SEARCH_COLUMN_RANK, _("Rank"), FALSE, FALSE);
search_result_add_column(sd, SEARCH_COLUMN_THUMB, "", TRUE, FALSE);
search_result_add_column(sd, SEARCH_COLUMN_NAME, _("Name"), FALSE, FALSE);
{
GtkTreeModel *store;
GtkTreeIter iter;
- gint valid;
+ gboolean valid;
store = gtk_tree_view_get_model(GTK_TREE_VIEW(sd->result_view));
valid = gtk_tree_model_get_iter_first(store, &iter);
{
SearchData *sd = data;
- if (type != NOTIFY_TYPE_CHANGE || !fd->change) return;
-
- switch(fd->change->type)
+ if (!(type & NOTIFY_CHANGE) || !fd->change) return;
+
+ DEBUG_1("Notify search: %s %04x", fd->path, type);
+
+ switch (fd->change->type)
{
case FILEDATA_CHANGE_MOVE:
case FILEDATA_CHANGE_RENAME: