Date: Mon, 17 Jun 2019 15:10:19 +0000 (UTC) From: Ben Woods <woodsb02@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r504427 - in head/sysutils/xfce4-systemload-plugin: . files Message-ID: <201906171510.x5HFAJJu046011@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: woodsb02 Date: Mon Jun 17 15:10:19 2019 New Revision: 504427 URL: https://svnweb.freebsd.org/changeset/ports/504427 Log: sysutils/xfce4-systemload-plugin: Fix crash on properties dialog Import patch from upstream: https://git.xfce.org/panel-plugins/xfce4-systemload-plugin/commit/?id=b35286b81e2b6166338008cb9330cf54b0d82250 Approved by: madpilot (xfce) Differential Revision: https://reviews.freebsd.org/D20672 Added: head/sysutils/xfce4-systemload-plugin/files/ head/sysutils/xfce4-systemload-plugin/files/patch-fix-crash-on-properties-dialog (contents, props changed) Modified: head/sysutils/xfce4-systemload-plugin/Makefile Modified: head/sysutils/xfce4-systemload-plugin/Makefile ============================================================================== --- head/sysutils/xfce4-systemload-plugin/Makefile Mon Jun 17 15:09:45 2019 (r504426) +++ head/sysutils/xfce4-systemload-plugin/Makefile Mon Jun 17 15:10:19 2019 (r504427) @@ -3,6 +3,7 @@ PORTNAME= xfce4-systemload-plugin PORTVERSION= 1.2.2 +PORTREVISION= 1 CATEGORIES= sysutils xfce MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 Added: head/sysutils/xfce4-systemload-plugin/files/patch-fix-crash-on-properties-dialog ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/xfce4-systemload-plugin/files/patch-fix-crash-on-properties-dialog Mon Jun 17 15:10:19 2019 (r504427) @@ -0,0 +1,31 @@ +From b35286b81e2b6166338008cb9330cf54b0d82250 Mon Sep 17 00:00:00 2001 +From: Landry Breuil <landry@xfce.org> +Date: Mon, 10 Dec 2018 09:57:58 +0100 +Subject: Fix a crash when opening the properties dialog + +introduced in dd5397b3, crash witnessed on OpenBSD and FreeBSD - better setting +the mnemonic widget when the widget has been created. +--- + panel-plugin/systemload.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/panel-plugin/systemload.c b/panel-plugin/systemload.c +index 089b704..ee11297 100644 +--- panel-plugin/systemload.c.orig 2018-11-29 16:44:33 UTC ++++ panel-plugin/systemload.c +@@ -806,7 +806,6 @@ static void new_monitor_setting(t_global_monitor *glob + gtk_widget_set_halign (label, GTK_ALIGN_START); + gtk_widget_set_valign (label, GTK_ALIGN_CENTER); + gtk_widget_set_margin_start (label, 12); +- gtk_label_set_mnemonic_widget (GTK_LABEL (label), button); + gtk_grid_attach (GTK_GRID(subgrid), label, 0, 0, 1, 1); + + /* Entry for the optional monitor label */ +@@ -822,6 +821,7 @@ static void new_monitor_setting(t_global_monitor *glob + + /* Colorbutton to set the progressbar color */ + button = gtk_color_button_new_with_rgba(colorvar); ++ gtk_label_set_mnemonic_widget (GTK_LABEL (label), button); + gtk_widget_set_halign(button, GTK_ALIGN_START); + g_object_set_data(G_OBJECT(button), "colorvar", colorvar); + g_signal_connect(G_OBJECT(button), "color-set",
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201906171510.x5HFAJJu046011>