[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: Fri, 13 May 2011 17:53:23 +0000 (UTC)
commit 695db45f7d361a2fa20caf4d63867de4d6b593e9
Author: Piotr Eljasiak <epiotr src gnome org>
Date: Fri May 13 18:49:52 2011 +0200
noop: code cleanup
src/gnome-cmd-search-dialog.cc | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
---
diff --git a/src/gnome-cmd-search-dialog.cc b/src/gnome-cmd-search-dialog.cc
index 29bf592..743591f 100755
--- a/src/gnome-cmd-search-dialog.cc
+++ b/src/gnome-cmd-search-dialog.cc
@@ -272,8 +272,7 @@ static void search_dir_r (GnomeCmdDir *dir, SearchData *data, long level)
g_mutex_unlock (data->pdata.mutex);
}
- // if the stop button was pressed, let's abort here
- if (data->stopped)
+ if (data->stopped) // if the stop button was pressed, let's abort here
return;
gnome_cmd_dir_list_files (dir, FALSE);
@@ -281,8 +280,7 @@ static void search_dir_r (GnomeCmdDir *dir, SearchData *data, long level)
// let's iterate through all files
for (GList *i=gnome_cmd_dir_get_files (dir); i; i=i->next)
{
- // if the stop button was pressed, let's abort here
- if (data->stopped)
+ if (data->stopped) // if the stop button was pressed, let's abort here
return;
GnomeCmdFile *f = (GnomeCmdFile *) i->data;
@@ -506,6 +504,10 @@ static void on_search (GtkButton *button, GnomeCmdSearchDialog *dialog)
data->thread = NULL;
}
+ data->search_done = TRUE;
+ data->stopped = TRUE;
+ data->dialog_destroyed = FALSE;
+
data->dialog = dialog;
data->name_pattern = gtk_combo_box_get_active_text (GTK_COMBO_BOX (dialog->priv->pattern_combo));
data->content_pattern = gtk_combo_box_get_active_text (GTK_COMBO_BOX (dialog->priv->find_text_combo));
@@ -535,9 +537,6 @@ static void on_search (GtkButton *button, GnomeCmdSearchDialog *dialog)
gnome_vfs_uri_unref (uri);
g_free (dir_path);
- data->search_done = TRUE;
- data->stopped = TRUE;
-
return;
}
else
@@ -553,7 +552,6 @@ static void on_search (GtkButton *button, GnomeCmdSearchDialog *dialog)
data->search_done = FALSE;
data->stopped = FALSE;
- data->dialog_destroyed = FALSE;
// save default settings
gnome_cmd_data.search_defaults.default_profile.match_case = data->case_sens;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]