svn commit: r385119 - in head/x11-fm/thunar: . files

[Olivier Duchateau]

Author: olivierd
Date: Fri May  1 14:57:58 2015
New Revision: 385119
URL: https://svnweb.freebsd.org/changeset/ports/385119

Log:
  - Fix an infinite loop (and sometimes crash), when manual reload is performed
  - Bump PORTREVISION
  
  PR:		199827
  Reported by:	<rozhuk.im at gmail.com>
  Obtained from:	Upstream Git repository

Added:
  head/x11-fm/thunar/files/patch-thunar_thunar-folder.c   (contents, props changed)
  head/x11-fm/thunar/files/patch-thunar_thunar-window.c   (contents, props changed)
Modified:
  head/x11-fm/thunar/Makefile

Modified: head/x11-fm/thunar/Makefile
==============================================================================
--- head/x11-fm/thunar/Makefile	Fri May  1 14:50:16 2015	(r385118)
+++ head/x11-fm/thunar/Makefile	Fri May  1 14:57:58 2015	(r385119)
@@ -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

Added: head/x11-fm/thunar/files/patch-thunar_thunar-folder.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-fm/thunar/files/patch-thunar_thunar-folder.c	Fri May  1 14:57:58 2015	(r385119)
@@ -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;
+     }

Added: head/x11-fm/thunar/files/patch-thunar_thunar-window.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-fm/thunar/files/patch-thunar_thunar-window.c	Fri May  1 14:57:58 2015	(r385119)
@@ -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);