From 1a1da7f91ce0772210023d766e616aa0362c8d8d Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 2 Nov 2008 12:18:24 +0000 Subject: [PATCH] [svn-upgrade] Integrating new upstream version, ion3 (20080825) --- ChangeLog | 15 +++++++++++++++ RELNOTES | 6 ++++++ exact-version | 4 ++-- ioncore/group.c | 14 +++++++------- ioncore/ioncore_misc.lua | 2 +- man/pwm3.cs.in | 2 +- man/pwm3.fi.in | 2 +- man/pwm3.in | 2 +- version.h | 2 +- 9 files changed, 35 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index c5d6a37..ca5dbae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2008-08-25 15:43 UTC Tuomo Valkonen + tagged ion-3-20080825 + +2008-08-25 15:43 UTC Tuomo Valkonen + * Release notes + +2008-07-30 12:33 UTC Tuomo Valkonen + * Oops, szplcy could be unset on group attach. + +2008-07-13 21:36 UTC Aron Griffis + * Fix assert to check name rather than layout + +2008-07-07 16:15 UTC Tuomo Valkonen + * pwm3 man page --sessionname fix + 2008-07-07 15:38 UTC Tuomo Valkonen tagged ion-3-20080707 diff --git a/RELNOTES b/RELNOTES index 1c272f6..80b1ad2 100644 --- 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 ffaa1fa..7ea1116 100644 --- a/exact-version +++ b/exact-version @@ -1,5 +1,5 @@ Context: -[TAG ion-3-20080707 -Tuomo Valkonen **20080707153848] +[TAG ion-3-20080825 +Tuomo Valkonen **20080825154309] diff --git a/ioncore/group.c b/ioncore/group.c index 6d0409c..ad38ee8 100644 --- 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 1a0b0eb..3451d7b 100644 --- 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 5b6f443..a6d2e74 100644 --- 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 b8d6465..262c65c 100644 --- 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 8ea21b9..f7f3026 100644 --- 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 0ff85a5..5533a74 100644 --- 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" -- 2.39.2