[Pkg-xfce-commits] r1864 - in goodies/xfce4-genmon-plugin/debian: . patches

[corsac at alioth.debian.org]

Author: corsac
Date: 2008-04-16 20:08:11 +0000 (Wed, 16 Apr 2008)
New Revision: 1864

Modified:
   goodies/xfce4-genmon-plugin/debian/changelog
   goodies/xfce4-genmon-plugin/debian/patches/01_no-zombies.patch
Log:
patch refreshed


Modified: goodies/xfce4-genmon-plugin/debian/changelog
===================================================================
--- goodies/xfce4-genmon-plugin/debian/changelog	2008-04-16 20:02:23 UTC (rev 1863)
+++ goodies/xfce4-genmon-plugin/debian/changelog	2008-04-16 20:08:11 UTC (rev 1864)
@@ -3,7 +3,7 @@
   * debian/patches:
     - 01_no-zombies added: no zombies left by spawned process.  closes: #422572
 
- -- Yves-Alexis Perez <corsac at debian.org>  Wed, 16 Apr 2008 21:40:42 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Wed, 16 Apr 2008 22:02:28 +0200
 
 xfce4-genmon-plugin (3.2-1) unstable; urgency=low
 

Modified: goodies/xfce4-genmon-plugin/debian/patches/01_no-zombies.patch
===================================================================
--- goodies/xfce4-genmon-plugin/debian/patches/01_no-zombies.patch	2008-04-16 20:02:23 UTC (rev 1863)
+++ goodies/xfce4-genmon-plugin/debian/patches/01_no-zombies.patch	2008-04-16 20:08:11 UTC (rev 1864)
@@ -1,6 +1,6 @@
 diff -u a/main.c b/main.c
 --- a/panel-plugin/main.c	2008-03-15 15:38:18.000000000 -0700
-+++ b/panel-plugin/main.c	2008-04-16 08:01:26.000000000 -0700
++++ b/panel-plugin/main.c	2008-04-16 12:46:22.000000000 -0700
 @@ -32,6 +32,7 @@
  
  #include <libxfce4util/libxfce4util.h>
@@ -9,15 +9,25 @@
  #include <libxfce4panel/xfce-panel-plugin.h>
  #include <libxfce4panel/xfce-panel-convenience.h>
  
-@@ -94,10 +95,8 @@
+@@ -94,10 +95,18 @@
  {
      struct genmon_t *poPlugin = (genmon_t *) p_pvPlugin;
      struct monitor_t *poMonitor = &(poPlugin->oMonitor);
 -    char result[256];
++    GError *error = NULL;
++
++	xfce_exec(poMonitor->onClickCmd, 0, 0, &error);
++    if (error) {
++        char first[256];
++        g_snprintf (first, sizeof(first), _("Could not run \"%s\""), poMonitor->onClickCmd);
++        xfce_message_dialog (NULL, _("Xfce Panel"), 
++                             GTK_STOCK_DIALOG_ERROR, first, error->message,
++                             GTK_STOCK_CLOSE, GTK_RESPONSE_OK, NULL);
++        g_error_free (error);
++    }
  
 -    genmon_SpawnCmd (poMonitor->onClickCmd, result,
 -        sizeof (poMonitor->onClickCmd), 0);
-+	xfce_exec(poMonitor->onClickCmd, 0, 0, NULL);
  }
  
  /**************************************************************/