[gnome-commander] noop: just some minor refactoring
- From: Uwe Scholz <uwescholz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-commander] noop: just some minor refactoring
- Date: Wed, 1 Sep 2021 20:38:12 +0000 (UTC)
commit 334e8de14393db675350d8d7b95133ea8a8f49e4
Author: Uwe Scholz <u scholz83 gmx de>
Date: Sun Aug 29 17:52:44 2021 +0200
noop: just some minor refactoring
src/dialogs/gnome-cmd-search-dialog.cc | 31 ++++++++++++++++++-------------
1 file changed, 18 insertions(+), 13 deletions(-)
---
diff --git a/src/dialogs/gnome-cmd-search-dialog.cc b/src/dialogs/gnome-cmd-search-dialog.cc
index 3f17ff7b..decede2a 100644
--- a/src/dialogs/gnome-cmd-search-dialog.cc
+++ b/src/dialogs/gnome-cmd-search-dialog.cc
@@ -447,22 +447,27 @@ void SearchData::SearchDirRecursive(GnomeCmdDir *dir, long level)
}
}
}
- else // if the file is a regular one, it
might match the search criteria
- if (f->GetGfileAttributeUInt32(G_FILE_ATTRIBUTE_STANDARD_TYPE) == G_FILE_TYPE_DIRECTORY)
- {
- if (!NameMatches(g_file_info_get_display_name(f->gFileInfo))) // if
the name doesn't match, let's go to the next file
- continue;
- if (dialog->defaults.default_profile.content_search && !ContentMatches(f)) //
if the user wants to we should do some content matching here
- continue;
+ // if the file is a regular one, it might match the search criteria
+ if (f->GetGfileAttributeUInt32(G_FILE_ATTRIBUTE_STANDARD_TYPE) == G_FILE_TYPE_DIRECTORY)
+ {
+ // if the name doesn't match, let's go to the next file
+ if (!NameMatches(g_file_info_get_display_name(f->gFileInfo)))
+ continue;
- g_mutex_lock (pdata.mutex); // the file matched the search
criteria, let's add it to the list
- pdata.files = g_list_append (pdata.files, f->ref());
- g_mutex_unlock (pdata.mutex);
+ // if the user wants to we should do some content matching here
+ if (dialog->defaults.default_profile.content_search && !ContentMatches(f))
+ continue;
- if (g_list_index (match_dirs, dir) == -1) // also ref each directory that has
a matching file
- match_dirs = g_list_append (match_dirs, gnome_cmd_dir_ref (dir));
- }
+ // the file matched the search criteria, let's add it to the list
+ g_mutex_lock (pdata.mutex);
+ pdata.files = g_list_append (pdata.files, f->ref());
+ g_mutex_unlock (pdata.mutex);
+
+ // also ref each directory that has a matching file
+ if (g_list_index (match_dirs, dir) == -1)
+ match_dirs = g_list_append (match_dirs, gnome_cmd_dir_ref (dir));
+ }
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]