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

[Yves-Alexis Perez]

Author: corsac
Date: 2011-03-23 15:27:01 +0000 (Wed, 23 Mar 2011)
New Revision: 5146

Removed:
   goodies/branches/experimental/xfce4-genmon-plugin/debian/patches/01_no-zombies.patch
Modified:
   goodies/branches/experimental/xfce4-genmon-plugin/debian/changelog
   goodies/branches/experimental/xfce4-genmon-plugin/debian/patches/series
Log:
01_no-zombies dropped, included upstream.

Modified: goodies/branches/experimental/xfce4-genmon-plugin/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-genmon-plugin/debian/changelog	2011-03-23 15:25:11 UTC (rev 5145)
+++ goodies/branches/experimental/xfce4-genmon-plugin/debian/changelog	2011-03-23 15:27:01 UTC (rev 5146)
@@ -14,6 +14,7 @@
     - update standards version to 3.9.1.
     - add ${misc:Depends} to dependencies.
   * debian/patches:
+    - 01_no-zombies dropped, included upstream.
     - 03_link-with-libxfcegui4 added, link against libxfcegui4 now that it's
       not provided by xfce4-panel.
   * debian/rules:

Deleted: goodies/branches/experimental/xfce4-genmon-plugin/debian/patches/01_no-zombies.patch
===================================================================
--- goodies/branches/experimental/xfce4-genmon-plugin/debian/patches/01_no-zombies.patch	2011-03-23 15:25:11 UTC (rev 5145)
+++ goodies/branches/experimental/xfce4-genmon-plugin/debian/patches/01_no-zombies.patch	2011-03-23 15:27:01 UTC (rev 5146)
@@ -1,36 +0,0 @@
-Description: fix processes ending up as zombies when run from genmon
-Bug: http://bugzilla.xfce.org/show_bug.cgi?id=3896
-Author: Steve Tyler <stephent98 at hotmail.com>
-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 12:46:22.000000000 -0700
-@@ -32,6 +32,7 @@
- 
- #include <libxfce4util/libxfce4util.h>
- #include <libxfcegui4/dialogs.h>
-+#include <libxfcegui4/xfce-exec.h>
- #include <libxfce4panel/xfce-panel-plugin.h>
- #include <libxfce4panel/xfce-panel-convenience.h>
- 
-@@ -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);
- }
- 
- /**************************************************************/

Modified: goodies/branches/experimental/xfce4-genmon-plugin/debian/patches/series
===================================================================
--- goodies/branches/experimental/xfce4-genmon-plugin/debian/patches/series	2011-03-23 15:25:11 UTC (rev 5145)
+++ goodies/branches/experimental/xfce4-genmon-plugin/debian/patches/series	2011-03-23 15:27:01 UTC (rev 5146)
@@ -1,3 +1,2 @@
-01_no-zombies.patch
 02_close-unused-pipes.patch
 03_link-with-libxfcegui4.patch