Attachment 156203 Details for Bug 199827 – Fix an infinite loop, when manual relood is performed

[patch] Fix an infinite loop, when manual relood is performed

thunar.diff (text/plain), 2.83 KB, created by Olivier Duchateau on 2015-05-01 06:41:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Duchateau

Created: 2015-05-01 06:41:03 UTC

Size: 2.83 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 385083)
>+++ Makefile	(working copy)
>@@ -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
>Index: files/patch-thunar_thunar-folder.c
>===================================================================
>--- files/patch-thunar_thunar-folder.c	(revision 0)
>+++ files/patch-thunar_thunar-folder.c	(working copy)
>@@ -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;
>+     }
>
>Property changes on: files/patch-thunar_thunar-folder.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-thunar_thunar-window.c
>===================================================================
>--- files/patch-thunar_thunar-window.c	(revision 0)
>+++ files/patch-thunar_thunar-window.c	(working copy)
>@@ -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);
>
>Property changes on: files/patch-thunar_thunar-window.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 199827: 156203