Mamoru TASAKA
10 years ago
parent
688642e67e
commit
969e64a994
@ -1,27 +0,0 @@
|
|||||||
From 2e648e4b7d0740a0583568c017d12a9d9a359799 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Mamoru Tasaka <mtasaka@fedoraproject.org>
|
|
||||||
Date: Sun, 15 Mar 2015 00:09:05 +0100
|
|
||||||
Subject: Removed unnecessary g_assert call, fixes #746003
|
|
||||||
|
|
||||||
Removing the g_assert call leads to a return of NULL when no ID could be
|
|
||||||
found.
|
|
||||||
|
|
||||||
Signed-off-by: Uwe Scholz <uwescholz@src.gnome.org>
|
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/owner.h b/src/owner.h
|
|
||||||
index a5e8e5d..85305ca 100644
|
|
||||||
--- a/src/owner.h
|
|
||||||
+++ b/src/owner.h
|
|
||||||
@@ -162,8 +162,6 @@ inline const gchar *GnomeCmdOwner::HashTable<T,ID>::operator [] (ID id)
|
|
||||||
{
|
|
||||||
Entry *entry = lookup(id);
|
|
||||||
|
|
||||||
- g_assert (entry != NULL);
|
|
||||||
-
|
|
||||||
return entry ? entry->name : NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
--
|
|
||||||
cgit v0.10.2
|
|
||||||
|
|
||||||
@ -1,39 +0,0 @@
|
|||||||
From 7fdf3251a44ba6a829d9ab02302751f4973fa5b3 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Mamoru TASAKA <mtasaka@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
|
|
||||||
|
|
||||||
@ -0,0 +1,29 @@
|
|||||||
|
commit 5b0b3a469ab426feb596b0edfcc61cde4c0e6e80
|
||||||
|
Author: Uwe Scholz <uwescholz@src.gnome.org>
|
||||||
|
Date: Sat Mar 7 00:26:04 2015 +0100
|
||||||
|
|
||||||
|
Added security check for mime_exec_file
|
||||||
|
|
||||||
|
diff --git a/src/gnome-cmd-file-list.cc b/src/gnome-cmd-file-list.cc
|
||||||
|
index 0312a85..d46ed16 100644
|
||||||
|
--- a/src/gnome-cmd-file-list.cc
|
||||||
|
+++ b/src/gnome-cmd-file-list.cc
|
||||||
|
@@ -1172,14 +1172,15 @@ static gboolean on_button_press (GtkCList *clist, GdkEventButton *event, GnomeCm
|
||||||
|
|
||||||
|
inline gboolean mime_exec_file (GnomeCmdFile *f)
|
||||||
|
{
|
||||||
|
+ g_return_val_if_fail (f != NULL, FALSE);
|
||||||
|
+
|
||||||
|
if (f->info->type == GNOME_VFS_FILE_TYPE_REGULAR)
|
||||||
|
{
|
||||||
|
mime_exec_single (f);
|
||||||
|
- return TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
- return FALSE;
|
||||||
|
-}
|
||||||
|
+ return TRUE;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
|
||||||
|
static void on_file_clicked (GnomeCmdFileList *fl, GnomeCmdFile *f, GdkEventButton *event, gpointer data)
|
||||||
Loading…
Reference in new issue