Imported Upstream version 20090110

diff --git a/ChangeLog b/ChangeLog
index 1825d3d4eb266b270b987a59737f0254648d6e8f..006a04a59bf946f5d5446944b6dd8ec60951be50 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,49 @@
+2009-01-09 22:19 UTC  Tuomo Valkonen <tuomov@iki.fi>
+  tagged ion-3-20090110
+
+2009-01-09 22:19 UTC  Tuomo Valkonen <tuomov@iki.fi>
+  * Release notes
+
+2009-01-09 22:17 UTC  Tuomo Valkonen <tuomov@iki.fi>
+  * Year changed
+
+2008-12-30 17:11 UTC  Tuomo Valkonen <tuomov@iki.fi>
+  * Apply FRAME_SHADED_TOGGLE hack in WFrame.maximize_vert
+  for correct unshaded size hints to rqgeom handlers.
+
+2008-11-16 10:56 UTC  Tuomo Valkonen <tuomov@iki.fi>
+  * A few strings were missing translation wrapper
+
+2008-11-15 16:02 UTC  Tuomo Valkonen <tuomov@iki.fi>
+  * Shouldn't open queries in frame if message box is open.
+
+2008-11-15 16:01 UTC  Tuomo Valkonen <tuomov@iki.fi>
+  * WMPlex focus code fixes/improvements.
+  (Once again, maybe... this being focus code we're talking about.)
+
+2008-11-10 16:49 UTC  Tuomo Valkonen <tuomov@iki.fi>
+  * Oops
+
+2008-11-06 22:54 UTC  Tuomo Valkonen <tuomov@iki.fi>
+  * PHOLDER_ATTACH_RETURN_CREATEROOT flag to pholder_do_attach.
+  It's a non-API breaking hack that allows the unsqueeze code
+  to find out the root of the created hierarchy, instead of
+  just the attached client window being returned. This way
+  windows are unsqueezed in their newly created frames.
+
+2008-11-03 22:07 UTC  Tuomo Valkonen <tuomov@iki.fi>
+  * Unsqueeze fixes
+
+2008-10-16 14:20 UTC  Tuomo Valkonen <tuomov@iki.fi>
+  * Oops
+
+2008-10-16 13:55 UTC  Tuomo Valkonen <tuomov@iki.fi>
+  * WInfoWin.set_text didn't check for null string
+  (that user scripts can pass to it).
+
+2008-10-09 17:50 UTC  Tuomo Valkonen <tuomov@iki.fi>
+  * ioncore_warn_nolog uses usual warn if not in OPMODE_INIT.
+

 2008-10-02 15:29 UTC  Tuomo Valkonen <tuomov@iki.fi>
   tagged ion-3-20081002
 
 2008-10-02 15:29 UTC  Tuomo Valkonen <tuomov@iki.fi>
   tagged ion-3-20081002
 

diff --git a/LICENSE b/LICENSE
index 52a117d5812e4df1952fc3ed17429edb2f4b9e04..fdfa652c68cd5d06ec2383e7ea4429e6dc5cb4d0 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
 
 

-Copyright (c) Tuomo Valkonen 1999-2008.
+Copyright (c) Tuomo Valkonen 1999-2009.

 
 Unless otherwise indicated in components taken from elsewhere, this software
 is licensed under the GNU Lesser General Public License, version 2.1 ("LGPL",
 
 Unless otherwise indicated in components taken from elsewhere, this software
 is licensed under the GNU Lesser General Public License, version 2.1 ("LGPL",

diff --git a/README b/README
index 3e8fd634de613bd54db0fd7c2c579d69d4e447cb..8a61477fca518d31171db5e73a86a54dff7a4a79 100644 (file)
--- a/README
+++ b/README
@@ -2,7 +2,7 @@
 Ion
 ===
 
 Ion
 ===
 

-Copyright (c) Tuomo Valkonen 1999-2008.
+Copyright (c) Tuomo Valkonen 1999-2009.

 
 tuomov at iki.fi
 
 
 tuomov at iki.fi
 

diff --git a/RELNOTES b/RELNOTES
index 631e3c494f4ed95eff5d5ef87da26625909f3ff7..cfda72e56cb676d587131850f724a487a96735d2 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,4 +1,10 @@
 
 

+ion-3-20090110
+--------------
+
+This is yet another maintenance release.
+
+

 ion-3-20081002
 --------------
 
 ion-3-20081002
 --------------
 

diff --git a/config.h b/config.h
index bac7b4359c495313afd864639e4b124c98a479a3..e54aba7fe84453f91214175ead37ff5406577731 100644 (file)
--- a/config.h
+++ b/config.h
@@ -1,7 +1,7 @@
 /*
  * config.h
  *
 /*
  * config.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008.
+ * Copyright (c) Tuomo Valkonen 1999-2009.

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/de/brush.c b/de/brush.c
index 90a57a9b69e9c96ec32fea35a5caf3513d81579f..c2b5a4f46b3570e064b251dc6b2bcaff9400f475 100644 (file)
--- a/de/brush.c
+++ b/de/brush.c
@@ -1,7 +1,7 @@
 /*
  * ion/de/brush.c
  *
 /*
  * ion/de/brush.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/de/brush.h b/de/brush.h
index f3dc35c8d27d77e04257fd208e85655ab8213ca9..523fcc7158da2e148ebecfcc93ee3d3e8d5c6358 100644 (file)
--- a/de/brush.h
+++ b/de/brush.h
@@ -1,7 +1,7 @@
 /*
  * ion/de/brush.h
  *
 /*
  * ion/de/brush.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/de/colour.c b/de/colour.c
index 4fb3b1dabf5ec1a17026b7122d9e9606ad353732..5bd2d609308be8a5d88a608632882b863c4dba5c 100644 (file)
--- a/de/colour.c
+++ b/de/colour.c
@@ -1,7 +1,7 @@
 /*
  * ion/de/colour.h
  *
 /*
  * ion/de/colour.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/de/colour.h b/de/colour.h
index 9864779392efa0641dcc69bd5dcfa94a2ef366c3..2c2b166d136d157ee7c62ef2b7c39f9ad63d527f 100644 (file)
--- a/de/colour.h
+++ b/de/colour.h
@@ -1,7 +1,7 @@
 /*
  * ion/de/colour.h
  *
 /*
  * ion/de/colour.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/de/draw.c b/de/draw.c
index c9750ba6373a327b232f81419d13034b16344873..bcacfece99a074033792576233ade5cbd5dac143 100644 (file)
--- a/de/draw.c
+++ b/de/draw.c
@@ -1,7 +1,7 @@
 /*
  * ion/de/draw.c
  *
 /*
  * ion/de/draw.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/de/font.c b/de/font.c
index 0f6fab71a11fa9f09162dddcc32b2032b6dc04f4..e70870fc84fac79f17710fd0305ee0cc0ea455d9 100644 (file)
--- a/de/font.c
+++ b/de/font.c
@@ -1,7 +1,7 @@
 /*
  * ion/de/font.c
  *
 /*
  * ion/de/font.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/de/font.h b/de/font.h
index 1b3774c08c816bd25a4b076b21b16496ec65ecca..6ba3fe840558f697039e49a25fb1eed4edafee42 100644 (file)
--- a/de/font.h
+++ b/de/font.h
@@ -1,7 +1,7 @@
 /*
  * ion/de/font.h
  *
 /*
  * ion/de/font.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/de/fontset.h b/de/fontset.h
index badee30f60ca2b34896fefbe75747320b762318b..f35394cd6036769f7e21f6ee3eb6f3114984604c 100644 (file)
--- a/de/fontset.h
+++ b/de/fontset.h
@@ -1,7 +1,7 @@
 /*
  * ion/de/fontset.h
  *
 /*
  * ion/de/fontset.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/de/init.c b/de/init.c
index a47359253754c53e0e767e6554ac5b81b3491141..221515a52b003e40135308d081c434911dbdfe92 100644 (file)
--- a/de/init.c
+++ b/de/init.c
@@ -1,7 +1,7 @@
 /*
  * ion/de/init.c
  *
 /*
  * ion/de/init.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/de/init.h b/de/init.h
index caefc9cf8ad4151edd2bef6f5e9f3e9e895cc833..2bdd52048a25b50ada1594a0460d2a3eb35f1489 100644 (file)
--- a/de/init.h
+++ b/de/init.h
@@ -1,7 +1,7 @@
 /*
  * ion/de/init.h
  *
 /*
  * ion/de/init.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/de/private.h b/de/private.h
index b0f4013da6c2a9eda5529d3fd18e0055f56cfcc1..2d73d5b95a857514c45a8a074dbaf172e91b2ac2 100644 (file)
--- a/de/private.h
+++ b/de/private.h
@@ -1,7 +1,7 @@
 /*
  * ion/de/private.h
  *
 /*
  * ion/de/private.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/de/style.c b/de/style.c
index 06a153145fc948a80bb935c003fc7fe01a4404f2..d5debb9c6530b3b9925dddda292943c924ee86a2 100644 (file)
--- a/de/style.c
+++ b/de/style.c
@@ -1,7 +1,7 @@
 /*
  * ion/de/style.c
  *
 /*
  * ion/de/style.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/de/style.h b/de/style.h
index 6f4063fb46b191e335b2dc0e6f9808b55e45551a..073f14554c3a075cd49c6981c58c80d47527ecf3 100644 (file)
--- a/de/style.h
+++ b/de/style.h
@@ -1,7 +1,7 @@
 /*
  * ion/de/style.h
  *
 /*
  * ion/de/style.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/exact-version b/exact-version
index dd17c91e0181e6d838b4c4aa8964119f4099e367..5195e0f2da22d0a009e9f8a5b8de8fd32fcbb196 100644 (file)
--- a/exact-version
+++ b/exact-version
@@ -1,5 +1,5 @@
 
 Context:
 
 
 Context:
 

-[TAG ion-3-20081002
-Tuomo Valkonen <tuomov@iki.fi>**20081002152911] 
+[TAG ion-3-20090110
+Tuomo Valkonen <tuomov@iki.fi>**20090109221932] 

diff --git a/ion/ion.c b/ion/ion.c
index ac07f3fd555dccd8c5c8ddecb00c2746037cb43c..9e0c2538c308700b0ed73e23624e2515f400137d 100644 (file)
--- a/ion/ion.c
+++ b/ion/ion.c
@@ -1,7 +1,7 @@
 /*
  * ion/ion/ion.c
  *
 /*
  * ion/ion/ion.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/activity.c b/ioncore/activity.c
index 30ff4d1baad69a6df58b558e7cec57e5854dcc0a..1beddba7804e129b81805a4c5d157d2d986157b7 100644 (file)
--- a/ioncore/activity.c
+++ b/ioncore/activity.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/activity.c
  *
 /*
  * ion/ioncore/activity.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/activity.h b/ioncore/activity.h
index 8728a2f4051e9dea2695ffeddae5d8010fe3a193..aa2ed884ec126ed2c8d88c164602f0801b821da6 100644 (file)
--- a/ioncore/activity.h
+++ b/ioncore/activity.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/activity.h
  *
 /*
  * ion/ioncore/activity.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/attach.c b/ioncore/attach.c
index 2ac8d18ce3c08e2ce5886396370dbf86dbf2b731..0ee74ab01743ba24a9b856fb3d2368f352e2c0eb 100644 (file)
--- a/ioncore/attach.c
+++ b/ioncore/attach.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/attach.c
  *
 /*
  * ion/ioncore/attach.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/attach.h b/ioncore/attach.h
index 6fffd37bfa473485bd2ebf6ed16e215825ad77cd..fe89217360ad59ed8beab12ef1c16c4694c8be95 100644 (file)
--- a/ioncore/attach.h
+++ b/ioncore/attach.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/attach.h
  *
 /*
  * ion/ioncore/attach.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/basicpholder.c b/ioncore/basicpholder.c
index 7272908c55999216bdd195e7ccbe7e95fcff8fb2..9689ec49b82e00701e6789bca2124c7a328fbe60 100644 (file)
--- a/ioncore/basicpholder.c
+++ b/ioncore/basicpholder.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/basicpholder.c
  *
 /*
  * ion/ioncore/basicpholder.c
  *

- * Copyright (c) Tuomo Valkonen 2005-2008. 
+ * Copyright (c) Tuomo Valkonen 2005-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/basicpholder.h b/ioncore/basicpholder.h
index 156b4a479a0e0de3e696e5c84e339090ec46064d..8953ca532cfaf9e913b7be0169c98d80afa6d48e 100644 (file)
--- a/ioncore/basicpholder.h
+++ b/ioncore/basicpholder.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/basicpholder.h
  *
 /*
  * ion/ioncore/basicpholder.h
  *

- * Copyright (c) Tuomo Valkonen 2005-2008. 
+ * Copyright (c) Tuomo Valkonen 2005-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/binding.c b/ioncore/binding.c
index f4fb0e67a0fd352ea659ec9f7ab08d1cd212b2df..8f3a69e70a5cbed149efaa754086a39db9ebd915 100644 (file)
--- a/ioncore/binding.c
+++ b/ioncore/binding.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/binding.c
  *
 /*
  * ion/ioncore/binding.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/binding.h b/ioncore/binding.h
index 98d06678bf2b2d0d34142d41e2bc18ed32efc967..3354b23bc81152a1bb4d6b133887a23b25c7bf0e 100644 (file)
--- a/ioncore/binding.h
+++ b/ioncore/binding.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/binding.h
  *
 /*
  * ion/ioncore/binding.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/bindmaps.c b/ioncore/bindmaps.c
index e7318a865a235306dc512a7222a80efd603aa3ca..f22a5ea38a127c0f2cd7b6272b4d30fe822396d3 100644 (file)
--- a/ioncore/bindmaps.c
+++ b/ioncore/bindmaps.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/bindmaps.c
  *
 /*
  * ion/ioncore/bindmaps.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/bindmaps.h b/ioncore/bindmaps.h
index 48631c110e9fb7ad13ef49fee71837bdc6db1696..19dbed1b10e3d7070ddd8e7db85643f52bc3b4a3 100644 (file)
--- a/ioncore/bindmaps.h
+++ b/ioncore/bindmaps.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/bindmaps.h
  *
 /*
  * ion/ioncore/bindmaps.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/classes.h b/ioncore/classes.h
index d7076e417c85f6dd4a00114fd660eda998a891e6..2db3ecc3e53e38ec7051f714224b8151fe5705b5 100644 (file)
--- a/ioncore/classes.h
+++ b/ioncore/classes.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/classes.h
  *
 /*
  * ion/ioncore/classes.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/clientwin.c b/ioncore/clientwin.c
index 0d81b2fe2f8d7e882233c5cc361c79692c81ef5b..11ce2904b56c7d085c5a2924b2b596fa77fbd2f8 100644 (file)
--- a/ioncore/clientwin.c
+++ b/ioncore/clientwin.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/clientwin.c
  *
 /*
  * ion/ioncore/clientwin.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/clientwin.h b/ioncore/clientwin.h
index cd0134a63a396443ec2d6266a0d11c88bf1a28f1..69f676f22999d56972d9fe9ccf61283179bfa645 100644 (file)
--- a/ioncore/clientwin.h
+++ b/ioncore/clientwin.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/clientwin.h
  *
 /*
  * ion/ioncore/clientwin.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/colormap.c b/ioncore/colormap.c
index 303e3197761d64a852706fbef8c6d6718a421bbb..9f80f499ef6f467854fe7b53b3bd2776d0914e4a 100644 (file)
--- a/ioncore/colormap.c
+++ b/ioncore/colormap.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/colormap.c
  *
 /*
  * ion/ioncore/colormap.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/colormap.h b/ioncore/colormap.h
index 8a6c2010c9f07d7b2a9fa1a9c0bfd70f170d0137..b3d8e60f1e83c1127b7666ae0368d1a8ba08febc 100644 (file)
--- a/ioncore/colormap.h
+++ b/ioncore/colormap.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/colormap.h
  *
 /*
  * ion/ioncore/colormap.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/common.h b/ioncore/common.h
index 616e7d93cb589ed9c4bb714402e5f35a61e65218..6318f4f80c4b28f1baec2bfcc9f743a6d6d4d9a7 100644 (file)
--- a/ioncore/common.h
+++ b/ioncore/common.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/common.h
  *
 /*
  * ion/ioncore/common.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/conf-bindings.c b/ioncore/conf-bindings.c
index 69d8996fac812e45cff7eb21fd86239dff611efd..154d94bf1e2b9c39656f96351487e437863d8cdc 100644 (file)
--- a/ioncore/conf-bindings.c
+++ b/ioncore/conf-bindings.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/conf-bindings.c
  *
 /*
  * ion/ioncore/conf-bindings.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/conf-bindings.h b/ioncore/conf-bindings.h
index af0ebf1da20bcd0b2c7af9c0cfdf0d6fb0b95307..31b50da3a6bc2f4f91884c445810347d33cc76e7 100644 (file)
--- a/ioncore/conf-bindings.h
+++ b/ioncore/conf-bindings.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/conf-bindings.h
  *
 /*
  * ion/ioncore/conf-bindings.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/conf.c b/ioncore/conf.c
index 258f563078132cc7f3d794dc3c2efd6bca3db7b9..35844c4e1600f7fffb93844a13255b9dcd40dd81 100644 (file)
--- a/ioncore/conf.c
+++ b/ioncore/conf.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/conf.c
  *
 /*
  * ion/ioncore/conf.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/conf.h b/ioncore/conf.h
index 5435546a719f2db741cab0038e2d7e270582c5e9..c7c9a8d66a65dc00347545a234d117141e210ae2 100644 (file)
--- a/ioncore/conf.h
+++ b/ioncore/conf.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/conf.h
  *
 /*
  * ion/ioncore/conf.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/cursor.c b/ioncore/cursor.c
index ba045c4caaceedd4f82978ff8fbb314f534000eb..5c8954f800d692c6123bfa9c885ca74515c58286 100644 (file)
--- a/ioncore/cursor.c
+++ b/ioncore/cursor.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/cursor.c
  *
 /*
  * ion/ioncore/cursor.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/cursor.h b/ioncore/cursor.h
index ab41d85d9aa81ffe39fd085ef7c40203cfc9d9d8..6f03a0a603b09468356670062fce5e5b4fe194d9 100644 (file)
--- a/ioncore/cursor.h
+++ b/ioncore/cursor.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/cursor.h
  *
 /*
  * ion/ioncore/cursor.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/detach.c b/ioncore/detach.c
index 89187a4a4d321f4ad8ab3f64d1208c41e5dbc82a..e175759e7d231d0d1681da036f5280b7746ac594 100644 (file)
--- a/ioncore/detach.c
+++ b/ioncore/detach.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/detach.c
  *
 /*
  * ion/ioncore/detach.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */


@@ -222,7 +222,6 @@ bool ioncore_detach_extl(WRegion *reg, const char *how)
 void do_unsqueeze(WRegion *reg)
 {
     WSizeHints h;
 void do_unsqueeze(WRegion *reg)
 {
     WSizeHints h;

-    WRegion *mgr=REGION_MANAGER(reg);

     
     if(OBJ_IS(reg, WScreen))
         return;
     
     if(OBJ_IS(reg, WScreen))
         return;


@@ -238,11 +237,6 @@ void do_unsqueeze(WRegion *reg)
     }
     
     ioncore_detach(reg, SETPARAM_SET);
     }
     
     ioncore_detach(reg, SETPARAM_SET);

-        
-    if(REGION_MANAGER(reg)==mgr)
-        return;
-    
-    do_unsqueeze(reg);

 }
 
 
 }
 
 


@@ -256,7 +250,7 @@ EXTL_EXPORT
 void ioncore_unsqueeze(WRegion *reg, bool override)
 {
     if(ioncore_g.unsqueeze_enabled || override)
 void ioncore_unsqueeze(WRegion *reg, bool override)
 {
     if(ioncore_g.unsqueeze_enabled || override)

-        do_unsqueeze(region_groupleader_of(reg));
+        do_unsqueeze(reg);

 }
 
 
 }
 
 

diff --git a/ioncore/detach.h b/ioncore/detach.h
index 0a2da1ed5e507ac64afb658c1aaea97e712c344c..6a5c72144a58ab6d82582593850aea3f88aba6cb 100644 (file)
--- a/ioncore/detach.h
+++ b/ioncore/detach.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/detach.h
  *
 /*
  * ion/ioncore/detach.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/dummywc.h b/ioncore/dummywc.h
index 87bafe212fe80a4aaf428615cd8f9ea73ccd8b29..588f1649a2612c9301678e0cd416f8913dc7c07d 100644 (file)
--- a/ioncore/dummywc.h
+++ b/ioncore/dummywc.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/dummywc.h
  *
 /*
  * ion/ioncore/dummywc.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/event.c b/ioncore/event.c
index 02bc5fea6b228efd53f39fe24be9088a2d7c5883..75384a15ba8c38581b407e917b36e0f0e7cc61e3 100644 (file)
--- a/ioncore/event.c
+++ b/ioncore/event.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/event.c
  *
 /*
  * ion/ioncore/event.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/event.h b/ioncore/event.h
index 3a810c43a35a9d3998630a0c9c05f70020407ffc..9b2d0f962ca17bfad970bd4f11b9ec0f973e72ed 100644 (file)
--- a/ioncore/event.h
+++ b/ioncore/event.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/event.h
  *
 /*
  * ion/ioncore/event.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/eventh.c b/ioncore/eventh.c
index 572ab91073f7582a0ebe009f308085cddd192e18..861007f4b06eb3da7564797025408f39a993be1b 100644 (file)
--- a/ioncore/eventh.c
+++ b/ioncore/eventh.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/eventh.c
  *
 /*
  * ion/ioncore/eventh.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/eventh.h b/ioncore/eventh.h
index af10eb28e75deb278cf240a59b7269824120ee2e..fd3f1c38fcda4ee3b30f63db474997959ef499b9 100644 (file)
--- a/ioncore/eventh.h
+++ b/ioncore/eventh.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/eventh.h
  *
 /*
  * ion/ioncore/eventh.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/exec.c b/ioncore/exec.c
index bd43fe862c39e428451e037aa8de4d7e5a5beeda..9da70032c12d2a4d7ccf74ff806994d87eb309a9 100644 (file)
--- a/ioncore/exec.c
+++ b/ioncore/exec.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/exec.c
  *
 /*
  * ion/ioncore/exec.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/exec.h b/ioncore/exec.h
index 39e0c683f84df9b7626a00512cf44d0f6a76d32e..827505381a12cd506f6e77ef39943a4355c9bd1e 100644 (file)
--- a/ioncore/exec.h
+++ b/ioncore/exec.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/exec.h
  *
 /*
  * ion/ioncore/exec.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/extlconv.c b/ioncore/extlconv.c
index 8f361739a62f1a0edd7e40848d5b6543f2d19471..f363ec36b80a5e69906d5c75af065461f689c6de 100644 (file)
--- a/ioncore/extlconv.c
+++ b/ioncore/extlconv.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/extlconv.c
  *
 /*
  * ion/ioncore/extlconv.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/extlconv.h b/ioncore/extlconv.h
index d56f9dc76c40398f5c095290353e0a9bc7b26062..2582a4246a0c455853229a22fccd2d0ab4542f36 100644 (file)
--- a/ioncore/extlconv.h
+++ b/ioncore/extlconv.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/extlconv.h
  *
 /*
  * ion/ioncore/extlconv.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/extlrx.c b/ioncore/extlrx.c
index 155a32510ca2e5f0b1e3ff8c2654751a68b468c8..190100af77ecb2915684209557852d956220eeba 100644 (file)
--- a/ioncore/extlrx.c
+++ b/ioncore/extlrx.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/extlrx.c
  *
 /*
  * ion/ioncore/extlrx.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/float-placement.c b/ioncore/float-placement.c
index f36b30f00f2513d103fb2ec18b66e8d4010997d5..fe02708741eb1fdfe9abb574797aa1bd6456b88e 100644 (file)
--- a/ioncore/float-placement.c
+++ b/ioncore/float-placement.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/float-placement.c
  *
 /*
  * ion/ioncore/float-placement.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/float-placement.h b/ioncore/float-placement.h
index ebde2cf48eb89e5aeebd25e94ff4c1c0b6e285f3..cbe2ed8879640e07a62ed32c19c5c1f0ea57cc1a 100644 (file)
--- a/ioncore/float-placement.h
+++ b/ioncore/float-placement.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/float-placement.h
  *
 /*
  * ion/ioncore/float-placement.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/focus.c b/ioncore/focus.c
index f80a5f20c5ddada600224003eb8e9f18551c24a2..ee3fd86ab796625077e6101b5b8460bdf2d9cc1b 100644 (file)
--- a/ioncore/focus.c
+++ b/ioncore/focus.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/focus.c
  *
 /*
  * ion/ioncore/focus.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/focus.h b/ioncore/focus.h
index 12340cd00088086aa3981dee28110ef400cc067a..bf7cc06e4ac4295d362b13868cbafcdcf0b74993 100644 (file)
--- a/ioncore/focus.h
+++ b/ioncore/focus.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/focus.h
  *
 /*
  * ion/ioncore/focus.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/frame-draw.c b/ioncore/frame-draw.c
index 00375843d8ac9df58411a979ec1d4cd1a61788d2..fbe58061bafed48a608e1407bbaf4a1aeeda6e52 100644 (file)
--- a/ioncore/frame-draw.c
+++ b/ioncore/frame-draw.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/frame-draw.c
  *
 /*
  * ion/ioncore/frame-draw.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/frame-draw.h b/ioncore/frame-draw.h
index 6b8d7d338a7fbbbb7bb2dd43951ef0cdfd8a8843..03b4177b7c2f6d63ed9574aa18b9a38a960759d6 100644 (file)
--- a/ioncore/frame-draw.h
+++ b/ioncore/frame-draw.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/frame-draw.h
  *
 /*
  * ion/ioncore/frame-draw.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/frame-pointer.c b/ioncore/frame-pointer.c
index 7b4d8fa05a826ebc9b668a1644339295136f6dcf..6340dd0d2ccfebdd692bcf999bce243f46565ab6 100644 (file)
--- a/ioncore/frame-pointer.c
+++ b/ioncore/frame-pointer.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/frame-pointer.c
  *
 /*
  * ion/ioncore/frame-pointer.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/frame-pointer.h b/ioncore/frame-pointer.h
index df31c63b22a7c7717f68c62e62bafbcf4b8dd46c..5340f0122c151f682b16717b92fd3f4d76c4d7ca 100644 (file)
--- a/ioncore/frame-pointer.h
+++ b/ioncore/frame-pointer.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/frame-pointer.h
  *
 /*
  * ion/ioncore/frame-pointer.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/frame.c b/ioncore/frame.c
index 019cd8b4ee8d6490f33b55fa86495d3c0d4e3a7c..4f82aa4fa951a37b7b0d6601a569a542f5c811e9 100644 (file)
--- a/ioncore/frame.c
+++ b/ioncore/frame.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/frame.c
  *
 /*
  * ion/ioncore/frame.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/frame.h b/ioncore/frame.h
index 33d846ea64586f7d96949855ddb30727bf4c21ba..d69c27973d8436d2850cc77bc7ea0a9d860b0007 100644 (file)
--- a/ioncore/frame.h
+++ b/ioncore/frame.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/frame.h
  *
 /*
  * ion/ioncore/frame.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/framedpholder.c b/ioncore/framedpholder.c
index 0a198087709a0b913f4ce5253028feca52b6491a..60c6291ba6c894a58520427b742c2778993cdab1 100644 (file)
--- a/ioncore/framedpholder.c
+++ b/ioncore/framedpholder.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/framedpholder.c
  *
 /*
  * ion/ioncore/framedpholder.c
  *

- * Copyright (c) Tuomo Valkonen 2005-2008. 
+ * Copyright (c) Tuomo Valkonen 2005-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */


@@ -202,7 +202,9 @@ WRegion *framedpholder_do_attach(WFramedPHolder *ph, int flags,
         watch_setup(&ph->frame_watch, (Obj*)frame, NULL);
     }
     
         watch_setup(&ph->frame_watch, (Obj*)frame, NULL);
     }
     

-    return ap.reg_ret;
+    return (flags&PHOLDER_ATTACH_RETURN_CREATEROOT
+            ? (WRegion*)frame
+            : ap.reg_ret);

 }
 
 
 }
 
 

diff --git a/ioncore/framedpholder.h b/ioncore/framedpholder.h
index fc25ee3893d975dc49ca5098e3154fc5af0e1b09..754731d05cd5dbeda8fb5b9fb9ec74b202f3dc6c 100644 (file)
--- a/ioncore/framedpholder.h
+++ b/ioncore/framedpholder.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/framedpholder.h
  *
 /*
  * ion/ioncore/framedpholder.h
  *

- * Copyright (c) Tuomo Valkonen 2005-2008. 
+ * Copyright (c) Tuomo Valkonen 2005-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/framep.h b/ioncore/framep.h
index 41c1efdb33ef036b1111621352e36cf15b0a9dca..6b49f2ebeb1757464c8017eab2cbf530f54fd897 100644 (file)
--- a/ioncore/framep.h
+++ b/ioncore/framep.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/framep.h
  *
 /*
  * ion/ioncore/framep.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/fullscreen.c b/ioncore/fullscreen.c
index 2ddf9856bacb066802a171640c276417fd2a42c0..04fc7eaf76d721472c82dce7d196d965b93ca0d2 100644 (file)
--- a/ioncore/fullscreen.c
+++ b/ioncore/fullscreen.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/fullscreen.c
  *
 /*
  * ion/ioncore/fullscreen.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/fullscreen.h b/ioncore/fullscreen.h
index 4d70aff89c4dd34dc9ffc8b347297a174c5e132e..45a0a085796a12a3ceddac72b8b62f5ddc3dcd22 100644 (file)
--- a/ioncore/fullscreen.h
+++ b/ioncore/fullscreen.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/fullscreen.h
  *
 /*
  * ion/ioncore/fullscreen.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/global.h b/ioncore/global.h
index 8039f5fddbb5e27793a092a8c78e62144766aad6..fb00d99e93278221409a32ca77b84f62944d6534 100644 (file)
--- a/ioncore/global.h
+++ b/ioncore/global.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/global.h
  *
 /*
  * ion/ioncore/global.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/gr-util.h b/ioncore/gr-util.h
index f30f33ac09c2d66dcf729c51e01d828e24a849e7..d9ede08c0a41b29afd6badecf597c5e04823bd1e 100644 (file)
--- a/ioncore/gr-util.h
+++ b/ioncore/gr-util.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/gr-util.h
  *
 /*
  * ion/ioncore/gr-util.h
  *

- * Copyright (c) Tuomo Valkonen 2007-2008. 
+ * Copyright (c) Tuomo Valkonen 2007-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/gr.c b/ioncore/gr.c
index 794f1f76306a54061412681cba35c9b1fcf01501..b1712a1afe83fd47de4c5a7379a8596b24b0aaa7 100644 (file)
--- a/ioncore/gr.c
+++ b/ioncore/gr.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/gr.c
  *
 /*
  * ion/ioncore/gr.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/gr.h b/ioncore/gr.h
index 516b6e33df31646ac6e637c654ddd06d72400b7c..96098c6061f285117de2c64a799c8216a5cc0fb5 100644 (file)
--- a/ioncore/gr.h
+++ b/ioncore/gr.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/gr.h
  *
 /*
  * ion/ioncore/gr.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/grab.c b/ioncore/grab.c
index c65f2887eb1b602cc413b220060f4a41973798e9..4963e8a763b8a967dbec88c4dbabda27b6297871 100644 (file)
--- a/ioncore/grab.c
+++ b/ioncore/grab.c
@@ -2,7 +2,7 @@
  * ion/ioncore/grab.c
  * 
  * Copyright (c) Lukas Schroeder 2002,
  * ion/ioncore/grab.c
  * 
  * Copyright (c) Lukas Schroeder 2002,

- *               Tuomo Valkonen 2003-2008.
+ *               Tuomo Valkonen 2003-2009.

  *
  * See the included file LICENSE for details.
  * 
  *
  * See the included file LICENSE for details.
  * 

diff --git a/ioncore/grab.h b/ioncore/grab.h
index 98f4586b80a8c01b994af8e7d5a30a8eacc06a32..dcc0675333a5010e7d8b073ed423f5ccf44b5073 100644 (file)
--- a/ioncore/grab.h
+++ b/ioncore/grab.h
@@ -2,7 +2,7 @@
  * ion/ioncore/grab.h
  *
  * Copyright (c) Lukas Schroeder 2002,
  * ion/ioncore/grab.h
  *
  * Copyright (c) Lukas Schroeder 2002,

- *               Tuomo Valkonen 2003-2008.
+ *               Tuomo Valkonen 2003-2009.

  *
  * See the included file LICENSE for details.
  *
  *
  * See the included file LICENSE for details.
  *

diff --git a/ioncore/group-cw.c b/ioncore/group-cw.c
index 48f234a2939aba3b0645192b33b613c962d73bf0..f117cf66d84b144a1d01370bf77ec9a43de2359b 100644 (file)
--- a/ioncore/group-cw.c
+++ b/ioncore/group-cw.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/group-cw.c
  *
 /*
  * ion/ioncore/group-cw.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/group-cw.h b/ioncore/group-cw.h
index d5f5afeabc5dfe805f16644305b84bc5e56f5a6b..16b6360db951b0a7d737158a8ec6ff5ebf832ea2 100644 (file)
--- a/ioncore/group-cw.h
+++ b/ioncore/group-cw.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/group-cw.h
  *
 /*
  * ion/ioncore/group-cw.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/group-ws.c b/ioncore/group-ws.c
index 4445c55c575a34df3427a09d1a9336b22631e577..d7b74473e37cff9be5406e77d96dcb17da185d89 100644 (file)
--- a/ioncore/group-ws.c
+++ b/ioncore/group-ws.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/group-ws.c
  *
 /*
  * ion/ioncore/group-ws.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/group-ws.h b/ioncore/group-ws.h
index e385e28a69c6cefb6f3c62c85b61660a5d1b4b0c..786df60d3d9cc152a0162fe36869fcfef76747c1 100644 (file)
--- a/ioncore/group-ws.h
+++ b/ioncore/group-ws.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/groupws.h
  *
 /*
  * ion/ioncore/groupws.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/group.c b/ioncore/group.c
index 750c95595e050a3e6a3b99f9ffbf28e680269269..3db079526e8ece8bbcb89b258207e12cd4bb7227 100644 (file)
--- a/ioncore/group.c
+++ b/ioncore/group.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/group.c
  *
 /*
  * ion/ioncore/group.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/group.h b/ioncore/group.h
index 85af3495b06d7dcfdef4df37e6817f5b24bb3ba5..1b3fd3c743063e985da64316a0f8fe37f616763c 100644 (file)
--- a/ioncore/group.h
+++ b/ioncore/group.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/group.h
  *
 /*
  * ion/ioncore/group.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/grouppholder.c b/ioncore/grouppholder.c
index 2d941e4166bf15d08cd8438b055ec2a5f9f1e31b..052f67725941761d643e4f2d1a286054146f607c 100644 (file)
--- a/ioncore/grouppholder.c
+++ b/ioncore/grouppholder.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/grouppholder.c
  *
 /*
  * ion/ioncore/grouppholder.c
  *

- * Copyright (c) Tuomo Valkonen 2005-2008. 
+ * Copyright (c) Tuomo Valkonen 2005-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */


@@ -227,7 +227,7 @@ static WRegion *grouppholder_attach_recreate(WGroupPHolder *ph, int flags,
 {
     WRegionAttachData data2;
     WPHolder *root, *rph;
 {
     WRegionAttachData data2;
     WPHolder *root, *rph;

-    WGroup *grp;
+    WRegion *res;

     RP rp;
     
     rp.ph_head=get_head(ph);
     RP rp;
     
     rp.ph_head=get_head(ph);


@@ -247,16 +247,17 @@ static WRegion *grouppholder_attach_recreate(WGroupPHolder *ph, int flags,
     data2.u.n.fn=recreate_handler;
     data2.u.n.param=&rp;
     
     data2.u.n.fn=recreate_handler;
     data2.u.n.param=&rp;
     

-    grp=(WGroup*)pholder_do_attach(rph, flags, &data2);
+    res=pholder_do_attach(rph, flags, &data2);

     
     

-    if(grp!=NULL){
-        assert(OBJ_IS(grp, WGroup));
+    if(res!=NULL){

         rp.ph_head->recreate_pholder=NULL;
         /* It might be in use in attach chain! So defer. */
         mainloop_defer_destroy((Obj*)rph);
     }
 
         rp.ph_head->recreate_pholder=NULL;
         /* It might be in use in attach chain! So defer. */
         mainloop_defer_destroy((Obj*)rph);
     }
 

-    return rp.reg_ret;
+    return (flags&PHOLDER_ATTACH_RETURN_CREATEROOT
+            ? (WRegion*)res
+            : rp.reg_ret);

 }
 
 
 }
 
 

diff --git a/ioncore/grouppholder.h b/ioncore/grouppholder.h
index 5c8ca19270af6372cb7273720cbee40f33f6e17d..f627089aefa0856c4f01cb08afade7174123067b 100644 (file)
--- a/ioncore/grouppholder.h
+++ b/ioncore/grouppholder.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/grouppholder.h
  *
 /*
  * ion/ioncore/grouppholder.h
  *

- * Copyright (c) Tuomo Valkonen 2005-2008. 
+ * Copyright (c) Tuomo Valkonen 2005-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/infowin.c b/ioncore/infowin.c
index 5dd0b2871d9c955443f882792ce211c33a68c72c..66029b2a41ff5ad675769d8e0f9dc4d5d3b0758c 100644 (file)
--- a/ioncore/infowin.c
+++ b/ioncore/infowin.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/infowin.h
  *
 /*
  * ion/ioncore/infowin.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */


@@ -198,18 +198,22 @@ void infowin_set_text(WInfoWin *p, const char *str, int maxw)
 {
     bool set=FALSE;
     
 {
     bool set=FALSE;
     

-    if(maxw>0 && p->brush!=NULL){
-        char *tmp=grbrush_make_label(p->brush, str, maxw);
-        if(tmp!=NULL){
-            infowin_do_set_text(p, tmp);
-            free(tmp);
-            set=TRUE;
+    if(str==NULL){
+        INFOWIN_BUFFER(p)[0]='\0';
+    }else{
+        if(maxw>0 && p->brush!=NULL){
+            char *tmp=grbrush_make_label(p->brush, str, maxw);
+            if(tmp!=NULL){
+                infowin_do_set_text(p, tmp);
+                free(tmp);
+                set=TRUE;
+            }

         }
         }

+        
+        if(!set)
+            infowin_do_set_text(p, str);

     }
     
     }
     

-    if(!set)
-        infowin_do_set_text(p, str);
-

     infowin_resize(p);
     
     /* sometimes unnecessary */
     infowin_resize(p);
     
     /* sometimes unnecessary */

diff --git a/ioncore/infowin.h b/ioncore/infowin.h
index 5019d786356fcdfd9659274ceec7f9e141ead6ef..e7a450e46547721f553f96441da3bddc6db96c76 100644 (file)
--- a/ioncore/infowin.h
+++ b/ioncore/infowin.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/infowin.h
  *
 /*
  * ion/ioncore/infowin.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/ioncore.c b/ioncore/ioncore.c
index 33eb3e37d229e8856cc51b7989ffa1230abc950a..0675d0a83c6b8bcfdfd5daa58443ecc972eadd12 100644 (file)
--- a/ioncore/ioncore.c
+++ b/ioncore/ioncore.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/ioncore.c
  *
 /*
  * ion/ioncore/ioncore.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */


@@ -74,7 +74,7 @@ WGlobal ioncore_g;
 static const char *progname="ion";
 
 static const char ioncore_copy[]=
 static const char *progname="ion";
 
 static const char ioncore_copy[]=

-    "Ion " ION_VERSION ", copyright (c) Tuomo Valkonen 1999-2008.";
+    "Ion " ION_VERSION ", copyright (c) Tuomo Valkonen 1999-2009.";

 
 static const char ioncore_license[]=DUMMY_TR(
     "This software is licensed under the GNU Lesser General Public License\n"
 
 static const char ioncore_license[]=DUMMY_TR(
     "This software is licensed under the GNU Lesser General Public License\n"


@@ -105,9 +105,15 @@ void ioncore_warn_nolog(const char *str, ...)
     va_list args;
     
     va_start(args, str);
     va_list args;
     
     va_start(args, str);

-    fprintf(stderr, "%s: ", libtu_progname());
-    vfprintf(stderr, str, args);
-    fprintf(stderr, "\n");
+    
+    if(ioncore_g.opmode==IONCORE_OPMODE_INIT){
+        fprintf(stderr, "%s: ", libtu_progname());
+        vfprintf(stderr, str, args);
+        fprintf(stderr, "\n");
+    }else{
+        warn_v(str, args);
+    }
+    

     va_end(args);
 }
 
     va_end(args);
 }
 


@@ -189,7 +195,7 @@ static bool check_encoding()
     }
 
     if(mbtowc(NULL, NULL, 0)!=0){
     }
 
     if(mbtowc(NULL, NULL, 0)!=0){

-        warn("Statefull encodings are unsupported.");
+        warn(TR("Statefull encodings are unsupported."));

         return FALSE;
     }
     
         return FALSE;
     }
     


@@ -199,11 +205,11 @@ static bool check_encoding()
     return TRUE;
     
 integr_err:
     return TRUE;
     
 integr_err:

-    warn("Cannot verify locale encoding setting integrity "
-         "(LC_CTYPE=%s, nl_langinfo(CODESET)=%s). "
-         "The LC_CTYPE environment variable should be of the form "
-         "language_REGION.encoding (e.g. en_GB.UTF-8), and encoding "
-         "should match the nl_langinfo value above.", ctype, langi);
+    warn(TR("Cannot verify locale encoding setting integrity "
+            "(LC_CTYPE=%s, nl_langinfo(CODESET)=%s). "
+            "The LC_CTYPE environment variable should be of the form "
+            "language_REGION.encoding (e.g. en_GB.UTF-8), and encoding "
+            "should match the nl_langinfo value above."), ctype, langi);

     return FALSE;
 }
 
     return FALSE;
 }
 

diff --git a/ioncore/ioncore.h b/ioncore/ioncore.h
index 5756aab44c5a277924708dec2cb6105bcd0b164a..19e53eec6e9b4a4d71f961e7a43f578069028782 100644 (file)
--- a/ioncore/ioncore.h
+++ b/ioncore/ioncore.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/focus.h
  *
 /*
  * ion/ioncore/focus.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/ioncore_bindings.lua b/ioncore/ioncore_bindings.lua
index a3da00c91bc0cc97a1f220a3a7e1d29ee9bf6651..01588ebaed474057aff36fb5be578232a71d2746 100644 (file)
--- a/ioncore/ioncore_bindings.lua
+++ b/ioncore/ioncore_bindings.lua
@@ -1,7 +1,7 @@
 --
 -- ion/share/ioncore-bindings.lua
 -- 
 --
 -- ion/share/ioncore-bindings.lua
 -- 

--- Copyright (c) Tuomo Valkonen 2004-2008.
+-- Copyright (c) Tuomo Valkonen 2004-2009.

 --
 -- See the included file LICENSE for details.
 --
 --
 -- See the included file LICENSE for details.
 --

diff --git a/ioncore/ioncore_efbb.lua b/ioncore/ioncore_efbb.lua
index f26cdc350166763df0c9bf348538c2e75a2b653f..e5049ba8c8fd3121cbe05ccbfcbca527590a9544 100644 (file)
--- a/ioncore/ioncore_efbb.lua
+++ b/ioncore/ioncore_efbb.lua
@@ -1,7 +1,7 @@
 --
 -- ion/share/ioncore_efbb.lua -- Minimal emergency fallback bindings.
 -- 
 --
 -- ion/share/ioncore_efbb.lua -- Minimal emergency fallback bindings.
 -- 

--- Copyright (c) Tuomo Valkonen 2004-2008.
+-- Copyright (c) Tuomo Valkonen 2004-2009.

 --
 -- See the included file LICENSE for details.
 --
 --
 -- See the included file LICENSE for details.
 --

diff --git a/ioncore/ioncore_ext.lua b/ioncore/ioncore_ext.lua
index 88828d1352edde4f0dd552cba8a0560627176f09..56f05032240ae69e413cd0213290fe77b322cc47 100644 (file)
--- a/ioncore/ioncore_ext.lua
+++ b/ioncore/ioncore_ext.lua
@@ -1,7 +1,7 @@
 --
 -- ion/share/ioncore_ext.lua -- Ioncore Lua library
 -- 
 --
 -- ion/share/ioncore_ext.lua -- Ioncore Lua library
 -- 

--- Copyright (c) Tuomo Valkonen 2004-2008.
+-- Copyright (c) Tuomo Valkonen 2004-2009.

 --
 -- See the included file LICENSE for details.
 --
 --
 -- See the included file LICENSE for details.
 --

diff --git a/ioncore/ioncore_luaext.lua b/ioncore/ioncore_luaext.lua
index a98d2cea40041808862e02c911ec804f1e20e274..a8ab8b860e4c1894eeb349409626e4b375f09bef 100644 (file)
--- a/ioncore/ioncore_luaext.lua
+++ b/ioncore/ioncore_luaext.lua
@@ -1,7 +1,7 @@
 --
 -- ion/share/ioncore_luaext.lua
 -- 
 --
 -- ion/share/ioncore_luaext.lua
 -- 

--- Copyright (c) Tuomo Valkonen 2004-2008.
+-- Copyright (c) Tuomo Valkonen 2004-2009.

 --
 -- See the included file LICENSE for details.
 --
 --
 -- See the included file LICENSE for details.
 --

diff --git a/ioncore/ioncore_menudb.lua b/ioncore/ioncore_menudb.lua
index 62cf04a7622ca95d81861f43c3c313d00487e17d..1d8100b7c3b9635f92fc522295f75eb2e752f15a 100644 (file)
--- a/ioncore/ioncore_menudb.lua
+++ b/ioncore/ioncore_menudb.lua
@@ -1,7 +1,7 @@
 --
 -- ion/ioncore/ioncore_menudb.lua -- Routines for defining menus.
 -- 
 --
 -- ion/ioncore/ioncore_menudb.lua -- Routines for defining menus.
 -- 

--- Copyright (c) Tuomo Valkonen 2004-2008.
+-- Copyright (c) Tuomo Valkonen 2004-2009.

 --
 -- See the included file LICENSE for details.
 --
 --
 -- See the included file LICENSE for details.
 --

diff --git a/ioncore/ioncore_misc.lua b/ioncore/ioncore_misc.lua
index 3451d7be4329411e7517b85c089465202e2f81e7..7dc63535b1c00cd31a43dd000cff177d3ba5f9b3 100644 (file)
--- a/ioncore/ioncore_misc.lua
+++ b/ioncore/ioncore_misc.lua
@@ -1,7 +1,7 @@
 --
 -- ion/share/ioncore_misc.lua
 -- 
 --
 -- ion/share/ioncore_misc.lua
 -- 

--- Copyright (c) Tuomo Valkonen 2004-2008.
+-- Copyright (c) Tuomo Valkonen 2004-2009.

 --
 -- See the included file LICENSE for details.
 --
 --
 -- See the included file LICENSE for details.
 --

diff --git a/ioncore/ioncore_quasiact.lua b/ioncore/ioncore_quasiact.lua
index 13749965167e2c12d53eb90ddcbc01962a659fcd..68f004d908bb9bed2001aff90759b7d87e157689 100644 (file)
--- a/ioncore/ioncore_quasiact.lua
+++ b/ioncore/ioncore_quasiact.lua
@@ -1,7 +1,7 @@
 --
 -- ion/share/ioncore_quasiact.lua -- Frame quasiactivation support
 -- 
 --
 -- ion/share/ioncore_quasiact.lua -- Frame quasiactivation support
 -- 

--- Copyright (c) Tuomo Valkonen 2007-2008.
+-- Copyright (c) Tuomo Valkonen 2007-2009.

 --
 -- See the included file LICENSE for details.
 --
 --
 -- See the included file LICENSE for details.
 --

diff --git a/ioncore/ioncore_tabnum.lua b/ioncore/ioncore_tabnum.lua
index 2a3cbadb93061a2bf2a663f4eff058070e562c22..24f8a18c88f7fe07e10c267fdd5fefa4b469d925 100644 (file)
--- a/ioncore/ioncore_tabnum.lua
+++ b/ioncore/ioncore_tabnum.lua
@@ -1,7 +1,7 @@
 --
 -- ion/share/ioncore_tabnum.lua -- Ioncore tab numbering support
 -- 
 --
 -- ion/share/ioncore_tabnum.lua -- Ioncore tab numbering support
 -- 

--- Copyright (c) Tuomo Valkonen 2007-2008.
+-- Copyright (c) Tuomo Valkonen 2007-2009.

 --
 -- See the included file LICENSE for details.
 --
 --
 -- See the included file LICENSE for details.
 --

diff --git a/ioncore/ioncore_wd.lua b/ioncore/ioncore_wd.lua
index 48bc7fcf84bc9f956efc9ffac38b923ca34e01dc..b00b18daffcfeacbddb09476403ee9ee7dc28325 100644 (file)
--- a/ioncore/ioncore_wd.lua
+++ b/ioncore/ioncore_wd.lua
@@ -1,7 +1,7 @@
 --
 -- ion/share/ioncore_wd.lua
 -- 
 --
 -- ion/share/ioncore_wd.lua
 -- 

--- Copyright (c) Tuomo Valkonen 2004-2008.
+-- Copyright (c) Tuomo Valkonen 2004-2009.

 --
 -- See the included file LICENSE for details.
 --
 --
 -- See the included file LICENSE for details.
 --

diff --git a/ioncore/ioncore_winprops.lua b/ioncore/ioncore_winprops.lua
index b74ed63c0dda546717ed0d54a3473834f710b3ce..329448691c018d2078304949aec139103f49406e 100644 (file)
--- a/ioncore/ioncore_winprops.lua
+++ b/ioncore/ioncore_winprops.lua
@@ -1,7 +1,7 @@
 --
 -- ion/share/ioncore_winprops.lua
 -- 
 --
 -- ion/share/ioncore_winprops.lua
 -- 

--- Copyright (c) Tuomo Valkonen 2004-2008.
+-- Copyright (c) Tuomo Valkonen 2004-2009.

 --
 -- See the included file LICENSE for details.
 --
 --
 -- See the included file LICENSE for details.
 --

diff --git a/ioncore/kbresize.c b/ioncore/kbresize.c
index 7fe00c3f4397adb45fbd46c0604f8c73d0f095da..99f908d696ff769ddbd663444fbe3b30501b56e5 100644 (file)
--- a/ioncore/kbresize.c
+++ b/ioncore/kbresize.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/kbresize.c
  *
 /*
  * ion/ioncore/kbresize.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/kbresize.h b/ioncore/kbresize.h
index f05857f500b251342e3d826eccbe975b517e55ae..ca9e1b4fe322d969d39f6266c0e748aead5d9b9f 100644 (file)
--- a/ioncore/kbresize.h
+++ b/ioncore/kbresize.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/kbresize.h
  *
 /*
  * ion/ioncore/kbresize.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/key.c b/ioncore/key.c
index 523838356ca3a136a445175add35f410a5adbd14..8675b8ce475f4663fb0b89954d317a498ae90bac 100644 (file)
--- a/ioncore/key.c
+++ b/ioncore/key.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/key.c
  *
 /*
  * ion/ioncore/key.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/key.h b/ioncore/key.h
index 614186edb416dd43e77be31a35a077bba00d158f..cb5831d4529b1db9468fa998d13ce8c12b7a8c3e 100644 (file)
--- a/ioncore/key.h
+++ b/ioncore/key.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/key.h
  *
 /*
  * ion/ioncore/key.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/llist.c b/ioncore/llist.c
index f9cc92dc1459bfbb4aaede904dcaaa712cdec08d..b47eef2d43322d98a8bb75ae052efa25237276e7 100644 (file)
--- a/ioncore/llist.c
+++ b/ioncore/llist.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/llist.c
  *
 /*
  * ion/ioncore/llist.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/llist.h b/ioncore/llist.h
index d3807a91245b1c3c848e2aa3e60e317766ee2d2e..5e1c7a91821f896271ff0a8fa5f928c653a27097 100644 (file)
--- a/ioncore/llist.h
+++ b/ioncore/llist.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/llist.h
  *
 /*
  * ion/ioncore/llist.h
  *

- * Copyright (c) Tuomo Valkonen 2005-2008. 
+ * Copyright (c) Tuomo Valkonen 2005-2009. 

  * 
  * See the included file LICENSE for details.
  */
  * 
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/manage.c b/ioncore/manage.c
index 5b036053c52218218b5f9dd50deb2f81133b0e5d..9215804123b63c79444ee0fe394016b4b9b8db4f 100644 (file)
--- a/ioncore/manage.c
+++ b/ioncore/manage.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/manage.c
  *
 /*
  * ion/ioncore/manage.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */


@@ -186,6 +186,7 @@ bool clientwin_do_manage_default(WClientWin *cwin,
     WPHolder *ph=NULL;
     int swf=(param->switchto ? PHOLDER_ATTACH_SWITCHTO : 0);
     bool ok, uq=FALSE;
     WPHolder *ph=NULL;
     int swf=(param->switchto ? PHOLDER_ATTACH_SWITCHTO : 0);
     bool ok, uq=FALSE;

+    WRegion *createroot=NULL;

 
     /* Find a suitable screen */
     scr=clientwin_find_suitable_screen(cwin, param);
 
     /* Find a suitable screen */
     scr=clientwin_find_suitable_screen(cwin, param);


@@ -226,15 +227,22 @@ bool clientwin_do_manage_default(WClientWin *cwin,
         return FALSE;
     
     /* Not in full-screen mode; use the placeholder to attach. */
         return FALSE;
     
     /* Not in full-screen mode; use the placeholder to attach. */

-    
-    ok=pholder_attach(ph, swf, (WRegion*)cwin);
-    
+    {
+        WRegionAttachData data;
+        data.type=REGION_ATTACH_REPARENT;
+        data.u.reg=(WRegion*)cwin;
+    
+        createroot=pholder_do_attach(ph, 
+                                     swf|PHOLDER_ATTACH_RETURN_CREATEROOT,
+                                     &data);
+    }
+

     destroy_obj((Obj*)ph);
     
     destroy_obj((Obj*)ph);
     

-    if(uq && ok)
-        ioncore_unsqueeze((WRegion*)cwin, FALSE);
+    if(uq && createroot!=NULL)
+        ioncore_unsqueeze(createroot, FALSE);

     
     

-    return ok;
+    return (createroot!=NULL);

 }
 
 
 }
 
 

diff --git a/ioncore/manage.h b/ioncore/manage.h
index 3db5a1f9a06363f0b7705a1e6757a58dbf76c9d4..ba5473740e1fbdec47e2909c803813777e194a8a 100644 (file)
--- a/ioncore/manage.h
+++ b/ioncore/manage.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/manage.h
  *
 /*
  * ion/ioncore/manage.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/modules.c b/ioncore/modules.c
index 10e1c29dddacd3c4a82d66a706b11273acea8e56..0f0f8f3abf643cca1900045de7f654e9c3b2dd1c 100644 (file)
--- a/ioncore/modules.c
+++ b/ioncore/modules.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/modules.c
  *
 /*
  * ion/ioncore/modules.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/modules.h b/ioncore/modules.h
index ac9edfda18e914a6d1fa30a9659eb80e6374b2ed..6118ab890521f6806de3896c8f4a77fcac0c8f1e 100644 (file)
--- a/ioncore/modules.h
+++ b/ioncore/modules.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/modules.h
  *
 /*
  * ion/ioncore/modules.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/mplex.c b/ioncore/mplex.c
index 7c511e75f3ec4ce7edcd88ffdaf04bd7dadf8d70..5f0a87d3a5a8bd2cfe6786c42bd2ca32b977758c 100644 (file)
--- a/ioncore/mplex.c
+++ b/ioncore/mplex.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/mplex.c
  *
 /*
  * ion/ioncore/mplex.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */


@@ -699,20 +699,16 @@ static WStacking *has_stacking_within(WMPlex *mplex, WRegion *reg)
 
 
 /* 1. Try keep focus in REGION_ACTIVE_SUB.
 
 
 /* 1. Try keep focus in REGION_ACTIVE_SUB.

- * 2. Try given `node`.
- * 3. Choose something else, attempting previous in focus history
- *    (unless `node` was set).
+ * 2. Choose something else, attempting previous in focus history.

  */
  */

-static WStacking *mplex_to_focus(WMPlex *mplex, WStacking *node)
+static WStacking *mplex_to_focus(WMPlex *mplex)

 {
     WStacking *foc=NULL, *fallback=NULL;
     WRegion *reg=NULL;
 {
     WStacking *foc=NULL, *fallback=NULL;
     WRegion *reg=NULL;

-    bool within=FALSE;
-    WStacking *st;

     
     foc=maybe_focusable(REGION_ACTIVE_SUB(mplex));
     
     
     foc=maybe_focusable(REGION_ACTIVE_SUB(mplex));
     

-    if(foc==NULL && node==NULL){
+    if(foc==NULL){

         /* Search focus history if no specific attempt set.*/
         for(reg=ioncore_g.focus_current; reg!=NULL; reg=reg->active_next){
             foc=has_stacking_within(mplex, reg);
         /* Search focus history if no specific attempt set.*/
         for(reg=ioncore_g.focus_current; reg!=NULL; reg=reg->active_next){
             foc=has_stacking_within(mplex, reg);


@@ -722,29 +718,20 @@ static WStacking *mplex_to_focus(WMPlex *mplex, WStacking *node)
     }
     
     if(foc!=NULL){
     }
     
     if(foc!=NULL){

-        /*fallback=mplex_find_to_focus(mplex, foc, NULL, NULL);*/

         /* In the history search case, 'foc' might point to a group,
          * since we don't properly try to find a stacking within it...
          */
         /* In the history search case, 'foc' might point to a group,
          * since we don't properly try to find a stacking within it...
          */

-        fallback=mplex_do_to_focus_on(mplex, foc, NULL, NULL, NULL);
-        if(fallback!=foc)
-            foc=NULL;
+        return mplex_do_to_focus_on(mplex, foc, NULL, NULL, NULL);
+    }else{
+        return mplex_find_to_focus(mplex, NULL, NULL, NULL);

     }
     }

-    
-    if(foc==NULL && node!=NULL)
-        foc=mplex_do_to_focus_on(mplex, node, NULL, NULL, &within);
-        
-    if(foc==NULL || !within)
-        foc=fallback;
-    
-    return foc;

 }
 
 
 void mplex_do_set_focus(WMPlex *mplex, bool warp)
 {
     if(!MPLEX_MGD_UNVIEWABLE(mplex)){
 }
 
 
 void mplex_do_set_focus(WMPlex *mplex, bool warp)
 {
     if(!MPLEX_MGD_UNVIEWABLE(mplex)){

-        WStacking *st=mplex_to_focus(mplex, NULL);
+        WStacking *st=mplex_to_focus(mplex);

         
         if(st==NULL){
             st=(mplex->mx_current!=NULL
         
         if(st==NULL){
             st=(mplex->mx_current!=NULL


@@ -764,7 +751,14 @@ void mplex_do_set_focus(WMPlex *mplex, bool warp)
 
 static void mplex_refocus(WMPlex *mplex, WStacking *node, bool warp)
 {
 
 static void mplex_refocus(WMPlex *mplex, WStacking *node, bool warp)
 {

-    WStacking *foc=mplex_to_focus(mplex, node);
+    bool within=FALSE;
+    WStacking *foc=NULL;
+    
+    if(node!=NULL)
+        foc=mplex_do_to_focus_on(mplex, node, NULL, NULL, &within);
+        
+    if(foc==NULL || !within)
+        foc=mplex_to_focus(mplex);

     
     if(foc!=NULL)
         region_maybewarp(foc->reg, warp);
     
     if(foc!=NULL)
         region_maybewarp(foc->reg, warp);

diff --git a/ioncore/mplex.h b/ioncore/mplex.h
index 7b72b310b1bf81d176640a5ea1cad06705d36382..bf9d61b4b26501f483b81d81525f68f48fa14cbd 100644 (file)
--- a/ioncore/mplex.h
+++ b/ioncore/mplex.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/mplex.h
  *
 /*
  * ion/ioncore/mplex.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  * 
  * See the included file LICENSE for details.
  */
  * 
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/mplexpholder.c b/ioncore/mplexpholder.c
index 7a75486ef495ecc618857666f8cba84cacfd00e0..2c8461eeade2e9d93d001d973b159ee9ec81e521 100644 (file)
--- a/ioncore/mplexpholder.c
+++ b/ioncore/mplexpholder.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/mplexpholder.c
  *
 /*
  * ion/ioncore/mplexpholder.c
  *

- * Copyright (c) Tuomo Valkonen 2005-2008. 
+ * Copyright (c) Tuomo Valkonen 2005-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */


@@ -264,7 +264,7 @@ static WRegion *mplexpholder_attach_recreate(WMPlexPHolder *ph, int flags,
     WRegionAttachData data2;
     WFramedPHolder *fph;
     WPHolder *root;
     WRegionAttachData data2;
     WFramedPHolder *fph;
     WPHolder *root;

-    WRegion *frame;
+    WRegion *res;

     RP rp;
     
     rp.ph_head=get_head(ph);
     RP rp;
     
     rp.ph_head=get_head(ph);


@@ -285,15 +285,17 @@ static WRegion *mplexpholder_attach_recreate(WMPlexPHolder *ph, int flags,
     data2.u.n.fn=recreate_handler;
     data2.u.n.param=&rp;
     
     data2.u.n.fn=recreate_handler;
     data2.u.n.param=&rp;
     

-    frame=pholder_do_attach(fph->cont, flags, &data2);
+    res=pholder_do_attach(fph->cont, flags, &data2);

     
     

-    if(frame!=NULL){
+    if(res!=NULL){

         rp.ph_head->recreate_pholder=NULL;
         /* It might be in use in attach chain! So defer. */
         mainloop_defer_destroy((Obj*)fph);
     }
     
         rp.ph_head->recreate_pholder=NULL;
         /* It might be in use in attach chain! So defer. */
         mainloop_defer_destroy((Obj*)fph);
     }
     

-    return rp.reg_ret;
+    return (flags&PHOLDER_ATTACH_RETURN_CREATEROOT
+            ? (WRegion*)res
+            : rp.reg_ret);

 }
 
 
 }
 
 

diff --git a/ioncore/mplexpholder.h b/ioncore/mplexpholder.h
index 6806408071f5d7a377297d641273b014600074e1..007d5e6704cc22e5b37bb2302c5b822715b8b496 100644 (file)
--- a/ioncore/mplexpholder.h
+++ b/ioncore/mplexpholder.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/mplexpholder.h
  *
 /*
  * ion/ioncore/mplexpholder.h
  *

- * Copyright (c) Tuomo Valkonen 2005-2008. 
+ * Copyright (c) Tuomo Valkonen 2005-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/mwmhints.c b/ioncore/mwmhints.c
index 445a1f00e428bec38cb48a1f9382a48604d075db..b3caec37910d92ad0725df7e66d2824749f3c720 100644 (file)
--- a/ioncore/mwmhints.c
+++ b/ioncore/mwmhints.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/mwmhints.c
  *
 /*
  * ion/ioncore/mwmhints.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/mwmhints.h b/ioncore/mwmhints.h
index 35e7355b54d57d8e17586fa8e6106c230b36ba9e..213277a1263271018047050c8f678ab8ca371dbf 100644 (file)
--- a/ioncore/mwmhints.h
+++ b/ioncore/mwmhints.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/mwmhints.h
  *
 /*
  * ion/ioncore/mwmhints.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/names.c b/ioncore/names.c
index b114e102ce0731973ad2dc604f26043c746e2607..14bde2c53100d5203fa401cf4b21c9cbd433178e 100644 (file)
--- a/ioncore/names.c
+++ b/ioncore/names.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/names.c
  *
 /*
  * ion/ioncore/names.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/names.h b/ioncore/names.h
index d579ac97e2865a30b87edb9b625ba5ca2c56aed2..8e4d6074eed8e71467939e1b12f405ae762e8014 100644 (file)
--- a/ioncore/names.h
+++ b/ioncore/names.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/names.h
  *
 /*
  * ion/ioncore/names.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/navi.c b/ioncore/navi.c
index 527d894725e585d5bd715d24b161959920ef6c95..7dfd19bb9c682c25f202ba042b82c30848dadf17 100644 (file)
--- a/ioncore/navi.c
+++ b/ioncore/navi.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/navi.c
  *
 /*
  * ion/ioncore/navi.c
  *

- * Copyright (c) Tuomo Valkonen 2006-2008. 
+ * Copyright (c) Tuomo Valkonen 2006-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/navi.h b/ioncore/navi.h
index 6f88e606a61e273d67fbf5236314db9db7276380..edb7f628a34841fdaef3d8b2dda91ffc4194cc35 100644 (file)
--- a/ioncore/navi.h
+++ b/ioncore/navi.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/navi.h
  *
 /*
  * ion/ioncore/navi.h
  *

- * Copyright (c) Tuomo Valkonen 2006-2008. 
+ * Copyright (c) Tuomo Valkonen 2006-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/netwm.c b/ioncore/netwm.c
index 202af7b60c234382f69cc64f536cd57b1ad93155..f85193e910437f8da91e5ce7561df639b7964dce 100644 (file)
--- a/ioncore/netwm.c
+++ b/ioncore/netwm.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/netwm.c
  *
 /*
  * ion/ioncore/netwm.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/netwm.h b/ioncore/netwm.h
index db0e6f81b2ec44ca15e613a5e8f79487dacde046..24e6665e94af7e3b9dcbd7c617a64e9382857538 100644 (file)
--- a/ioncore/netwm.h
+++ b/ioncore/netwm.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/netwm.h
  *
 /*
  * ion/ioncore/netwm.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/pholder.c b/ioncore/pholder.c
index d702b164c512ed344ef41b7f2ac00a2e00fa6415..d62da21ff9e2e8cb5e7b37b6edda4450b270c4c0 100644 (file)
--- a/ioncore/pholder.c
+++ b/ioncore/pholder.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/pholder.c
  *
 /*
  * ion/ioncore/pholder.c
  *

- * Copyright (c) Tuomo Valkonen 2005-2008. 
+ * Copyright (c) Tuomo Valkonen 2005-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/pholder.h b/ioncore/pholder.h
index 8b8df7eab9ba6e7d5a1c715303b2ab09c501792d..12e90fae7ea3897d947a38668ceb6060ba8c2605 100644 (file)
--- a/ioncore/pholder.h
+++ b/ioncore/pholder.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/pholder.h
  *
 /*
  * ion/ioncore/pholder.h
  *

- * Copyright (c) Tuomo Valkonen 2005-2008. 
+ * Copyright (c) Tuomo Valkonen 2005-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */


@@ -15,6 +15,7 @@
 
 
 #define PHOLDER_ATTACH_SWITCHTO 0x0001
 
 
 #define PHOLDER_ATTACH_SWITCHTO 0x0001

+#define PHOLDER_ATTACH_RETURN_CREATEROOT 0x0002

 
 
 /* Note: PHolders should be destroyed by their acquirer. */
 
 
 /* Note: PHolders should be destroyed by their acquirer. */

diff --git a/ioncore/pointer.c b/ioncore/pointer.c
index 51bcf9fdf87a51cf49926bc741c7492658bf67f3..8b57bcb90fabfe0dc1e8efedaec4fe4b15be6eac 100644 (file)
--- a/ioncore/pointer.c
+++ b/ioncore/pointer.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/pointer.c
  *
 /*
  * ion/ioncore/pointer.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/pointer.h b/ioncore/pointer.h
index 7a5b147e73e2ba3d20da8bca5efe4bdca30fd7c8..4a88f035e8fc0c3e532ae218aecc84a963ea9dc2 100644 (file)
--- a/ioncore/pointer.h
+++ b/ioncore/pointer.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/pointer.h
  *
 /*
  * ion/ioncore/pointer.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/presize.c b/ioncore/presize.c
index 07dd5c246effcba6d19665b957588bf390c19c06..494cc5a814e93d9978d0077f100d2869ab0e1a31 100644 (file)
--- a/ioncore/presize.c
+++ b/ioncore/presize.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/presize.c
  *
 /*
  * ion/ioncore/presize.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/presize.h b/ioncore/presize.h
index 5a52e9dc063582065b81561cd55b48182dd194d0..57888237bbd63df2a731bda290f6a9a5ba4ac395 100644 (file)
--- a/ioncore/presize.h
+++ b/ioncore/presize.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/presize.h
  *
 /*
  * ion/ioncore/presize.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/property.c b/ioncore/property.c
index a8029d2e256f2cab4a0d02ea059d806c7c0755f9..5a36627095fb580b1bb5e45c293a07b769fff2d9 100644 (file)
--- a/ioncore/property.c
+++ b/ioncore/property.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/property.c
  *
 /*
  * ion/ioncore/property.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/property.h b/ioncore/property.h
index 19f180c1f63e38f77ae0dd8133e9eeb0d7b064d9..bf3eb0e0adc92a7d72ede0025afc18aa1880ab9e 100644 (file)
--- a/ioncore/property.h
+++ b/ioncore/property.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/property.h
  *
 /*
  * ion/ioncore/property.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/rectangle.c b/ioncore/rectangle.c
index 8e84512b3f94559913f9f5b0e1df5f5b5f07616a..3c9b90c37f8418cde1ff570352e3614bbb35684c 100644 (file)
--- a/ioncore/rectangle.c
+++ b/ioncore/rectangle.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/rectangle.c
  *
 /*
  * ion/ioncore/rectangle.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/rectangle.h b/ioncore/rectangle.h
index 19e8c1175d502a0408d083876d8b22c0261d895c..dd7cca06bd862f0ee4bf3662a537823df25688bd 100644 (file)
--- a/ioncore/rectangle.h
+++ b/ioncore/rectangle.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/rectangle.h
  *
 /*
  * ion/ioncore/rectangle.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/regbind.c b/ioncore/regbind.c
index 765d1a8346d862cdea7a55081b33edfa11ac6245..a50da9d0af871c38a33414eec69b837b2173bed7 100644 (file)
--- a/ioncore/regbind.c
+++ b/ioncore/regbind.c
@@ -1,7 +1,7 @@
 /*
  * ion/regbind.c
  *
 /*
  * ion/regbind.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/regbind.h b/ioncore/regbind.h
index 8ec8b8c44d0275f18e2e6cab41dcf0b7a2369600..b4752a067e628ecafee48b52ca8134234f9abf1e 100644 (file)
--- a/ioncore/regbind.h
+++ b/ioncore/regbind.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/regbind.h
  *
 /*
  * ion/ioncore/regbind.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/reginfo.c b/ioncore/reginfo.c
index 0a69f783c47c1cfdc5f715df418596a2b6d93e2d..24e75d0ae75218a895728358aa85e75d18db6f23 100644 (file)
--- a/ioncore/reginfo.c
+++ b/ioncore/reginfo.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/reginfo.c
  *
 /*
  * ion/ioncore/reginfo.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/reginfo.h b/ioncore/reginfo.h
index 29d2d5119ddc31a40348c7fd761aa6ec056db08b..c7d7e30098bbc9d5de6d4ec7d22743374432eeee 100644 (file)
--- a/ioncore/reginfo.h
+++ b/ioncore/reginfo.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/reginfo.h
  *
 /*
  * ion/ioncore/reginfo.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/region-iter.h b/ioncore/region-iter.h
index ce25e817665fa0b70c1be446ce4bf68ef844678f..1c28d6f2f41a129a38895d6820d2a80f67e956d9 100644 (file)
--- a/ioncore/region-iter.h
+++ b/ioncore/region-iter.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/region-iter.h
  *
 /*
  * ion/ioncore/region-iter.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/region.c b/ioncore/region.c
index 261d6543f05178f5e89338d8cadb9d2ed2b68651..47f8f5c3d93fd09feef16123a485929a8a7fd285 100644 (file)
--- a/ioncore/region.c
+++ b/ioncore/region.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/region.c
  *
 /*
  * ion/ioncore/region.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/region.h b/ioncore/region.h
index 950de9df4a8bc5868ac810a1a3c09a6a9396638d..ea4e5d54410390aa54a9edbfd79d8be50026f547 100644 (file)
--- a/ioncore/region.h
+++ b/ioncore/region.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/region.h
  *
 /*
  * ion/ioncore/region.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/resize.c b/ioncore/resize.c
index 0da668d5ae4f8ba37438c85527d05ca002ef0007..3608ecb88f17e693538a0c5739ec74df55307235 100644 (file)
--- a/ioncore/resize.c
+++ b/ioncore/resize.c
@@ -1,7 +1,7 @@
 /* 
  * ion/ioncore/resize.c
  *
 /* 
  * ion/ioncore/resize.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */


@@ -756,9 +756,11 @@ void frame_maximize_vert(WFrame *frame)
     int oy, oh;
     
     if(frame->flags&FRAME_SHADED || frame->flags&FRAME_MAXED_VERT){
     int oy, oh;
     
     if(frame->flags&FRAME_SHADED || frame->flags&FRAME_MAXED_VERT){

+        if(frame->flags&FRAME_SHADED)
+            frame->flags|=FRAME_SHADED_TOGGLE;

         if(frame->flags&FRAME_SAVED_VERT)
             rqh(frame, frame->saved_y, frame->saved_h);
         if(frame->flags&FRAME_SAVED_VERT)
             rqh(frame, frame->saved_y, frame->saved_h);

-        frame->flags&=~(FRAME_MAXED_VERT|FRAME_SAVED_VERT);
+        frame->flags&=~(FRAME_MAXED_VERT|FRAME_SAVED_VERT|FRAME_SHADED_TOGGLE);

         return;
     }
 
         return;
     }
 

diff --git a/ioncore/resize.h b/ioncore/resize.h
index 7b71bd59fcc6959c6399c796d782b8f3477f2bdd..00ae222c4fb9254cec6b037ac4e826505c7c0820 100644 (file)
--- a/ioncore/resize.h
+++ b/ioncore/resize.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/resize.h
  *
 /*
  * ion/ioncore/resize.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/return.c b/ioncore/return.c
index be2d367b5744928cd5e905bd866303b7a4295397..ffc108375900b6880061f2523eef8b2402627814 100644 (file)
--- a/ioncore/return.c
+++ b/ioncore/return.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/return.h
  *
 /*
  * ion/ioncore/return.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/return.h b/ioncore/return.h
index a88bac58dc9ef4d338f15c450a4dff0452d65f62..0f37a8045c67d3d67e66b5e42aceaff1182c40dc 100644 (file)
--- a/ioncore/return.h
+++ b/ioncore/return.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/return.h
  *
 /*
  * ion/ioncore/return.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/rootwin.c b/ioncore/rootwin.c
index fd2d2584d054fc68aa0e4b88915599d4488372ed..c206e3d9587ac56ae55c1042f051a9a24b438435 100644 (file)
--- a/ioncore/rootwin.c
+++ b/ioncore/rootwin.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/rootwin.c
  *
 /*
  * ion/ioncore/rootwin.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/rootwin.h b/ioncore/rootwin.h
index 41aab4eff36019bdf0c5b9a15298602732d4ed21..0cdde3dc74c445ecc866b91806df28de2c1ef343 100644 (file)
--- a/ioncore/rootwin.h
+++ b/ioncore/rootwin.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/rootwin.h
  *
 /*
  * ion/ioncore/rootwin.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/saveload.c b/ioncore/saveload.c
index 71ddb9dca422f18579c15291a5df9ce934c02509..81dd1dba239897356e9692245f0911b1da042299 100644 (file)
--- a/ioncore/saveload.c
+++ b/ioncore/saveload.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/saveload.c
  *
 /*
  * ion/ioncore/saveload.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/saveload.h b/ioncore/saveload.h
index 049b2c08f63a993936259e259346b366638c0aec..82b3df10c07954ee8b41008e125c3627f1414eef 100644 (file)
--- a/ioncore/saveload.h
+++ b/ioncore/saveload.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/saveload.h
  *
 /*
  * ion/ioncore/saveload.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/screen-notify.c b/ioncore/screen-notify.c
index ecb280702aac96b863b5b40c69dca38c0eca73ff..769b5a3ec6f949cad08697d7959184847fc69472 100644 (file)
--- a/ioncore/screen-notify.c
+++ b/ioncore/screen-notify.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/screen-notify.c
  *
 /*
  * ion/ioncore/screen-notify.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/screen-notify.h b/ioncore/screen-notify.h
index bbaac26e23385300c2f21dfe10195bd5b7250c41..4ac252924273513321eb139f34c3cfb5e5d84937 100644 (file)
--- a/ioncore/screen-notify.h
+++ b/ioncore/screen-notify.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/screen-notify.h
  *
 /*
  * ion/ioncore/screen-notify.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/screen.c b/ioncore/screen.c
index 8aafadb14b8c8bda962547b7cd8ea1a5509d0b97..c16bfc2f79fec61d551b80497793eff6a0f1e65d 100644 (file)
--- a/ioncore/screen.c
+++ b/ioncore/screen.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/screen.c
  *
 /*
  * ion/ioncore/screen.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/screen.h b/ioncore/screen.h
index 52752cca7e4c62c65e1c49e0d4e9132c873b48cc..36c3c5407c2caa7d6b2d6ceb169f9223ebbe9349 100644 (file)
--- a/ioncore/screen.h
+++ b/ioncore/screen.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/screen.h
  *
 /*
  * ion/ioncore/screen.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/selection.c b/ioncore/selection.c
index 1e99ed91924ce696a7c574d74368c4208e015a00..896a415bc64a3c112ec98da0fda3203e5cbf258d 100644 (file)
--- a/ioncore/selection.c
+++ b/ioncore/selection.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/selection.c
  *
 /*
  * ion/ioncore/selection.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/selection.h b/ioncore/selection.h
index 4ae022aeb8179b20e105f70fd34c8cd0a15240e9..41e855a64bf418061caf5091212dc8c8bdbc6685 100644 (file)
--- a/ioncore/selection.h
+++ b/ioncore/selection.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/selection.h
  *
 /*
  * ion/ioncore/selection.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/sizehint.c b/ioncore/sizehint.c
index d34694614d5be641ba19e64cdee612dfd426b47c..0d5d51da08da6a18c64270f8fec38c76697e1aaa 100644 (file)
--- a/ioncore/sizehint.c
+++ b/ioncore/sizehint.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/sizehint.c
  *
 /*
  * ion/ioncore/sizehint.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/sizehint.h b/ioncore/sizehint.h
index 078b8732e33f99de63223d2ee20d8c5862458f65..71ad3a1ad27ac68e1c5fe86e489294391f2f4eac 100644 (file)
--- a/ioncore/sizehint.h
+++ b/ioncore/sizehint.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/sizehint.h
  *
 /*
  * ion/ioncore/sizehint.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/sizepolicy.c b/ioncore/sizepolicy.c
index e1ee0c0fddb41d6f07ef4cb4175734f87faac2bb..8c42327669236d6e5b56f08f1dd733e4b130bf14 100644 (file)
--- a/ioncore/sizepolicy.c
+++ b/ioncore/sizepolicy.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/sizepolicy.c
  *
 /*
  * ion/ioncore/sizepolicy.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/sizepolicy.h b/ioncore/sizepolicy.h
index 49e89ea7756d439f25d603206d90f7f59b5ffa02..60076e71277a40d774f8062bb20b5c375d2c45cc 100644 (file)
--- a/ioncore/sizepolicy.h
+++ b/ioncore/sizepolicy.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/sizepolicy.h
  *
 /*
  * ion/ioncore/sizepolicy.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/stacking.c b/ioncore/stacking.c
index 37491159b80839875bb81af017b926dd4fcb7635..0c6480d7b5331ecc7479ca59b16dd6a22f1a6360 100644 (file)
--- a/ioncore/stacking.c
+++ b/ioncore/stacking.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/stacking.c
  *
 /*
  * ion/ioncore/stacking.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008.
+ * Copyright (c) Tuomo Valkonen 1999-2009.

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/stacking.h b/ioncore/stacking.h
index e8c96384e57a552a4b963edb827dcb7d9d1f2d7c..c1754ae793ba32b79743d5428c27429c0e1d1ea9 100644 (file)
--- a/ioncore/stacking.h
+++ b/ioncore/stacking.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/stacking.h
  *
 /*
  * ion/ioncore/stacking.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008.
+ * Copyright (c) Tuomo Valkonen 1999-2009.

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/strings.c b/ioncore/strings.c
index 15ebde13da162811ce15e3adb278193fe60c0944..c0033214b4e2b7462432be42de61651c4afcac62 100644 (file)
--- a/ioncore/strings.c
+++ b/ioncore/strings.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/strings.c
  *
 /*
  * ion/ioncore/strings.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/strings.h b/ioncore/strings.h
index 915c88ba16d9c92500a61344ba94d55cff8c31dd..8453bcae1fc57967bf8e23d767803e9798073975 100644 (file)
--- a/ioncore/strings.h
+++ b/ioncore/strings.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/strings.h
  *
 /*
  * ion/ioncore/strings.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/tags.c b/ioncore/tags.c
index b9054830e1c214641167779e52888fc4cd22e2f1..aeaadd62981054643fed46d3cdbdee16ccf5029b 100644 (file)
--- a/ioncore/tags.c
+++ b/ioncore/tags.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/tags.c
  *
 /*
  * ion/ioncore/tags.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/tags.h b/ioncore/tags.h
index 1f7da3261c7ff9d47aea03c1a202ff88bc589223..a4a83d4d366666f437eebaf5aa276ef717456072 100644 (file)
--- a/ioncore/tags.h
+++ b/ioncore/tags.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/tags.h
  *
 /*
  * ion/ioncore/tags.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/window.c b/ioncore/window.c
index 3018467b8f136c428fbfa4f37d5751338ed024ad..42ca0289e6b3e3b811f316464a58466de77fa470 100644 (file)
--- a/ioncore/window.c
+++ b/ioncore/window.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/window.c
  *
 /*
  * ion/ioncore/window.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/window.h b/ioncore/window.h
index 48fc192898ed7b5c9eaebe80a2e845147db27504..53e1180121b05988d5b73e7e0bde4399a18b55dc 100644 (file)
--- a/ioncore/window.h
+++ b/ioncore/window.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/window.h
  *
 /*
  * ion/ioncore/window.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/xic.c b/ioncore/xic.c
index df659ab788a1e9f89bd4d8e38414ca64934db490..50142bfaed128f915603bfbc71b84f8f46df7bee 100644 (file)
--- a/ioncore/xic.c
+++ b/ioncore/xic.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/xic.c
  *
 /*
  * ion/ioncore/xic.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/xic.h b/ioncore/xic.h
index fe3bd7e9d2417c2abeeb3547a5583264c9b50bd2..b6acd26fb49621613098d69f7094f913ea417ab8 100644 (file)
--- a/ioncore/xic.h
+++ b/ioncore/xic.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/xic.h
  *
 /*
  * ion/ioncore/xic.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/xwindow.c b/ioncore/xwindow.c
index fec8e4ced2d0ccc6eac31e6809f52d35a7f22007..2842be40c3f1a6065f367ac50171c97654b4b451 100644 (file)
--- a/ioncore/xwindow.c
+++ b/ioncore/xwindow.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/xwindow.c
  *
 /*
  * ion/ioncore/xwindow.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/ioncore/xwindow.h b/ioncore/xwindow.h
index cb37695b646503150e3553ca5378a1dad2c65068..3c6a7e6c5b1aa54dd6a1a318a49d596ad1473b32 100644 (file)
--- a/ioncore/xwindow.h
+++ b/ioncore/xwindow.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/xwindow.h
  *
 /*
  * ion/ioncore/xwindow.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/libextl/exact-version b/libextl/exact-version
index 6b7fcda5905c7253ccc08b7c88607b32cd78f87f..2ea85eb38e57e4cc43ffaa8dec79bef4e1faf7be 100644 (file)
--- a/libextl/exact-version
+++ b/libextl/exact-version
@@ -1,9 +1,6 @@
 
 Context:
 
 
 Context:
 

-[lua 5.1 updates to mkexports
-Tuomo Valkonen <tuomov@iki.fi>**20080318210900] 
-

 [Do not remove proxy from cache in object destroy watch handler.
 Tuomo Valkonen <tuomov@iki.fi>**20071215143858
  The GC can remove it. Just have the pointer to the actual object be 
 [Do not remove proxy from cache in object destroy watch handler.
 Tuomo Valkonen <tuomov@iki.fi>**20071215143858
  The GC can remove it. Just have the pointer to the actual object be 

diff --git a/libextl/libextl-mkexports.in b/libextl/libextl-mkexports.in
index 14674ba892bf6edbadcb6eca4cb503858ca106a2..a23ab1fbc3d14cba6f35ba7e8d14a09b0b0ed538 100644 (file)
--- a/libextl/libextl-mkexports.in
+++ b/libextl/libextl-mkexports.in
@@ -18,16 +18,16 @@
 
 -- Helper functions {{{
 
 
 -- Helper functions {{{
 

-function errorf(...)
-    error(string.format(...), 2)
+function errorf(fmt, ...)
+    error(string.format(fmt, unpack(arg)), 2)

 end
 
 function matcherr(s)
     error(string.format("Parse error in \"%s...\"", string.sub(s, 1, 50)), 2)
 end
 
 end
 
 function matcherr(s)
     error(string.format("Parse error in \"%s...\"", string.sub(s, 1, 50)), 2)
 end
 

-function fprintf(h, ...)
-    h:write(string.format(...))
+function fprintf(h, fmt, ...)
+    h:write(string.format(fmt, unpack(arg)))

 end
 
 function trim(str)
 end
 
 function trim(str)


@@ -208,7 +208,7 @@ function parse(d)
         end
         param=trim(param)
         if string.len(param)>0 then
         end
         param=trim(param)
         if string.len(param)>0 then

-            for p in string.gmatch(param .. ",", "([^,]*),") do
+            for p in string.gfind(param .. ",", "([^,]*),") do

                 local spec, objtype, varname=parse_type(p)
                 idesc=idesc .. spec
                 table.insert(itypes, objtype)
                 local spec, objtype, varname=parse_type(p)
                 idesc=idesc .. spec
                 table.insert(itypes, objtype)

diff --git a/libmainloop/defer.c b/libmainloop/defer.c
index 304a37caf5e3f08620d276d6ed656cdd92c4d608..2358a270cf5830379ebb76afc0cbac7b8cde69fd 100644 (file)
--- a/libmainloop/defer.c
+++ b/libmainloop/defer.c
@@ -1,7 +1,7 @@
 /*
  * ion/libmainloop/defer.c
  *
 /*
  * ion/libmainloop/defer.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/libmainloop/defer.h b/libmainloop/defer.h
index 9e93e409fd35cc096982d60f18da8a5b9078c26b..ce3e1d76aff6b0be6f1eef299d21409d6d0b9a57 100644 (file)
--- a/libmainloop/defer.h
+++ b/libmainloop/defer.h
@@ -1,7 +1,7 @@
 /*
  * ion/libmainloop/defer.c
  *
 /*
  * ion/libmainloop/defer.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/libmainloop/exec.c b/libmainloop/exec.c
index a2d853b3281617073f6195e4e41b619e5c065137..f4847a8a141a77aadbe97e3967c49bd4e7b91bc1 100644 (file)
--- a/libmainloop/exec.c
+++ b/libmainloop/exec.c
@@ -1,7 +1,7 @@
 /*
  * ion/mainloop/exec.c
  *
 /*
  * ion/mainloop/exec.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/libmainloop/exec.h b/libmainloop/exec.h
index 5947b9a8e9ac5072d5267d6719d559164bf04f52..6dbfd7eb265099f9cd330b15157213d4cb5cb3d6 100644 (file)
--- a/libmainloop/exec.h
+++ b/libmainloop/exec.h
@@ -1,7 +1,7 @@
 /*
  * ion/libmainloop/exec.h
  *
 /*
  * ion/libmainloop/exec.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/libmainloop/hooks.c b/libmainloop/hooks.c
index 4a3a9f722a064fd3d2a21e28ff083846025522bd..3d8a8feac1bddb80de4d71fd801a52e2f62e1ae1 100644 (file)
--- a/libmainloop/hooks.c
+++ b/libmainloop/hooks.c
@@ -1,7 +1,7 @@
 /*
  * ion/mainloop/hooks.c
  *
 /*
  * ion/mainloop/hooks.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/libmainloop/hooks.h b/libmainloop/hooks.h
index ecf5c8cec4e9fe339ca4ec3e304945d5401aa974..bb9c54078e07a1fedf71c269776523fd7aa78c08 100644 (file)
--- a/libmainloop/hooks.h
+++ b/libmainloop/hooks.h
@@ -1,7 +1,7 @@
 /*
  * ion/mainloop/hooks.h
  *
 /*
  * ion/mainloop/hooks.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/libmainloop/signal.c b/libmainloop/signal.c
index 356fd6d71e495ffc6ea7844febc2d0ae7d9a3962..c5365532dd1b56d537d9150887df06a6b4385307 100644 (file)
--- a/libmainloop/signal.c
+++ b/libmainloop/signal.c
@@ -1,7 +1,7 @@
 /*
  * ion/libmainloop/signal.c
  *
 /*
  * ion/libmainloop/signal.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/libmainloop/signal.h b/libmainloop/signal.h
index bd93fb2aeea8c96bb2eb2949cd86209c793339c3..d501f7158b39a36511cabd04435148077ff5c707 100644 (file)
--- a/libmainloop/signal.h
+++ b/libmainloop/signal.h
@@ -1,7 +1,7 @@
 /*
  * ion/mainloop/signal.h
  *
 /*
  * ion/mainloop/signal.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_dock/dock.c b/mod_dock/dock.c
index 6c0f421d898f50fe9295b9dbac9d1a1359ccb4e3..174942c3656f3c9ed39188f206b9d00eeb5bb544 100644 (file)
--- a/mod_dock/dock.c
+++ b/mod_dock/dock.c
@@ -2,7 +2,7 @@
  * Ion dock module
  * Copyright (C) 2003 Tom Payne
  * Copyright (C) 2003 Per Olofsson
  * Ion dock module
  * Copyright (C) 2003 Tom Payne
  * Copyright (C) 2003 Per Olofsson

- * Copyright (C) 2004-2008 Tuomo Valkonen
+ * Copyright (C) 2004-2009 Tuomo Valkonen

  *
  * by Tom Payne <ion@tompayne.org>
  * based on code by Per Olofsson <pelle@dsv.su.se>
  *
  * by Tom Payne <ion@tompayne.org>
  * based on code by Per Olofsson <pelle@dsv.su.se>

diff --git a/mod_menu/grabmenu.c b/mod_menu/grabmenu.c
index 02746836b09e07d0552a9d22b5ec310f60e7f02c..d490b3970a1f575db586ac3056f19a662fba5930 100644 (file)
--- a/mod_menu/grabmenu.c
+++ b/mod_menu/grabmenu.c
@@ -1,7 +1,7 @@
 /*
  * ion/mod_menu/grabmenu.c
  *
 /*
  * ion/mod_menu/grabmenu.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_menu/main.c b/mod_menu/main.c
index 19d8c3e2d1eef7c3f9b7a6bf546320058c8adf43..e66c7c9fb27f5ad262f1de275c51f0dd4293ed6e 100644 (file)
--- a/mod_menu/main.c
+++ b/mod_menu/main.c
@@ -1,7 +1,7 @@
 /*
  * ion/mod_menu/main.c
  *
 /*
  * ion/mod_menu/main.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_menu/main.h b/mod_menu/main.h
index b0befd735de6f532f2a0cf47a96d241fa9ade300..ad5e0d6ed6c9fd2ddee3db8f910276496941f747 100644 (file)
--- a/mod_menu/main.h
+++ b/mod_menu/main.h
@@ -1,7 +1,7 @@
 /*
  * ion/mod_menu/main.h
  *
 /*
  * ion/mod_menu/main.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_menu/menu.c b/mod_menu/menu.c
index 9a93baca45b73e5a5eacbc140449f9e46ac0b857..6c1287fdb79bcb96a7b57e65be78273ca380df90 100644 (file)
--- a/mod_menu/menu.c
+++ b/mod_menu/menu.c
@@ -1,7 +1,7 @@
 /*
  * ion/mod_menu/menu.c
  *
 /*
  * ion/mod_menu/menu.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_menu/menu.h b/mod_menu/menu.h
index d596e3342850869721f10f69bb09b79ea8fc5ba6..fe6470fb91f4ea6581f3d247a4d06afa216bddb8 100644 (file)
--- a/mod_menu/menu.h
+++ b/mod_menu/menu.h
@@ -1,7 +1,7 @@
 /*
  * ion/mod_menu/menu.h
  *
 /*
  * ion/mod_menu/menu.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_menu/mkmenu.c b/mod_menu/mkmenu.c
index d20882f7c2d775d313b1ddb82aae48a2cf4466b6..d9775b66bf95728f7a0cc5087382f4e1dec6716d 100644 (file)
--- a/mod_menu/mkmenu.c
+++ b/mod_menu/mkmenu.c
@@ -1,7 +1,7 @@
 /*
  * ion/mod_menu/mkmenu.c
  *
 /*
  * ion/mod_menu/mkmenu.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_menu/mkmenu.h b/mod_menu/mkmenu.h
index 7c968392e76ac010d735e162b363db628c52ecfb..562915bbb9663ed519c51ac5f0330dcf082a47e6 100644 (file)
--- a/mod_menu/mkmenu.h
+++ b/mod_menu/mkmenu.h
@@ -1,7 +1,7 @@
 /*
  * ion/mod_menu/mkmenu.h
  *
 /*
  * ion/mod_menu/mkmenu.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_menu/mod_menu.lua b/mod_menu/mod_menu.lua
index d5078f77c72d67ddc7b18fdb0ade61ff304b44c3..b999c5a95716654dc22680eb30ef160edad8eb29 100644 (file)
--- a/mod_menu/mod_menu.lua
+++ b/mod_menu/mod_menu.lua
@@ -1,7 +1,7 @@
 --
 -- ion/mod_menu/mod_menu.lua -- Menu opening helper routines.
 -- 
 --
 -- ion/mod_menu/mod_menu.lua -- Menu opening helper routines.
 -- 

--- Copyright (c) Tuomo Valkonen 2004-2008.
+-- Copyright (c) Tuomo Valkonen 2004-2009.

 --
 -- See the included file LICENSE for details.
 --
 --
 -- See the included file LICENSE for details.
 --

diff --git a/mod_query/complete.c b/mod_query/complete.c
index 90f2b5b8143539d12d91f9912934b0526da48159..db7426bd398857cb877e67000f000668ef445801 100644 (file)
--- a/mod_query/complete.c
+++ b/mod_query/complete.c
@@ -1,7 +1,7 @@
 /*
  * ion/mod_query/complete.c
  *
 /*
  * ion/mod_query/complete.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_query/complete.h b/mod_query/complete.h
index 95e8c70662defdb221f28365773c08b05f4cad9e..97bfaa2c3eca5450c1a243a1c842c8cdaa426eec 100644 (file)
--- a/mod_query/complete.h
+++ b/mod_query/complete.h
@@ -1,7 +1,7 @@
 /*
  * ion/mod_query/complete.h
  *
 /*
  * ion/mod_query/complete.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_query/edln.c b/mod_query/edln.c
index ade34c11a3df87ae5dc4073b3aff86b20d425534..6951014748166a4dba886a11d5414e01134417f8 100644 (file)
--- a/mod_query/edln.c
+++ b/mod_query/edln.c
@@ -1,7 +1,7 @@
 /*
  * ion/mod_query/edln.c
  *
 /*
  * ion/mod_query/edln.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_query/edln.h b/mod_query/edln.h
index 6febfeed96869ed51344f4634b806505e9f0cc5f..de66f6c31bc49a6584feecd10aaf8ed32797085b 100644 (file)
--- a/mod_query/edln.h
+++ b/mod_query/edln.h
@@ -1,7 +1,7 @@
 /*
  * ion/mod_query/edln.h
  *
 /*
  * ion/mod_query/edln.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_query/fwarn.c b/mod_query/fwarn.c
index 6abf6c371bea96a4c6185c09a1674f42706380a9..54ad1ab8a526217f62c2fdef4fced7e22efcc2b6 100644 (file)
--- a/mod_query/fwarn.c
+++ b/mod_query/fwarn.c
@@ -1,7 +1,7 @@
 /*
  * ion/mod_query/query.c
  *
 /*
  * ion/mod_query/query.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_query/fwarn.h b/mod_query/fwarn.h
index 25e17db0d0e39bb32cf29d0014328d36294ac7d4..5a8ee8683e4e393f27176e131aa075b02df42fd8 100644 (file)
--- a/mod_query/fwarn.h
+++ b/mod_query/fwarn.h
@@ -1,7 +1,7 @@
 /*
  * ion/mod_query/fwarn.h
  *
 /*
  * ion/mod_query/fwarn.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_query/history.c b/mod_query/history.c
index dc32d729ea201cc14267d977f782f2b6561feb9c..eae5b87af4f00b27eadcf9239ebceda66523aafc 100644 (file)
--- a/mod_query/history.c
+++ b/mod_query/history.c
@@ -1,7 +1,7 @@
 /*
  * ion/mod_query/history.h
  *
 /*
  * ion/mod_query/history.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_query/history.h b/mod_query/history.h
index 541bb481bf7f2edc90179c2a807583a885fddce8..227124210a6b784f40c5772a9c585e4740908d98 100644 (file)
--- a/mod_query/history.h
+++ b/mod_query/history.h
@@ -1,7 +1,7 @@
 /*
  * ion/mod_query/history.h
  *
 /*
  * ion/mod_query/history.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_query/input.c b/mod_query/input.c
index 9061002401cc2156f832369fb8507fdabf8531bc..de81c770a15fcbd53a7798270a7f7053bc95eb17 100644 (file)
--- a/mod_query/input.c
+++ b/mod_query/input.c
@@ -1,7 +1,7 @@
 /*
  * ion/mod_query/input.c
  *
 /*
  * ion/mod_query/input.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_query/input.h b/mod_query/input.h
index 8e9eef2c7674e5f64886e0421d2a2fb8b05ea656..9e4ef04ad96a3336792304cd3e4efa014c29c92f 100644 (file)
--- a/mod_query/input.h
+++ b/mod_query/input.h
@@ -1,7 +1,7 @@
 /*
  * ion/mod_query/input.h
  *
 /*
  * ion/mod_query/input.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_query/inputp.h b/mod_query/inputp.h
index d2a3a4eeedcebbeca092ea1fa11ddf137e8c5d80..f92590439ecdc405b51e60f3385ccae3835e5ec7 100644 (file)
--- a/mod_query/inputp.h
+++ b/mod_query/inputp.h
@@ -1,7 +1,7 @@
 /*
  * ion/mod_query/inputp.h
  *
 /*
  * ion/mod_query/inputp.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_query/listing.c b/mod_query/listing.c
index 21ffd4fff0cad902c658e0e50d7708f254f0cdbc..f4b31f61ff8797be124260b6c2f45d44aae2ea97 100644 (file)
--- a/mod_query/listing.c
+++ b/mod_query/listing.c
@@ -1,7 +1,7 @@
 /*
  * ion/mod_query/listing.c
  *
 /*
  * ion/mod_query/listing.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_query/listing.h b/mod_query/listing.h
index 831f8046d0ea44f7beca1c0b1dcf861dc04cae7b..2b2a215aeffdcdbdfc1ee1224f2cc5442af8c64f 100644 (file)
--- a/mod_query/listing.h
+++ b/mod_query/listing.h
@@ -1,7 +1,7 @@
 /*
  * ion/mod_query/listing.h
  *
 /*
  * ion/mod_query/listing.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_query/main.c b/mod_query/main.c
index da044414512856202eb644d13ecdd3b76a5000fa..d67c539d78c5f4370a903da0918b9f90204323fb 100644 (file)
--- a/mod_query/main.c
+++ b/mod_query/main.c
@@ -1,7 +1,7 @@
 /*
  * ion/mod_query/main.c
  *
 /*
  * ion/mod_query/main.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_query/main.h b/mod_query/main.h
index 92b81fe5db80cc250149295970935ab54353884d..2c19f41b916135db29fa532a4630c2e5294ed943 100644 (file)
--- a/mod_query/main.h
+++ b/mod_query/main.h
@@ -1,7 +1,7 @@
 /*
  * ion/mod_query/main.h
  *
 /*
  * ion/mod_query/main.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_query/mod_query.lua b/mod_query/mod_query.lua
index a9524809b4948dc9afe010f4bdd4fde6b34cdf2e..bd3414bd95764cd5c6d62147d9181e4af0e44d18 100644 (file)
--- a/mod_query/mod_query.lua
+++ b/mod_query/mod_query.lua
@@ -1,7 +1,7 @@
 --
 -- ion/query/mod_query.lua -- Some common queries for Ion
 -- 
 --
 -- ion/query/mod_query.lua -- Some common queries for Ion
 -- 

--- Copyright (c) Tuomo Valkonen 2004-2008.
+-- Copyright (c) Tuomo Valkonen 2004-2009.

 -- 
 -- See the included file LICENSE for details.
 --
 -- 
 -- See the included file LICENSE for details.
 --


@@ -65,9 +65,10 @@ function mod_query.query(mplex, prompt, initvalue, handler, completor,
         wedln:complete('prev', 'normal')
     end
 
         wedln:complete('prev', 'normal')
     end
 

-    -- Check that no other queries are open in the mplex.
-    local ok=mplex:managed_i(function(r) 
-                                 return not obj_is(r, "WEdln") 
+    -- Check that no other queries or message boxes are open in the mplex.
+    local ok=mplex:managed_i(function(r)
+                                 return not (obj_is(r, "WEdln") or
+                                             obj_is(r, "WMessage"))

                              end)
     if not ok then
         return
                              end)
     if not ok then
         return

diff --git a/mod_query/mod_query_chdir.lua b/mod_query/mod_query_chdir.lua
index c3eeb6ac9336d64e8b5e7aec93a8814dacfe66fc..1207aa79b18884a441c13a0f7403220b12843371 100644 (file)
--- a/mod_query/mod_query_chdir.lua
+++ b/mod_query/mod_query_chdir.lua
@@ -1,7 +1,7 @@
 --
 -- ion/query/mod_query_chdir.lua
 -- 
 --
 -- ion/query/mod_query_chdir.lua
 -- 

--- Copyright (c) Tuomo Valkonen 2004-2008.
+-- Copyright (c) Tuomo Valkonen 2004-2009.

 -- 
 -- See the included file LICENSE for details.
 --
 -- 
 -- See the included file LICENSE for details.
 --

diff --git a/mod_query/query.c b/mod_query/query.c
index 2749f1d2e0c3e2f2061974a75d52fec667b45592..fbb3fa6f7d40351729410eab4aa5c20e2c5c063a 100644 (file)
--- a/mod_query/query.c
+++ b/mod_query/query.c
@@ -1,7 +1,7 @@
 /*
  * ion/mod_query/query.c
  *
 /*
  * ion/mod_query/query.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_query/query.h b/mod_query/query.h
index 56237aec75be775aa8cc8fad0aa37edb0c81b933..bc21d11107fae8199beb0fc3819b0aba7c5532f9 100644 (file)
--- a/mod_query/query.h
+++ b/mod_query/query.h
@@ -1,7 +1,7 @@
 /*
  * ion/mod_query/query.h
  *
 /*
  * ion/mod_query/query.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_query/wedln-wrappers.c b/mod_query/wedln-wrappers.c
index 82ef6def3292f4ef12ea8743d33097aa7b238187..2d379f1c88a4eac82f6be5ba8b0d9b706d6fb119 100644 (file)
--- a/mod_query/wedln-wrappers.c
+++ b/mod_query/wedln-wrappers.c
@@ -1,7 +1,7 @@
 /*
  * ion/mod_query/wedln-wrappers.c
  *
 /*
  * ion/mod_query/wedln-wrappers.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_query/wedln.c b/mod_query/wedln.c
index 5a6aecc827e911ab97073579b128260a206c97c5..1c43db2a7cf3402241ce00bf80bf25741e2c71c7 100644 (file)
--- a/mod_query/wedln.c
+++ b/mod_query/wedln.c
@@ -1,7 +1,7 @@
 /*
  * ion/mod_query/wedln.c
  *
 /*
  * ion/mod_query/wedln.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_query/wedln.h b/mod_query/wedln.h
index e20a7c9ddf91e55447884623c9b0dc056ee8b4c9..bf6f0151cd2f3c7fc5f7d44fbf0ff057ddfee913 100644 (file)
--- a/mod_query/wedln.h
+++ b/mod_query/wedln.h
@@ -1,7 +1,7 @@
 /*
  * ion/mod_query/wedln.h
  *
 /*
  * ion/mod_query/wedln.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_query/wmessage.c b/mod_query/wmessage.c
index 9c3d468887c9197ff5120236e57c74b97e871147..096fdcf3888769c678b0700371d62b4f13f61f1d 100644 (file)
--- a/mod_query/wmessage.c
+++ b/mod_query/wmessage.c
@@ -1,7 +1,7 @@
 /*
  * ion/mod_query/wmessage.c
  *
 /*
  * ion/mod_query/wmessage.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_query/wmessage.h b/mod_query/wmessage.h
index 089b4820f8534a8a508e0f347e21cad39235f752..97d93dd21347510b1c2f21c996a73e04590831b9 100644 (file)
--- a/mod_query/wmessage.h
+++ b/mod_query/wmessage.h
@@ -1,7 +1,7 @@
 /*
  * ion/mod_query/wmessage.h
  *
 /*
  * ion/mod_query/wmessage.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_sm/sm.c b/mod_sm/sm.c
index 9451489f8b2382e4ec9847847a4ee2f25dff9a23..84b30c3232c3ad5b575bf2245077c4e83b6989b0 100644 (file)
--- a/mod_sm/sm.c
+++ b/mod_sm/sm.c
@@ -1,7 +1,7 @@
 /*
  * ion/mod_sm/sm.c
  *
 /*
  * ion/mod_sm/sm.c
  *

- * Copyright (c) Tuomo Valkonen 2004-2008. 
+ * Copyright (c) Tuomo Valkonen 2004-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_sm/sm_matchwin.c b/mod_sm/sm_matchwin.c
index e3705a831a857e2f773ba515f187690ebf21aa9c..811b1b5ca41c9707f83476941a5da8b653173c0a 100644 (file)
--- a/mod_sm/sm_matchwin.c
+++ b/mod_sm/sm_matchwin.c
@@ -1,7 +1,7 @@
 /*
  * ion/mod_sm/sm_mathcwin.c
  *
 /*
  * ion/mod_sm/sm_mathcwin.c
  *

- * Copyright (c) Tuomo Valkonen 2004-2008. 
+ * Copyright (c) Tuomo Valkonen 2004-2009. 

  * 
  * Based on the code of the 'sm' module for Ion1 by an unknown contributor.
  *
  * 
  * Based on the code of the 'sm' module for Ion1 by an unknown contributor.
  *

diff --git a/mod_sm/sm_matchwin.h b/mod_sm/sm_matchwin.h
index 5c90fb4a984c2632e1954ec84c1142d7d96a5daa..6c5dcd6f7b100aa7bfb7f949ad27e0d0d05f28b3 100644 (file)
--- a/mod_sm/sm_matchwin.h
+++ b/mod_sm/sm_matchwin.h
@@ -1,7 +1,7 @@
 /*
  * ion/mod_sm/sm_mathcwin.c
  *
 /*
  * ion/mod_sm/sm_mathcwin.c
  *

- * Copyright (c) Tuomo Valkonen 2004-2008. 
+ * Copyright (c) Tuomo Valkonen 2004-2009. 

  * 
  * Based on the code of the 'sm' module for Ion1 by an unknown contributor.
  *
  * 
  * Based on the code of the 'sm' module for Ion1 by an unknown contributor.
  *

diff --git a/mod_sm/sm_session.c b/mod_sm/sm_session.c
index 087431154b8cdb20aa434f9fab1c8842dc1e9fb5..9f141d4c5a94dc90815f680569a1f426adce1d39 100644 (file)
--- a/mod_sm/sm_session.c
+++ b/mod_sm/sm_session.c
@@ -1,7 +1,7 @@
 /*
  * ion/mod_sm/sm_session.c
  *
 /*
  * ion/mod_sm/sm_session.c
  *

- * Copyright (c) Tuomo Valkonen 2004-2008. 
+ * Copyright (c) Tuomo Valkonen 2004-2009. 

  * 
  * Based on the code of the 'sm' module for Ion1 by an unknown contributor.
  *
  * 
  * Based on the code of the 'sm' module for Ion1 by an unknown contributor.
  *

diff --git a/mod_sm/sm_session.h b/mod_sm/sm_session.h
index 05deb3452c02bcce438682f4a1d823c2b695092b..332c1d37e10b0c575880b242e337edc651d92170 100644 (file)
--- a/mod_sm/sm_session.h
+++ b/mod_sm/sm_session.h
@@ -1,7 +1,7 @@
 /*
  * ion/mod_sm/sm_session.h
  *
 /*
  * ion/mod_sm/sm_session.h
  *

- * Copyright (c) Tuomo Valkonen 2004-2008. 
+ * Copyright (c) Tuomo Valkonen 2004-2009. 

  * 
  * Based on the code of the 'sm' module for Ion1 by an unknown contributor.
  *
  * 
  * Based on the code of the 'sm' module for Ion1 by an unknown contributor.
  *

diff --git a/mod_sp/main.c b/mod_sp/main.c
index 512f38a2d751747540103bcff225f554406053fc..637912cb999c7cf5321378f7acf393ab8dfd4522 100644 (file)
--- a/mod_sp/main.c
+++ b/mod_sp/main.c
@@ -1,7 +1,7 @@
 /*
  * ion/mod_sp/main.c
  *
 /*
  * ion/mod_sp/main.c
  *

- * Copyright (c) Tuomo Valkonen 2004-2008. 
+ * Copyright (c) Tuomo Valkonen 2004-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_sp/main.h b/mod_sp/main.h
index 6ed8d6088b460338df2d56375e6d7e8a3920ddc2..d27c1be6fa7197e7d03a8b667d97a0690aaf960c 100644 (file)
--- a/mod_sp/main.h
+++ b/mod_sp/main.h
@@ -1,7 +1,7 @@
 /*
  * ion/mod_sp/main.h
  *
 /*
  * ion/mod_sp/main.h
  *

- * Copyright (c) Tuomo Valkonen 2004-2008.
+ * Copyright (c) Tuomo Valkonen 2004-2009.

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_statusbar/draw.c b/mod_statusbar/draw.c
index b4663068563701a714ea2f9dd61a08329d98978f..6a9750ecf26843a9430ce3350375fb6c3d5e8876 100644 (file)
--- a/mod_statusbar/draw.c
+++ b/mod_statusbar/draw.c
@@ -1,7 +1,7 @@
 /*
  * ion/mod_statusbar/draw.c
  *
 /*
  * ion/mod_statusbar/draw.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_statusbar/draw.h b/mod_statusbar/draw.h
index 19386b35bf59fffc467c972e0bd908065435c21f..ff71816072becb42e924534095eebc3266fad743 100644 (file)
--- a/mod_statusbar/draw.h
+++ b/mod_statusbar/draw.h
@@ -1,7 +1,7 @@
 /*
  * ion/mod_statusbar/draw.h
  *
 /*
  * ion/mod_statusbar/draw.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_statusbar/main.c b/mod_statusbar/main.c
index c54e17e8d86be0a695659fd2d40fb0f0113acf7a..777e0b31fe37b3802d8ce7c066e96689d89abd19 100644 (file)
--- a/mod_statusbar/main.c
+++ b/mod_statusbar/main.c
@@ -1,7 +1,7 @@
 /*
  * ion/mod_statusbar/main.c
  *
 /*
  * ion/mod_statusbar/main.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_statusbar/main.h b/mod_statusbar/main.h
index 90c3c3ae814fbb3cab804e4e64e11899b33c424e..5881e2a01290aa8f6f9fe1e15868a37bc979b51b 100644 (file)
--- a/mod_statusbar/main.h
+++ b/mod_statusbar/main.h
@@ -1,7 +1,7 @@
 /*
  * ion/mod_statusbar/main.h
  *
 /*
  * ion/mod_statusbar/main.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_statusbar/mod_statusbar.lua b/mod_statusbar/mod_statusbar.lua
index c37008295ffb9ffade7e83a813c2bf0d5abaa292..9bae08cd8dd1c4fd5cf7eb919224a9d39a8a9f34 100644 (file)
--- a/mod_statusbar/mod_statusbar.lua
+++ b/mod_statusbar/mod_statusbar.lua
@@ -1,7 +1,7 @@
 --
 -- ion/mod_statusbar/mod_statusbar.lua
 -- 
 --
 -- ion/mod_statusbar/mod_statusbar.lua
 -- 

--- Copyright (c) Tuomo Valkonen 2004-2008.
+-- Copyright (c) Tuomo Valkonen 2004-2009.

 --
 -- See the included file LICENSE for details.
 --
 --
 -- See the included file LICENSE for details.
 --

diff --git a/mod_statusbar/statusbar.c b/mod_statusbar/statusbar.c
index 3f741005619cf14c3a1716e2a9f3472650766831..06fa6973bc3a889df6f1c2c4ff61e0c62c7cf67c 100644 (file)
--- a/mod_statusbar/statusbar.c
+++ b/mod_statusbar/statusbar.c
@@ -1,7 +1,7 @@
 /*
  * ion/mod_statusbar/statusbar.c
  *
 /*
  * ion/mod_statusbar/statusbar.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_statusbar/statusbar.h b/mod_statusbar/statusbar.h
index 9d335886495c950cc004a4d8e76ef4f911247346..73458b609fb69481fdb04c33b95092dea6b3532e 100644 (file)
--- a/mod_statusbar/statusbar.h
+++ b/mod_statusbar/statusbar.h
@@ -1,7 +1,7 @@
 /*
  * ion/mod_statusbar/statusbar.h
  *
 /*
  * ion/mod_statusbar/statusbar.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_statusbar/statusd-launch.c b/mod_statusbar/statusd-launch.c
index 1f597b2193883c6e67cf1a79d7cbd39b86f29be8..b298f9d38e3ae1ba8faf4158e99f032e3930cffe 100644 (file)
--- a/mod_statusbar/statusd-launch.c
+++ b/mod_statusbar/statusd-launch.c
@@ -1,7 +1,7 @@
 /*
  * ion/mod_statusbar/statusd-launch.c
  *
 /*
  * ion/mod_statusbar/statusd-launch.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_tiling/main.c b/mod_tiling/main.c
index 7a482dc5ea23df395e325ec24107621fa59ef757..e8864aa07d7a7d47cc372caf0ed3b46a90016f62 100644 (file)
--- a/mod_tiling/main.c
+++ b/mod_tiling/main.c
@@ -1,7 +1,7 @@
 /*
  * ion/mod_tiling/main.c
  *
 /*
  * ion/mod_tiling/main.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_tiling/main.h b/mod_tiling/main.h
index 5405ef0e0ffd088abbb76cf27459015c14584484..2907c55b21b9c3ee10953c346ec286a9b04e9fe8 100644 (file)
--- a/mod_tiling/main.h
+++ b/mod_tiling/main.h
@@ -1,7 +1,7 @@
 /*
  * ion/mod_tiling/main.h
  *
 /*
  * ion/mod_tiling/main.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_tiling/mod_tiling.lua b/mod_tiling/mod_tiling.lua
index f8913b2175d11e31c87287b287fd77bfb6057d13..b899e2cd6d5e62abd7c87653ab4429bf99e73bec 100644 (file)
--- a/mod_tiling/mod_tiling.lua
+++ b/mod_tiling/mod_tiling.lua
@@ -1,7 +1,7 @@
 --
 -- ion/mod_menu/mod_tiling.lua -- Tiling module stub loader
 -- 
 --
 -- ion/mod_menu/mod_tiling.lua -- Tiling module stub loader
 -- 

--- Copyright (c) Tuomo Valkonen 2004-2008.
+-- Copyright (c) Tuomo Valkonen 2004-2009.

 --
 -- Ion is free software; you can redistribute it and/or modify it under
 -- the terms of the GNU Lesser General Public License as published by
 --
 -- Ion is free software; you can redistribute it and/or modify it under
 -- the terms of the GNU Lesser General Public License as published by

diff --git a/mod_tiling/ops.c b/mod_tiling/ops.c
index 4c57fbfad9712985ef0b56f413242cf369cbd06e..f09d5029287606c85736c02055518abb4408223e 100644 (file)
--- a/mod_tiling/ops.c
+++ b/mod_tiling/ops.c
@@ -1,7 +1,7 @@
 /*
  * ion/mod_tiling/ops.c
  *
 /*
  * ion/mod_tiling/ops.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_tiling/panehandle.c b/mod_tiling/panehandle.c
index 0420d969d515d321e2bfdc10b1ef361370783a98..482307cabc56504e1201f9c5d40d135857bc58b8 100644 (file)
--- a/mod_tiling/panehandle.c
+++ b/mod_tiling/panehandle.c
@@ -1,7 +1,7 @@
 /*
  * ion/mod_tiling/panehandle.c
  *
 /*
  * ion/mod_tiling/panehandle.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_tiling/panehandle.h b/mod_tiling/panehandle.h
index 5556c91855b578dabea325a561198293fdba0008..b8c91bae6306afdbb17530c8dae3881bb191e51a 100644 (file)
--- a/mod_tiling/panehandle.h
+++ b/mod_tiling/panehandle.h
@@ -1,7 +1,7 @@
 /*
  * ion/mod_tiling/panehandle.h
  *
 /*
  * ion/mod_tiling/panehandle.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_tiling/placement.c b/mod_tiling/placement.c
index 3fda75df69059e277693c79b26d3ee41b93a7e03..45cb5d6b64406d03e189eef637975fdaa78ed001 100644 (file)
--- a/mod_tiling/placement.c
+++ b/mod_tiling/placement.c
@@ -1,7 +1,7 @@
 /*
  * ion/mod_tiling/placement.c
  *
 /*
  * ion/mod_tiling/placement.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_tiling/placement.h b/mod_tiling/placement.h
index 18724a9366362f3adce1b6806784b017a64630ae..24906032e4c2c3a154849f8f35bb10ac02ed323a 100644 (file)
--- a/mod_tiling/placement.h
+++ b/mod_tiling/placement.h
@@ -1,7 +1,7 @@
 /*
  * ion/mod_tiling/placement.h
  *
 /*
  * ion/mod_tiling/placement.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_tiling/split-stdisp.c b/mod_tiling/split-stdisp.c
index 9d2aabde7349208525ae56d1acd9b43016f8ee94..8c34579b17ab5aebc7f6bf3c18619c3ad2151531 100644 (file)
--- a/mod_tiling/split-stdisp.c
+++ b/mod_tiling/split-stdisp.c
@@ -1,7 +1,7 @@
 /*
  * ion/mod_tiling/split-stdisp.c
  *
 /*
  * ion/mod_tiling/split-stdisp.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_tiling/split-stdisp.h b/mod_tiling/split-stdisp.h
index d3bb00b7e0e866e730532f4ccf336125085d910e..b86b8990c0937a687ad18d1648c7e58dd13d17af 100644 (file)
--- a/mod_tiling/split-stdisp.h
+++ b/mod_tiling/split-stdisp.h
@@ -1,7 +1,7 @@
 /*
  * ion/mod_tiling/split-stdisp.h
  *
 /*
  * ion/mod_tiling/split-stdisp.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_tiling/split.c b/mod_tiling/split.c
index a17900588428eb10c4a367a17782453802c07af4..5e1abb47dcb9961145032f6210eb30cb95ae5f0c 100644 (file)
--- a/mod_tiling/split.c
+++ b/mod_tiling/split.c
@@ -1,7 +1,7 @@
 /*
  * ion/mod_tiling/split.c
  *
 /*
  * ion/mod_tiling/split.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_tiling/split.h b/mod_tiling/split.h
index fedd179d582d173174d69a74bc4204b272904c5b..9d80dd60a8c01a2096df5e1bf3b974a0158d06bf 100644 (file)
--- a/mod_tiling/split.h
+++ b/mod_tiling/split.h
@@ -1,7 +1,7 @@
 /*
  * ion/mod_tiling/split.h
  *
 /*
  * ion/mod_tiling/split.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_tiling/splitfloat.c b/mod_tiling/splitfloat.c
index 8c6683f53ed193c6ef983580052d3f802888b65e..479045eb034a292367fb9c28b24d93e63d72b929 100644 (file)
--- a/mod_tiling/splitfloat.c
+++ b/mod_tiling/splitfloat.c
@@ -1,7 +1,7 @@
 /*
  * ion/mod_tiling/splitext.c
  *
 /*
  * ion/mod_tiling/splitext.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_tiling/splitfloat.h b/mod_tiling/splitfloat.h
index 53544a6d3c37b15e3d27ccd4c89c016be9c77d68..381a802d74dfb408156fa74dc395578659696dc5 100644 (file)
--- a/mod_tiling/splitfloat.h
+++ b/mod_tiling/splitfloat.h
@@ -1,7 +1,7 @@
 /*
  * ion/mod_tiling/splitfloat.h
  *
 /*
  * ion/mod_tiling/splitfloat.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_tiling/tiling.c b/mod_tiling/tiling.c
index 4040d82268257c4b274a3b445eeccd579dcb2c02..48bbb86f506a3976f57258831660bb12a4710544 100644 (file)
--- a/mod_tiling/tiling.c
+++ b/mod_tiling/tiling.c
@@ -1,7 +1,7 @@
 /*
  * ion/mod_tiling/tiling.c
  *
 /*
  * ion/mod_tiling/tiling.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/mod_tiling/tiling.h b/mod_tiling/tiling.h
index 129f267a349ecb6c9931f3e725efbbb8ce05ea9e..d780f7e4b5f86314d2ab918f5994d80bb64d143f 100644 (file)
--- a/mod_tiling/tiling.h
+++ b/mod_tiling/tiling.h
@@ -1,7 +1,7 @@
 /*
  * ion/mod_tiling/tiling.h
  *
 /*
  * ion/mod_tiling/tiling.h
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/pwm/pwm.c b/pwm/pwm.c
index 0f38cbbb2c1d29ba3b6620441e25e02fb34df757..0159ccef8ecccff04fb472dc65cd7ee2894b57c8 100644 (file)
--- a/pwm/pwm.c
+++ b/pwm/pwm.c
@@ -1,7 +1,7 @@
 /*
  * ion/pwm/pwm.c
  *
 /*
  * ion/pwm/pwm.c
  *

- * Copyright (c) Tuomo Valkonen 1999-2008. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/utils/ion-statusd/exec.c b/utils/ion-statusd/exec.c
index d15f0ab1332860307ee7e1f2140e3b27ee591cc1..a33d914879c95c2756506e71583ef57dc6c72ae0 100644 (file)
--- a/utils/ion-statusd/exec.c
+++ b/utils/ion-statusd/exec.c
@@ -1,7 +1,7 @@
 /*
  * ion/utils/ion-statusd/exec.c
  *
 /*
  * ion/utils/ion-statusd/exec.c
  *

- * Copyright (c) Tuomo Valkonen 2005-2008. 
+ * Copyright (c) Tuomo Valkonen 2005-2009. 

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/utils/ion-statusd/extlrx.c b/utils/ion-statusd/extlrx.c
index ce67bf0eaac2988c0547461adda4221e87a818ea..5ea52624ffce91e692d7adc1f26b4e55b43189d4 100644 (file)
--- a/utils/ion-statusd/extlrx.c
+++ b/utils/ion-statusd/extlrx.c
@@ -1,7 +1,7 @@
 /*
  * ion/utils/ion-statusd/extlrx.c
  *
 /*
  * ion/utils/ion-statusd/extlrx.c
  *

- * Copyright (c) Tuomo Valkonen 2004-2008.
+ * Copyright (c) Tuomo Valkonen 2004-2009.

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */

diff --git a/utils/ion-statusd/ion-statusd.c b/utils/ion-statusd/ion-statusd.c
index 5aa02c068ff6687cb4ad155c8ee97b0dffdf1fea..cdf80a552d8306ae2016dc33378baa25d7240b60 100644 (file)
--- a/utils/ion-statusd/ion-statusd.c
+++ b/utils/ion-statusd/ion-statusd.c
@@ -1,7 +1,7 @@
 /*
  * ion/utils/ion-statusd/ion-statusd.c
  *
 /*
  * ion/utils/ion-statusd/ion-statusd.c
  *

- * Copyright (c) Tuomo Valkonen 2004-2008.
+ * Copyright (c) Tuomo Valkonen 2004-2009.

  *
  * See the included file LICENSE for details.
  */
  *
  * See the included file LICENSE for details.
  */


@@ -62,7 +62,7 @@ static OptParserOpt ion_opts[]={
 
 
 static const char statusd_copy[]=
 
 
 static const char statusd_copy[]=

-    "Ion-statusd " ION_VERSION ", copyright (c) Tuomo Valkonen 2004-2008.";
+    "Ion-statusd " ION_VERSION ", copyright (c) Tuomo Valkonen 2004-2009.";

 
 
 static const char statusd_license[]=DUMMY_TR(
 
 
 static const char statusd_license[]=DUMMY_TR(

diff --git a/utils/ion-statusd/statusd_date.lua b/utils/ion-statusd/statusd_date.lua
index 8672088de3cb14753be8c1e54372f583c44d5e07..7331114b008ed847bd6144cd7babcd102fa0f675 100644 (file)
--- a/utils/ion-statusd/statusd_date.lua
+++ b/utils/ion-statusd/statusd_date.lua
@@ -1,7 +1,7 @@
 --
 -- ion/mod_statusbar/ion-statusd/statusd_date.lua
 -- 
 --
 -- ion/mod_statusbar/ion-statusd/statusd_date.lua
 -- 

--- Copyright (c) Tuomo Valkonen 2004-2008.
+-- Copyright (c) Tuomo Valkonen 2004-2009.

 --
 -- See the included file LICENSE for details.
 --
 --
 -- See the included file LICENSE for details.
 --

diff --git a/utils/ion-statusd/statusd_load.lua b/utils/ion-statusd/statusd_load.lua
index b9d6feab4dfbf2ae21605ee29d32e3da0a6789bd..98525eff9b6f0c235940f5eb60e35da048ef3598 100644 (file)
--- a/utils/ion-statusd/statusd_load.lua
+++ b/utils/ion-statusd/statusd_load.lua
@@ -1,7 +1,7 @@
 --
 -- ion/mod_statusbar/ion-statusd/statusd_load.lua
 -- 
 --
 -- ion/mod_statusbar/ion-statusd/statusd_load.lua
 -- 

--- Copyright (c) Tuomo Valkonen 2004-2008.
+-- Copyright (c) Tuomo Valkonen 2004-2009.

 --
 -- See the included file LICENSE for details.
 --
 --
 -- See the included file LICENSE for details.
 --

diff --git a/utils/ion-statusd/statusd_mail.lua b/utils/ion-statusd/statusd_mail.lua
index e332dbc7b1e51d201b403972f78879c5b9a13ef0..dd15794e0956564f7e54b0b3e506b4a2393765bd 100644 (file)
--- a/utils/ion-statusd/statusd_mail.lua
+++ b/utils/ion-statusd/statusd_mail.lua
@@ -1,7 +1,7 @@
 --
 -- ion/mod_statusbar/ion-statusd/statusd_mail.lua
 -- 
 --
 -- ion/mod_statusbar/ion-statusd/statusd_mail.lua
 -- 

--- Copyright (c) Tuomo Valkonen 2004-2008.
+-- Copyright (c) Tuomo Valkonen 2004-2009.

 --
 -- See the included file LICENSE for details.
 --
 --
 -- See the included file LICENSE for details.
 --

diff --git a/version.h b/version.h
index 7ed2db68f1a69d2314ba9c6b72e544807f21d740..65e0504aeacab598ad65c6572a10d93d99ad6e31 100644 (file)
--- a/version.h
+++ b/version.h
@@ -1,3 +1,3 @@
-#define ION_RELEASE "3-20081002"
+#define ION_RELEASE "3-20090110"

 #define ION_VERSION ION_RELEASE
 #define ION_API_VERSION "3"
 #define ION_VERSION ION_RELEASE
 #define ION_API_VERSION "3"