From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 7 Jun 2012 18:14:45 +0000 (+0100)
Subject: -iconic <= -icon; changelog; compile
X-Git-Tag: debian/4.1.32~4
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=commitdiff_plain;h=99bf8bd0173945462b38e188f3aa2e8ff5ed505c

-iconic <= -icon; changelog; compile
---

diff --git a/cprogs/xacpi-simple.c b/cprogs/xacpi-simple.c
index eb761a2..f33380e 100644
--- a/cprogs/xacpi-simple.c
+++ b/cprogs/xacpi-simple.c
@@ -503,7 +503,7 @@ static const XrmOptionDescRec optiontable[]= {
   { S("-display"),      S("*display"),      XrmoptionSepArg },
   { S("-geometry"),     S("*geometry"),     XrmoptionSepArg },
   { S("-into"),         S("*parentWindow"), XrmoptionSepArg },
-  { S("-icon"),         S("*icon"),         XrmoptionIsArg },
+  { S("-iconic"),       S("*iconic"),       XrmoptionIsArg },
   { S("-withdrawn"),    S("*withdrawn"),    XrmoptionIsArg },
 #define GC(g)
 #define C(c,u)							\
@@ -783,8 +783,8 @@ static void initgraphics(int argc, char **argv) {
 
   wm_hints->flags= InputHint;
   wm_hints->input= False;
-  wm_hints->initial_state= (getresource("withdrawn") ? WithdrawnState :
-			    getresource("icon") ? IconicState
+  wm_hints->initial_state= (getresource_bool("withdrawn",0) ? WithdrawnState :
+			    getresource_bool("iconic",0) ? IconicState
 			    : NormalState);
 
   class_hint->res_name= program_name_silly;
diff --git a/debian/changelog b/debian/changelog
index 7c10cba..b71da07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ chiark-utils (4.1.32) unstable; urgency=medium
 
   xacpi-simple improvements:
   * Better parsing of boolean -debug option.
+  * Support -into, -iconic and -withdrawn options.
 
  --