svn commit: r310659 - in head/x11/xfce4-screenshooter-plugin: . files

[Olivier Duchateau]

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);