-iconic <= -icon; changelog; compile

diff --git a/cprogs/xacpi-simple.c b/cprogs/xacpi-simple.c
index eb761a290635ca85ab8f80db11b6d26444c26dca..f33380e1943be96819d1323278eb0ea2f89be3fd 100644 (file)
--- 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 7c10cbae16299cc0f40ed36ec6f8b452d536e221..b71da072242076a5c26a18d452eb0f6a3c793270 100644 (file)
--- 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.
 
  --