[Pkg-wmaker-commits] [wmacpi] 46/105: Imported Debian patch 2.1-5

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmacpi.

commit 122f99098de73017c58416614e26d0a825800a23
Author: Sebastian Henschel <shensche at debian.org>
Date:   Thu Feb 2 14:20:24 2006 +0100

    Imported Debian patch 2.1-5
---
 debian/changelog | 8 ++++++++
 debian/docs      | 1 -
 wmacpi.c         | 6 +++++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 56dc5d8..aad77cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+wmacpi (2.1-5) unstable; urgency=low
+
+  * wmacpi.c:
+    - Fixed previous patch which let libdockapp hijack command line
+    options from wmacpi, closes: #350887.
+
+ -- Sebastian Henschel <shensche at debian.org>  Thu,  2 Feb 2006 14:20:24 +0100
+
 wmacpi (2.1-4) unstable; urgency=low
 
   * wmacpi.c:
diff --git a/debian/docs b/debian/docs
index 4cbc1c5..86e0ce2 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,4 +1,3 @@
 README
 AUTHORS
 TODO
-
diff --git a/wmacpi.c b/wmacpi.c
index 4e0758f..8a0fd38 100644
--- a/wmacpi.c
+++ b/wmacpi.c
@@ -137,7 +137,11 @@ static void redraw_window(void)
 static void new_window(char *display, char *name, int argc, char **argv)
 {
     /* Initialise the dockapp window and appicon */
-    DAParseArguments(argc, argv, NULL, 0, "There is no help available", WMACPI_VER);
+    char **fake_argv = malloc (sizeof(char) * 7);
+    fake_argv[0] = "wmacpi";
+    DAParseArguments(1, fake_argv, NULL, 0, "", WMACPI_VER);
+    free(fake_argv);
+
     DAInitialize(display, name, 64, 64, argc, argv);
     dockapp->display = DADisplay;
     dockapp->win = DAWindow;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmacpi.git