[svn-upgrade] Integrating new upstream version, ion3 (20080825)

diff --git a/ChangeLog b/ChangeLog
index c5d6a379972556ff12bfdaa44caa868fce3b24c1..ca5dbae34c751cbec397f11a586f2aad20546891 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2008-08-25 15:43 UTC  Tuomo Valkonen <tuomov@iki.fi>
+  tagged ion-3-20080825
+
+2008-08-25 15:43 UTC  Tuomo Valkonen <tuomov@iki.fi>
+  * Release notes
+
+2008-07-30 12:33 UTC  Tuomo Valkonen <tuomov@iki.fi>
+  * Oops, szplcy could be unset on group attach.
+
+2008-07-13 21:36 UTC  Aron Griffis <agriffis@n01se.net>
+  * Fix assert to check name rather than layout
+
+2008-07-07 16:15 UTC  Tuomo Valkonen <tuomov@iki.fi>
+  * pwm3 man page --sessionname fix
+
 2008-07-07 15:38 UTC  Tuomo Valkonen <tuomov@iki.fi>
   tagged ion-3-20080707
 

diff --git a/RELNOTES b/RELNOTES
index 1c272f67251e63fdb7c3ec2f61033c5ca9056b6d..80b1ad2c885b15caa0468d0d205457e65ff6aa20 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,4 +1,10 @@
 
+ion-3-20080825
+--------------
+
+This release again fixes some issues found with the previous one.
+
+
 ion-3-20080707
 --------------
 

diff --git a/exact-version b/exact-version
index ffaa1facc3eca087b1cba8dd5eee5fa7cea9f4c1..7ea1116025827786eec61c572bfd105f5fbdc7f4 100644 (file)
--- a/exact-version
+++ b/exact-version
@@ -1,5 +1,5 @@
 
 Context:
 
-[TAG ion-3-20080707
-Tuomo Valkonen <tuomov@iki.fi>**20080707153848] 
+[TAG ion-3-20080825
+Tuomo Valkonen <tuomov@iki.fi>**20080825154309] 

diff --git a/ioncore/group.c b/ioncore/group.c
index 6d0409c1bd6e9862809f913beb086eab21fefd60..ad38ee8dd5a2a8129a7240236b4393519c015b84 100644 (file)
--- a/ioncore/group.c
+++ b/ioncore/group.c
@@ -628,14 +628,14 @@ bool group_do_attach_final(WGroup *ws,
               ? param->level 
               : STACKING_LEVEL_NORMAL));
     
-    if(!param->whatever){
-        /* Fit */
-        szplcy=(param->szplcy_set
-                ? param->szplcy
-                : (param->bottom
-                   ? SIZEPOLICY_FULL_EXACT
-                   : SIZEPOLICY_UNCONSTRAINED));
+    /* Fit */
+    szplcy=(param->szplcy_set
+            ? param->szplcy
+            : (param->bottom
+               ? SIZEPOLICY_FULL_EXACT
+               : SIZEPOLICY_UNCONSTRAINED));
         
+    if(!param->whatever){
         weak=(param->geom_weak_set
               ? param->geom_weak
               : (param->geom_set

diff --git a/ioncore/ioncore_misc.lua b/ioncore/ioncore_misc.lua
index 1a0b0eb620b158a349ce86d30e5ed3bb83e85480..3451d7be4329411e7517b85c089465202e2f81e7 100644 (file)
--- a/ioncore/ioncore_misc.lua
+++ b/ioncore/ioncore_misc.lua
@@ -22,7 +22,7 @@ local layouts={
 -- attach/creation parameters given in \var{tab}. The layout
 -- "empty" may not be defined.
 function ioncore.deflayout(name, tab)
-    assert(layout ~= "empty")
+    assert(name ~= "empty")
     
     if name=="default" and not tab then
         layouts[name] = empty

diff --git a/man/pwm3.cs.in b/man/pwm3.cs.in
index 5b6f443b15ae1ebbab84f417b058ae79bbfcbf75..a6d2e74726484519d888547046c958735672cbd3 100644 (file)
--- a/man/pwm3.cs.in
+++ b/man/pwm3.cs.in
@@ -26,7 +26,7 @@ Na X serverech s v
 obrazovku (koøenové okno). (Tedy ne v¹echny, které byly zadány v parametru
 -display nebo v promìnné DISPLAY.)
 .TP
-.B \-sessionname session_name
+.B \-session session_name
 Nastaví název sezení. Tato volba ovlivní, kam se ulo¾í pracovní plochy
 a ostatní soubory. Pokud není nastavená, pou¾ije se ~/.pwm3/session_name.
 .TP

diff --git a/man/pwm3.fi.in b/man/pwm3.fi.in
index b8d64657548920e3c48a6f08d54e9a9e4c34c21e..262c65c466d8723fe2ce1607d8ecf0ffe3de6673 100644 (file)
--- a/man/pwm3.fi.in
+++ b/man/pwm3.fi.in
@@ -26,7 +26,7 @@ Hallitse vain oletusn
 (ei Xinerama) näyttö/juuri-ikkuna. Tämä näyttö voidaan valita -display
 parametrillä tai DISPLAY ympäristömuuttujalla.
 .TP
-.B \-sessionname session_name
+.B \-session session_name
 Istunnon nimi. Tämä vaikuttaa talletustiedostojen sijaintiin.
 .TP
 .B \-help

diff --git a/man/pwm3.in b/man/pwm3.in
index 8ea21b9a3b348018f9fd20af9373245bef0eb66b..f7f30261793bc1fcf88c7afce0d8081cd6918ab0 100644 (file)
--- a/man/pwm3.in
+++ b/man/pwm3.in
@@ -27,7 +27,7 @@ On X servers with multiple (traditional non-Xinerama) screens, manage only
 default screen (root window), not all, as given by the -display option or
 in the DISPLAY environment variable.
 .TP
-.B \-sessionname session_name
+.B \-session session_name
 Set session name. This option affects where workspace and other save files are
 put (~/.pwm3/session_name if option set).
 .TP

diff --git a/version.h b/version.h
index 0ff85a582df292597ef92f2aa0b9a818a9100f83..5533a749e4a4d9cdbff9051c02c9af125db951f5 100644 (file)
--- a/version.h
+++ b/version.h
@@ -1,3 +1,3 @@
-#define ION_RELEASE "3-20080707"
+#define ION_RELEASE "3-20080825"
 #define ION_VERSION ION_RELEASE
 #define ION_API_VERSION "3"