From owner-svn-ports-head@FreeBSD.ORG Fri May 1 14:58:00 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 089D2838; Fri, 1 May 2015 14:58:00 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DE2DE1052; Fri, 1 May 2015 14:57:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t41Evx0M088677; Fri, 1 May 2015 14:57:59 GMT (envelope-from olivierd@FreeBSD.org) Received: (from olivierd@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t41Evxn5088674; Fri, 1 May 2015 14:57:59 GMT (envelope-from olivierd@FreeBSD.org) Message-Id: <201505011457.t41Evxn5088674@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: olivierd set sender to olivierd@FreeBSD.org using -f From: Olivier Duchateau Date: Fri, 1 May 2015 14:57:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r385119 - in head/x11-fm/thunar: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 May 2015 14:58:00 -0000 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: 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);