[gnome-commander] noop: code cleanup
- From: Piotr Eljasiak <epiotr src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-commander] noop: code cleanup
- Date: Tue, 29 Mar 2011 18:53:58 +0000 (UTC)
commit 8734b77571aedbf5d3ffcad7d6dbd7866971910d
Author: Piotr Eljasiak <epiotr src gnome org>
Date: Tue Mar 29 20:48:16 2011 +0200
noop: code cleanup
src/gnome-cmd-search-dialog.cc | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/src/gnome-cmd-search-dialog.cc b/src/gnome-cmd-search-dialog.cc
old mode 100644
new mode 100755
index 8068063..c408297
--- a/src/gnome-cmd-search-dialog.cc
+++ b/src/gnome-cmd-search-dialog.cc
@@ -66,25 +66,27 @@ struct SearchData
const gchar *content_pattern; // the pattern that the content of a file should match to end up in the file list
const gchar *dir; // the current dir of the search routine
+ gboolean recurse; // should we recurse or just search in the selected directory?
+ Filter::Type name_filter_type;
+ gboolean content_search; // should we do content search?
+ gboolean case_sens;
+
Filter *name_filter;
regex_t *content_regex;
- gboolean content_search; // should we do content search?
gint matches; // the number of matching files
gint context_id; // the context id of the status bar
GnomeCmdSearchDialog *dialog;
- gboolean recurse; // should we recurse or just search in the selected directory?
- gboolean case_sens;
GList *match_dirs; // the directories which we found matching files in
GnomeCmdDir *start_dir; // the directory to start searching from
GThread *thread;
ProtectedData pdata;
gint update_gui_timeout_id;
+ gchar *search_mem; // memory to search in the content of a file
+
gboolean search_done;
gboolean stopped; // stops the search routine if set to TRUE. This is done by the stop_button
gboolean dialog_destroyed; // set when the search dialog is destroyed, also stops the search of course
-
- gchar *search_mem; // memory to search in the content of a file
};
@@ -522,6 +524,7 @@ static gboolean start_generic_search (GnomeCmdSearchDialog *dialog)
gnome_cmd_data.search_defaults.default_profile.recursive = data->recurse;
gnome_cmd_data.search_defaults.name_patterns.add(data->name_pattern);
gnome_cmd_data.search_defaults.directories.add(data->dir);
+
if (data->content_search)
{
gnome_cmd_data.search_defaults.content_patterns.add(data->content_pattern);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]