mtasaka pushed to gnome-commander (f21). "Fix infinite loop when pressing "Enter" on seaching dialog after (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Thu May 7 06:53:56 UTC 2015
From 688642e67e90b9d8973c3326938cd458125e314d Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka at fedoraproject.org>
Date: Thu, 7 May 2015 15:39:19 +0900
Subject: Fix infinite loop when pressing "Enter" on seaching dialog after
searching is done
(bug 1190508, GNOME bug 748869)
diff --git a/gnome-commander-1.4.5-GNOMEbug748869-fix-infinite-loop-on-search.patch b/gnome-commander-1.4.5-GNOMEbug748869-fix-infinite-loop-on-search.patch
new file mode 100644
index 0000000..f035148
--- /dev/null
+++ b/gnome-commander-1.4.5-GNOMEbug748869-fix-infinite-loop-on-search.patch
@@ -0,0 +1,39 @@
+From 7fdf3251a44ba6a829d9ab02302751f4973fa5b3 Mon Sep 17 00:00:00 2001
+From: Mamoru TASAKA <mtasaka at fedoraproject.org>
+Date: Thu, 7 May 2015 14:55:29 +0900
+Subject: [PATCH] update_search_status_widgets: reset response enum when
+ searching is done
+
+https://bugzilla.gnome.org/show_bug.cgi?id=748869
+
+On GnomeCmdSearchDialog::Private::on_dialog_response,
+default response was set to GCMD_RESPONSE_STOP and
+the sensitiveness to GCMD_RESPONSE_FIND was set to false.
+
+Now when searching is done, on update_search_status_widgets
+now the sensitiveness to GCMD_RESPONSE_STOP was also
+set to false, while the default response was still set
+to GCMD_RESPONSE_STOP, which seems to be causing infinite
+loop issue when searching is executed (when "Enter" key is pressed).
+
+So reset the default response to match the current
+response sensitiveness.
+---
+ src/dialogs/gnome-cmd-search-dialog.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/dialogs/gnome-cmd-search-dialog.cc b/src/dialogs/gnome-cmd-search-dialog.cc
+index 8bd48da..7597dcd 100644
+--- a/src/dialogs/gnome-cmd-search-dialog.cc
++++ b/src/dialogs/gnome-cmd-search-dialog.cc
+@@ -532,6 +532,7 @@ static gboolean update_search_status_widgets (SearchData *data)
+ gtk_dialog_set_response_sensitive (*data->dialog, GnomeCmdSearchDialog::GCMD_RESPONSE_GOTO, matches>0);
+ gtk_dialog_set_response_sensitive (*data->dialog, GnomeCmdSearchDialog::GCMD_RESPONSE_STOP, FALSE);
+ gtk_dialog_set_response_sensitive (*data->dialog, GnomeCmdSearchDialog::GCMD_RESPONSE_FIND, TRUE);
++ gtk_dialog_set_default_response (*data->dialog, GnomeCmdSearchDialog::GCMD_RESPONSE_FIND);
+
+ if (matches)
+ gtk_widget_grab_focus (*data->dialog->priv->result_list); // set focus to result list
+--
+2.4.0
+
diff --git a/gnome-commander.spec b/gnome-commander.spec
index 9e68bef..920409d 100644
--- a/gnome-commander.spec
+++ b/gnome-commander.spec
@@ -28,7 +28,7 @@
%global use_autotool 0
%global update_po 0
%global if_pre 0
-%global main_release 4
+%global main_release 5
%global extratag %{git_pull_JST}git%{shorthash}
#%%undefine extratag
%global mimeedit_rev 1958
@@ -69,6 +69,10 @@ Patch10: mimeedit-svn1958.diff
# Fix abort on opening property dialog on directory on ftp server with "odd" uid
# (bug 1200349, GNOME bug 746003)
Patch100: gnome-commander-1.4.5-GNOMEbug746003-fix-about-on-ftp-mount.patch
+# Fix infinite loop when pressing "Enter" on seaching dialog after
+# searching is done
+# (bug 1190508, GNOME bug 748869)
+Patch101: gnome-commander-1.4.5-GNOMEbug748869-fix-infinite-loop-on-search.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -145,6 +149,7 @@ ansluta till FTP-servrar och SMB-nätverk.
#%{__cp} -p %SOURCE10 mimeedit.sh
#%%patch10 -p0
+%patch101 -p1
%{__sed} -i.pylib \
-e 's|\$PY_EXEC_PREFIX/lib|%{_libdir}|' \
@@ -257,6 +262,11 @@ desktop-file-install \
%{_datadir}/pixmaps/%{name}/
%changelog
+* Thu May 7 2015 Mamoru TASAKA <mtasaka at fedoraproject.org> - 4:1.4.5-5.D20150504git5a4806f
+- Fix infinite loop when pressing "Enter" on seaching dialog after
+ searching is done
+ (bug 1190508, GNOME bug 748869)
+
* Mon May 4 2015 Mamoru TASAKA <mtasaka at fedoraproject.org> - 4:1.4.5-4.D20150504git5a4806f
- Try the latest git
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/gnome-commander.git/commit/?h=f21&id=688642e67e90b9d8973c3326938cd458125e314d
More information about the scm-commits
mailing list