Attachment 190622 Details for Bug 217946 – Thunar crash workaround

[patch] Thunar crash workaround

thunar.diff (text/plain), 1.89 KB, created by Guido Falsi on 2018-02-14 15:49:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guido Falsi

Created: 2018-02-14 15:49:59 UTC

Size: 1.89 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 461813)
>+++ Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	Thunar
> DISTVERSION=	1.6.13
>+PORTREVISION=	1
> CATEGORIES=	x11-fm xfce
> MASTER_SITES=	XFCE/src/xfce/${PORTNAME:tl}/${PORTVERSION:R}
> DIST_SUBDIR=	xfce4
>Index: files/patch-thunar_thunar-file.c
>===================================================================
>--- files/patch-thunar_thunar-file.c	(nonexistent)
>+++ files/patch-thunar_thunar-file.c	(working copy)
>@@ -0,0 +1,27 @@
>+--- thunar/thunar-file.c.orig	2017-11-25 16:54:56 UTC
>++++ thunar/thunar-file.c
>+@@ -3966,7 +3966,9 @@ thunar_file_unwatch (ThunarFile *file)
>+ gboolean
>+ thunar_file_reload (ThunarFile *file)
>+ {
>+-  _thunar_return_val_if_fail (THUNAR_IS_FILE (file), FALSE);
>++  /* if the file has already been destroyed, break here */
>++  if (!THUNAR_IS_FILE (file))
>++      return FALSE;
>+ 
>+   /* clear file pxmap cache */
>+   thunar_icon_factory_clear_pixmap_cache (file);
>+@@ -4090,11 +4092,11 @@ thunar_file_compare_by_name (const ThunarFile *file_a,
>+ 
>+   /* case insensitive checking */
>+   if (G_LIKELY (!case_sensitive))
>+-    result = strcmp (file_a->collate_key_nocase, file_b->collate_key_nocase);
>++    result = g_strcmp0 (file_a->collate_key_nocase, file_b->collate_key_nocase);
>+ 
>+   /* fall-back to case sensitive */
>+   if (result == 0)
>+-    result = strcmp (file_a->collate_key, file_b->collate_key);
>++    result = g_strcmp0 (file_a->collate_key, file_b->collate_key);
>+ 
>+   /* this happens in the trash */
>+   if (result == 0)
>
>Property changes on: files/patch-thunar_thunar-file.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 217946: 187552 | 187655 | 187972 | 190622 | 190703