From owner-svn-ports-head@FreeBSD.ORG  Sat Jan 19 21:06:46 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 5F2C9469;
 Sat, 19 Jan 2013 21:06:46 +0000 (UTC)
 (envelope-from olivierd@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 2046BFF1;
 Sat, 19 Jan 2013 21:06:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0JL6kMA088370;
 Sat, 19 Jan 2013 21:06:46 GMT
 (envelope-from olivierd@svn.freebsd.org)
Received: (from olivierd@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0JL6js6088368;
 Sat, 19 Jan 2013 21:06:45 GMT
 (envelope-from olivierd@svn.freebsd.org)
Message-Id: <201301192106.r0JL6js6088368@svn.freebsd.org>
From: Olivier Duchateau <olivierd@FreeBSD.org>
Date: Sat, 19 Jan 2013 21:06:45 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r310659 - in head/x11/xfce4-screenshooter-plugin: . 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.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 19 Jan 2013 21:06:46 -0000

Author: olivierd
Date: Sat Jan 19 21:06:45 2013
New Revision: 310659
URL: http://svnweb.freebsd.org/changeset/ports/310659

Log:
  Add patch, which fixes help page, when Help button is pressed.
  
  Approved by:	rene, miwi (mentors, implicit)

Added:
  head/x11/xfce4-screenshooter-plugin/files/patch-lib__screenshooter-utils.c   (contents, props changed)
Modified:
  head/x11/xfce4-screenshooter-plugin/Makefile

Modified: head/x11/xfce4-screenshooter-plugin/Makefile
==============================================================================
--- head/x11/xfce4-screenshooter-plugin/Makefile	Sat Jan 19 20:39:35 2013	(r310658)
+++ head/x11/xfce4-screenshooter-plugin/Makefile	Sat Jan 19 21:06:45 2013	(r310659)
@@ -4,7 +4,7 @@
 
 PORTNAME=	xfce4-screenshooter-plugin
 PORTVERSION=	1.8.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11 xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=src/apps/xfce4-screenshooter/${PORTVERSION:R}

Added: head/x11/xfce4-screenshooter-plugin/files/patch-lib__screenshooter-utils.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11/xfce4-screenshooter-plugin/files/patch-lib__screenshooter-utils.c	Sat Jan 19 21:06:45 2013	(r310659)
@@ -0,0 +1,22 @@
+--- ./lib/screenshooter-utils.c.orig	2010-05-21 08:11:35.000000000 +0000
++++ ./lib/screenshooter-utils.c	2013-01-19 21:15:00.000000000 +0000
+@@ -345,10 +345,17 @@
+ void screenshooter_open_help (void)
+ {
+   GError *error_help = NULL;
++  gboolean result;
+ 
+   /* Launch the help page and show an error dialog if there was an error. */
+-  if (!g_spawn_command_line_async ("xfhelp4 xfce4-screenshooter.html",
+-                                   &error_help))
++#if LIBXFCE4UTIL_CHECK_VERSION (4, 10, 0)
++  result = g_spawn_command_line_async("exo-open --launch TerminalEmulator man xfce4-screenshooter",
++                                      &error_help);
++#else
++  result = g_spawn_command_line_async ("xfhelp4 xfce4-screenshooter.html",
++                                       &error_help);
++#endif
++  if (G_UNLIKELY (result == FALSE))
+     {
+       screenshooter_error ("%s", error_help->message);
+       g_error_free (error_help);