Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 18 Jul 2020 10:26:42 +0000 (UTC)
From:      Guido Falsi <madpilot@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r542487 - in branches/2020Q3/x11/xfce4-taskmanager: . files
Message-ID:  <202007181026.06IAQgaZ084955@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: madpilot
Date: Sat Jul 18 10:26:42 2020
New Revision: 542487
URL: https://svnweb.freebsd.org/changeset/ports/542487

Log:
  MFH: r542356
  
  Import patch merged upstream. Fixes an issue which causes processes
  to not being removed from list sometimes.
  
  PR:		247960
  Submitted by:	rozhuk.im@gmail.com
  
  Approved by:	ports-secteam (joneuom)

Added:
  branches/2020Q3/x11/xfce4-taskmanager/files/patch-src_task-manager.c
     - copied unchanged from r542356, head/x11/xfce4-taskmanager/files/patch-src_task-manager.c
Modified:
  branches/2020Q3/x11/xfce4-taskmanager/Makefile
Directory Properties:
  branches/2020Q3/   (props changed)

Modified: branches/2020Q3/x11/xfce4-taskmanager/Makefile
==============================================================================
--- branches/2020Q3/x11/xfce4-taskmanager/Makefile	Sat Jul 18 09:54:49 2020	(r542486)
+++ branches/2020Q3/x11/xfce4-taskmanager/Makefile	Sat Jul 18 10:26:42 2020	(r542487)
@@ -3,6 +3,7 @@
 
 PORTNAME=	xfce4-taskmanager
 PORTVERSION=	1.2.3
+PORTREVISION=	1
 CATEGORIES=	x11 xfce
 MASTER_SITES=	XFCE/apps
 DIST_SUBDIR=	xfce4

Copied: branches/2020Q3/x11/xfce4-taskmanager/files/patch-src_task-manager.c (from r542356, head/x11/xfce4-taskmanager/files/patch-src_task-manager.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2020Q3/x11/xfce4-taskmanager/files/patch-src_task-manager.c	Sat Jul 18 10:26:42 2020	(r542487, copy of r542356, head/x11/xfce4-taskmanager/files/patch-src_task-manager.c)
@@ -0,0 +1,18 @@
+--- src/task-manager.c.orig	2019-12-09 09:12:44 UTC
++++ src/task-manager.c
+@@ -432,10 +432,12 @@ xtm_task_manager_update_model (XtmTaskManager *manager
+ 		gtk_tree_model_get (manager->model, &cur_iter, XTM_PTV_COLUMN_CPU_STR, &cpu_str, XTM_PTV_COLUMN_TIMESTAMP, &old_timestamp, XTM_PTV_COLUMN_PID, &pid, -1);
+ 		found = (g_strcmp0 (cpu_str, "-") == 0);
+ 		g_free (cpu_str);
+-		if (found && (timestamp - old_timestamp) > TIMESTAMP_DELTA)
++		if (found)
+ 		{
+-			G_DEBUG_FMT ("Remove old task %d", pid);
+-			model_remove_tree_iter (manager->model, &cur_iter);
++			if ((timestamp - old_timestamp) > TIMESTAMP_DELTA) {
++				G_DEBUG_FMT ("Remove old task %d", pid);
++				model_remove_tree_iter (manager->model, &cur_iter);
++			}
+ 			continue;
+ 		}
+ 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007181026.06IAQgaZ084955>