diff options
| author | olivierd <olivierd@FreeBSD.org> | 2015-05-01 22:57:58 +0800 |
|---|---|---|
| committer | olivierd <olivierd@FreeBSD.org> | 2015-05-01 22:57:58 +0800 |
| commit | cbc30f83006985479607821701ac882681175f1e (patch) | |
| tree | 522b64bdc8f018fc84966d8e432e17d6d283507b /x11-fm | |
| parent | 4586c17e5406bcf5b567543767970b807f8a6615 (diff) | |
| download | freebsd-ports-gnome-cbc30f83006985479607821701ac882681175f1e.tar.gz freebsd-ports-gnome-cbc30f83006985479607821701ac882681175f1e.tar.zst freebsd-ports-gnome-cbc30f83006985479607821701ac882681175f1e.zip | |
- Fix an infinite loop (and sometimes crash), when manual reload is performed
- Bump PORTREVISION
PR: 199827
Reported by: <rozhuk.im@gmail.com>
Obtained from: Upstream Git repository
Diffstat (limited to 'x11-fm')
| -rw-r--r-- | x11-fm/thunar/Makefile | 1 | ||||
| -rw-r--r-- | x11-fm/thunar/files/patch-thunar_thunar-folder.c | 17 | ||||
| -rw-r--r-- | x11-fm/thunar/files/patch-thunar_thunar-window.c | 13 |
3 files changed, 31 insertions, 0 deletions
diff --git a/x11-fm/thunar/Makefile b/x11-fm/thunar/Makefile index 9e62cb009b53..9c86b8b2f8cd 100644 --- a/x11-fm/thunar/Makefile +++ b/x11-fm/thunar/Makefile @@ -3,6 +3,7 @@ PORTNAME= Thunar PORTVERSION= 1.6.7 +PORTREVISION= 1 CATEGORIES= x11-fm xfce MASTER_SITES= XFCE/src/xfce/${PORTNAME:tl}/${PORTVERSION:R} DIST_SUBDIR= xfce4 diff --git a/x11-fm/thunar/files/patch-thunar_thunar-folder.c b/x11-fm/thunar/files/patch-thunar_thunar-folder.c new file mode 100644 index 000000000000..76066f70652a --- /dev/null +++ b/x11-fm/thunar/files/patch-thunar_thunar-folder.c @@ -0,0 +1,17 @@ +Avoid an infinite loop, during manual reload (bug #11849) + +--- thunar/thunar-folder.c.orig 2015-04-18 14:25:18 UTC ++++ thunar/thunar-folder.c +@@ -551,10 +551,10 @@ thunar_folder_finished (ExoJob *jo + if (folder->reload_info) + { + for (lp = folder->files; lp != NULL; lp = lp->next) +- thunar_file_reload_idle (lp->data); ++ thunar_file_reload (lp->data); + + /* reload folder information too */ +- thunar_file_reload_idle (folder->corresponding_file); ++ thunar_file_reload (folder->corresponding_file); + + folder->reload_info = FALSE; + } diff --git a/x11-fm/thunar/files/patch-thunar_thunar-window.c b/x11-fm/thunar/files/patch-thunar_thunar-window.c new file mode 100644 index 000000000000..ee8b16e3babc --- /dev/null +++ b/x11-fm/thunar/files/patch-thunar_thunar-window.c @@ -0,0 +1,13 @@ +Fix bind key for new ThunarWindow reload signal + +--- thunar/thunar-window.c.orig 2015-04-18 14:25:18 UTC ++++ thunar/thunar-window.c +@@ -623,7 +623,7 @@ thunar_window_class_init (ThunarWindowCl + /* setup the key bindings for the windows */ + binding_set = gtk_binding_set_by_class (klass); + gtk_binding_entry_add_signal (binding_set, GDK_BackSpace, 0, "back", 0); +- gtk_binding_entry_add_signal (binding_set, GDK_F5, 0, "reload", 0); ++ gtk_binding_entry_add_signal (binding_set, GDK_F5, 0, "reload", 1, G_TYPE_BOOLEAN, TRUE); + gtk_binding_entry_add_signal (binding_set, GDK_F9, 0, "toggle-sidepane", 0); + gtk_binding_entry_add_signal (binding_set, GDK_F10, 0, "toggle-menubar", 0); + gtk_binding_entry_add_signal (binding_set, GDK_KP_Add, GDK_CONTROL_MASK, "zoom-in", 0); |