From df57861c962a50bfbf57f276d288395fe0c6a4b6 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 6 Jan 2008 00:35:47 +0000 Subject: [PATCH] [svn-upgrade] Integrating new upstream version, ion3 (20080103) --- ChangeLog | 48 +++++++++++++++++++++ LICENSE | 2 +- README | 10 ++--- RELNOTES | 8 ++++ build/rules.mk | 12 +++--- config.h | 4 +- de/brush.c | 2 +- de/brush.h | 2 +- de/colour.c | 2 +- de/colour.h | 2 +- de/draw.c | 2 +- de/font.c | 2 +- de/font.h | 2 +- de/fontset.h | 2 +- de/init.c | 2 +- de/init.h | 2 +- de/private.h | 2 +- de/style.c | 2 +- de/style.h | 2 +- etc/cfg_query.lua | 2 +- exact-version | 4 +- ion/Makefile | 13 +++--- ion/ion.c | 6 +-- ioncore/activity.c | 2 +- ioncore/activity.h | 2 +- ioncore/attach.c | 2 +- ioncore/attach.h | 2 +- ioncore/basicpholder.c | 2 +- ioncore/basicpholder.h | 2 +- ioncore/binding.c | 2 +- ioncore/binding.h | 2 +- ioncore/bindmaps.c | 2 +- ioncore/bindmaps.h | 2 +- ioncore/classes.h | 2 +- ioncore/clientwin.c | 2 +- ioncore/clientwin.h | 2 +- ioncore/colormap.c | 2 +- ioncore/colormap.h | 2 +- ioncore/common.h | 2 +- ioncore/conf-bindings.c | 2 +- ioncore/conf-bindings.h | 2 +- ioncore/conf.c | 2 +- ioncore/conf.h | 2 +- ioncore/cursor.c | 2 +- ioncore/cursor.h | 2 +- ioncore/detach.c | 16 ++++--- ioncore/detach.h | 2 +- ioncore/dummywc.h | 2 +- ioncore/event.c | 2 +- ioncore/event.h | 2 +- ioncore/eventh.c | 2 +- ioncore/eventh.h | 2 +- ioncore/exec.c | 2 +- ioncore/exec.h | 2 +- ioncore/extlconv.c | 2 +- ioncore/extlconv.h | 2 +- ioncore/extlrx.c | 2 +- ioncore/float-placement.c | 2 +- ioncore/float-placement.h | 2 +- ioncore/focus.c | 2 +- ioncore/focus.h | 2 +- ioncore/frame-draw.c | 2 +- ioncore/frame-draw.h | 2 +- ioncore/frame-pointer.c | 2 +- ioncore/frame-pointer.h | 2 +- ioncore/frame.c | 2 +- ioncore/frame.h | 2 +- ioncore/framedpholder.c | 2 +- ioncore/framedpholder.h | 2 +- ioncore/framep.h | 2 +- ioncore/fullscreen.c | 2 +- ioncore/fullscreen.h | 2 +- ioncore/global.h | 2 +- ioncore/gr-util.h | 2 +- ioncore/gr.c | 2 +- ioncore/gr.h | 2 +- ioncore/grab.c | 2 +- ioncore/grab.h | 2 +- ioncore/group-cw.c | 2 +- ioncore/group-cw.h | 2 +- ioncore/group-ws.c | 2 +- ioncore/group-ws.h | 2 +- ioncore/group.c | 2 +- ioncore/group.h | 2 +- ioncore/grouppholder.c | 19 +++++---- ioncore/grouppholder.h | 2 +- ioncore/infowin.c | 2 +- ioncore/infowin.h | 2 +- ioncore/ioncore.c | 4 +- ioncore/ioncore.h | 2 +- ioncore/ioncore_bindings.lua | 2 +- ioncore/ioncore_efbb.lua | 2 +- ioncore/ioncore_ext.lua | 2 +- ioncore/ioncore_luaext.lua | 2 +- ioncore/ioncore_menudb.lua | 2 +- ioncore/ioncore_misc.lua | 2 +- ioncore/ioncore_quasiact.lua | 2 +- ioncore/ioncore_tabnum.lua | 2 +- ioncore/ioncore_wd.lua | 2 +- ioncore/ioncore_winprops.lua | 2 +- ioncore/kbresize.c | 2 +- ioncore/kbresize.h | 2 +- ioncore/key.c | 2 +- ioncore/key.h | 2 +- ioncore/llist.c | 2 +- ioncore/llist.h | 2 +- ioncore/manage.c | 2 +- ioncore/manage.h | 2 +- ioncore/modules.c | 2 +- ioncore/modules.h | 2 +- ioncore/mplex.c | 2 +- ioncore/mplex.h | 2 +- ioncore/mplexpholder.c | 2 +- ioncore/mplexpholder.h | 2 +- ioncore/mwmhints.c | 2 +- ioncore/mwmhints.h | 2 +- ioncore/names.c | 2 +- ioncore/names.h | 2 +- ioncore/navi.c | 2 +- ioncore/navi.h | 2 +- ioncore/netwm.c | 2 +- ioncore/netwm.h | 2 +- ioncore/pholder.c | 2 +- ioncore/pholder.h | 2 +- ioncore/pointer.c | 2 +- ioncore/pointer.h | 2 +- ioncore/presize.c | 2 +- ioncore/presize.h | 2 +- ioncore/property.c | 2 +- ioncore/property.h | 2 +- ioncore/rectangle.c | 2 +- ioncore/rectangle.h | 2 +- ioncore/regbind.c | 2 +- ioncore/regbind.h | 2 +- ioncore/reginfo.c | 2 +- ioncore/reginfo.h | 2 +- ioncore/region-iter.h | 2 +- ioncore/region.c | 2 +- ioncore/region.h | 2 +- ioncore/resize.c | 2 +- ioncore/resize.h | 2 +- ioncore/return.c | 2 +- ioncore/return.h | 2 +- ioncore/rootwin.c | 2 +- ioncore/rootwin.h | 2 +- ioncore/saveload.c | 2 +- ioncore/saveload.h | 2 +- ioncore/screen-notify.c | 2 +- ioncore/screen-notify.h | 2 +- ioncore/screen.c | 2 +- ioncore/screen.h | 2 +- ioncore/selection.c | 2 +- ioncore/selection.h | 2 +- ioncore/sizehint.c | 2 +- ioncore/sizehint.h | 2 +- ioncore/sizepolicy.c | 2 +- ioncore/sizepolicy.h | 2 +- ioncore/stacking.c | 2 +- ioncore/stacking.h | 2 +- ioncore/strings.c | 2 +- ioncore/strings.h | 2 +- ioncore/tags.c | 2 +- ioncore/tags.h | 2 +- ioncore/window.c | 2 +- ioncore/window.h | 2 +- ioncore/xic.c | 2 +- ioncore/xic.h | 2 +- ioncore/xwindow.c | 2 +- ioncore/xwindow.h | 2 +- libmainloop/defer.c | 2 +- libmainloop/defer.h | 2 +- libmainloop/exec.c | 2 +- libmainloop/exec.h | 2 +- libmainloop/hooks.c | 2 +- libmainloop/hooks.h | 2 +- libmainloop/signal.c | 2 +- libmainloop/signal.h | 2 +- mod_dock/dock.c | 2 +- mod_menu/grabmenu.c | 2 +- mod_menu/main.c | 2 +- mod_menu/main.h | 2 +- mod_menu/menu.c | 2 +- mod_menu/menu.h | 2 +- mod_menu/mkmenu.c | 2 +- mod_menu/mkmenu.h | 2 +- mod_menu/mod_menu.lua | 2 +- mod_query/complete.c | 2 +- mod_query/complete.h | 2 +- mod_query/edln.c | 2 +- mod_query/edln.h | 2 +- mod_query/fwarn.c | 2 +- mod_query/fwarn.h | 2 +- mod_query/history.c | 2 +- mod_query/history.h | 2 +- mod_query/input.c | 2 +- mod_query/input.h | 2 +- mod_query/inputp.h | 2 +- mod_query/listing.c | 2 +- mod_query/listing.h | 2 +- mod_query/main.c | 2 +- mod_query/main.h | 2 +- mod_query/mod_query.lua | 2 +- mod_query/mod_query_chdir.lua | 2 +- mod_query/query.c | 2 +- mod_query/query.h | 2 +- mod_query/wedln-wrappers.c | 2 +- mod_query/wedln.c | 2 +- mod_query/wedln.h | 2 +- mod_query/wmessage.c | 2 +- mod_query/wmessage.h | 2 +- mod_sm/sm.c | 2 +- mod_sm/sm_matchwin.c | 2 +- mod_sm/sm_matchwin.h | 2 +- mod_sm/sm_session.c | 2 +- mod_sm/sm_session.h | 2 +- mod_sp/main.c | 2 +- mod_sp/main.h | 2 +- mod_statusbar/draw.c | 2 +- mod_statusbar/draw.h | 2 +- mod_statusbar/main.c | 2 +- mod_statusbar/main.h | 2 +- mod_statusbar/mod_statusbar.lua | 2 +- mod_statusbar/statusbar.c | 2 +- mod_statusbar/statusbar.h | 2 +- mod_statusbar/statusd-launch.c | 2 +- mod_tiling/main.c | 2 +- mod_tiling/main.h | 2 +- mod_tiling/mod_tiling.lua | 2 +- mod_tiling/ops.c | 2 +- mod_tiling/panehandle.c | 2 +- mod_tiling/panehandle.h | 2 +- mod_tiling/placement.c | 2 +- mod_tiling/placement.h | 2 +- mod_tiling/split-stdisp.c | 2 +- mod_tiling/split-stdisp.h | 2 +- mod_tiling/split.c | 2 +- mod_tiling/split.h | 2 +- mod_tiling/splitfloat.c | 2 +- mod_tiling/splitfloat.h | 2 +- mod_tiling/tiling.c | 2 +- mod_tiling/tiling.h | 2 +- pwm/Makefile | 13 +++--- pwm/pwm.c | 6 +-- system.mk | 68 +++++++++++++++++++++--------- utils/ion-completefile/Makefile | 2 +- utils/ion-statusd/Makefile | 4 +- utils/ion-statusd/exec.c | 2 +- utils/ion-statusd/extlrx.c | 2 +- utils/ion-statusd/ion-statusd.c | 6 +-- utils/ion-statusd/statusd_date.lua | 2 +- utils/ion-statusd/statusd_load.lua | 2 +- utils/ion-statusd/statusd_mail.lua | 2 +- version.h | 3 +- 253 files changed, 407 insertions(+), 309 deletions(-) diff --git a/ChangeLog b/ChangeLog index dee0e0b..e261047 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,51 @@ +2008-01-03 18:23 UTC Tuomo Valkonen + tagged ion-3rc-20080103 + +2008-01-03 18:23 UTC Tuomo Valkonen + * Oops + +2008-01-03 18:11 UTC Tuomo Valkonen + * Release notes + +2008-01-03 18:07 UTC Tuomo Valkonen + * Hack for better modality handling on detach + +2008-01-03 16:56 UTC Tuomo Valkonen + * system.mk doc. refinement + +2008-01-02 15:15 UTC Tuomo Valkonen + * Changes in version.h defs. to accomodate flags + +2008-01-01 16:51 UTC Tuomo Valkonen + * New year + +2007-12-30 18:04 UTC Tuomo Valkonen + * system.mk documentation improvements + +2007-12-30 17:51 UTC Tuomo Valkonen + * Makefile tuning + +2007-12-30 17:51 UTC Tuomo Valkonen + * Replaced order of LIBS and EXTRA_LIBS in system.mk defaults + +2007-12-30 00:04 UTC Tuomo Valkonen + * Fixed FS mode return regression after recent pholder code changes. + +2007-12-28 18:02 UTC Tuomo Valkonen + * Added -s(trip) flags to binary install + +2007-12-28 17:28 UTC Tuomo Valkonen + * Improvements to relocatable builds + +2007-12-22 09:55 UTC Tuomo Valkonen + * README updates + +2007-12-22 00:02 UTC Tuomo Valkonen + * Improved system.mk documentation + +2007-12-20 19:33 UTC Tuomo Valkonen + * Oops, copy-paste mistake in commented-out cfg_query example + 2007-12-20 18:45 UTC Tuomo Valkonen tagged ion-3rc-20071220 diff --git a/LICENSE b/LICENSE index 21d506e..52a117d 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ -Copyright (c) Tuomo Valkonen 1999-2007. +Copyright (c) Tuomo Valkonen 1999-2008. 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 c588b95..407c55e 100644 --- a/README +++ b/README @@ -2,7 +2,7 @@ Ion === -Copyright (c) Tuomo Valkonen 1999-2007. +Copyright (c) Tuomo Valkonen 1999-2008. tuomov at iki.fi @@ -73,9 +73,9 @@ Some optional installation steps 15 05 * * * $SHAREDIR/ion-completeman -mksyscache - Replace `$SHAREDIR` with the setting from `system.mk` (or `system-ac.mk` - if you used autoconf). This example runs daily at 05:15, but you may - modify the run times to your needs; see the crontab manual. + Replace `$SHAREDIR` with the setting from `system.mk`. This example + runs daily at 05:15, but you may modify the run times to your needs; + see the crontab manual. If you can't or do not want to build a system-wide man page cache, run `crontab -e` as your normal user and replace `-mksyscache` with @@ -85,7 +85,7 @@ Some optional installation steps `-mk*cache` argument once manually to build the initial cache. If the `MANPATH` environment variable is not set on your system and it - does not have the `manpath` command (or it does not print anything + does not have the `manpath` command (or it does not print anything sensible), you may also want to set the `ION_MANPATH` environment variable to the list of paths where the system stores manual pages. diff --git a/RELNOTES b/RELNOTES index 97c57e6..07c9cd6 100644 --- a/RELNOTES +++ b/RELNOTES @@ -1,4 +1,12 @@ +ion-3rc-20080103 +---------------- + +This release features a few minor fixes to behavioural regressions +in the previous release, as well as some build configuration file +self-documentation improvements. + + ion-3rc-20071220 ---------------- diff --git a/build/rules.mk b/build/rules.mk index f4f18d1..488a02a 100644 --- a/build/rules.mk +++ b/build/rules.mk @@ -2,10 +2,6 @@ ## Some make rules ## -ifdef RELOCATABLE -DEFINES += -DCF_RELOCATABLE -endif - ifdef MODULE ifeq ($(PRELOAD_MODULES),1) MODULE_TARGETS := $(MODULE).a $(MODULE).lc @@ -107,7 +103,7 @@ $(MODULE).so: $(OBJS) $(EXT_OBJS) module_install: module_stub_install $(INSTALLDIR) $(MODULEDIR) - $(INSTALL) -m $(BIN_MODE) $(MODULE).so $(MODULEDIR) + $(INSTALLBIN) $(MODULE).so $(MODULEDIR) else # PRELOAD_MODULES @@ -220,3 +216,9 @@ TO_CLEAN += potfiles_c potfiles_lua _potfiles: echo "$(SOURCES)"|tr ' ' '\n' > potfiles_c echo "$(LUA_SOURCES) $(ETC)"|tr ' ' '\n' > potfiles_lua + +# Defaults +###################################### + +INSTALL_STRIP ?= -s +INSTALLBIN ?= $(INSTALL) $(INSTALL_STRIP) -m $(BIN_MODE) diff --git a/config.h b/config.h index 03e80ee..699d49f 100644 --- a/config.h +++ b/config.h @@ -1,9 +1,9 @@ /* * config.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * - * FOOBARBAZQUK + * See the included file LICENSE for details. */ #ifndef ION_CONFIG_H diff --git a/de/brush.c b/de/brush.c index 74b47f1..90a57a9 100644 --- a/de/brush.c +++ b/de/brush.c @@ -1,7 +1,7 @@ /* * ion/de/brush.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/de/brush.h b/de/brush.h index 3828a43..f3dc35c 100644 --- a/de/brush.h +++ b/de/brush.h @@ -1,7 +1,7 @@ /* * ion/de/brush.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/de/colour.c b/de/colour.c index d3be1ef..4fb3b1d 100644 --- a/de/colour.c +++ b/de/colour.c @@ -1,7 +1,7 @@ /* * ion/de/colour.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/de/colour.h b/de/colour.h index 0f99863..9864779 100644 --- a/de/colour.h +++ b/de/colour.h @@ -1,7 +1,7 @@ /* * ion/de/colour.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/de/draw.c b/de/draw.c index c48d49a..c9750ba 100644 --- a/de/draw.c +++ b/de/draw.c @@ -1,7 +1,7 @@ /* * ion/de/draw.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/de/font.c b/de/font.c index 5521125..0f6fab7 100644 --- a/de/font.c +++ b/de/font.c @@ -1,7 +1,7 @@ /* * ion/de/font.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/de/font.h b/de/font.h index 4ce1923..1b3774c 100644 --- a/de/font.h +++ b/de/font.h @@ -1,7 +1,7 @@ /* * ion/de/font.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/de/fontset.h b/de/fontset.h index 632f6e2..badee30 100644 --- a/de/fontset.h +++ b/de/fontset.h @@ -1,7 +1,7 @@ /* * ion/de/fontset.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/de/init.c b/de/init.c index 60c8715..a473592 100644 --- a/de/init.c +++ b/de/init.c @@ -1,7 +1,7 @@ /* * ion/de/init.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/de/init.h b/de/init.h index 5a51ee6..caefc9c 100644 --- a/de/init.h +++ b/de/init.h @@ -1,7 +1,7 @@ /* * ion/de/init.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/de/private.h b/de/private.h index cb3700a..b0f4013 100644 --- a/de/private.h +++ b/de/private.h @@ -1,7 +1,7 @@ /* * ion/de/private.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/de/style.c b/de/style.c index 2e61bf2..06a1531 100644 --- a/de/style.c +++ b/de/style.c @@ -1,7 +1,7 @@ /* * ion/de/style.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/de/style.h b/de/style.h index 11fbc5e..6f4063f 100644 --- a/de/style.h +++ b/de/style.h @@ -1,7 +1,7 @@ /* * ion/de/style.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/etc/cfg_query.lua b/etc/cfg_query.lua index 0b1d75a..123de77 100644 --- a/etc/cfg_query.lua +++ b/etc/cfg_query.lua @@ -119,6 +119,6 @@ mod_query.set{ caseicompl=true, -- Sub-string completion? (Some queries only.) - caseicompl=true, + substrcompl=true, } --]] diff --git a/exact-version b/exact-version index 61cbfd3..3ed2119 100644 --- a/exact-version +++ b/exact-version @@ -1,5 +1,5 @@ Context: -[TAG ion-3rc-20071220 -Tuomo Valkonen **20071220184549] +[TAG ion-3rc-20080103 +Tuomo Valkonen **20080103182346] diff --git a/ion/Makefile b/ion/Makefile index 1f1037e..d723946 100644 --- a/ion/Makefile +++ b/ion/Makefile @@ -31,17 +31,20 @@ SOURCES += preload.c TO_CLEAN += preload.c LIBS += -lSM -lICE else -LINKOPTS = $(EXPORT_DYNAMIC) +LDFLAGS += $(EXPORT_DYNAMIC) WHOLEA = -Wl,-whole-archive NO_WHOLEA = -Wl,-no-whole-archive endif +ifeq ($(RELOCATABLE),1) +DEFINES += -DCF_RELOCATABLE_ION3_LOCATION=\"$(BINDIR)/ion3\" +endif + EXT_OBJS += ../ioncore/ioncore.a DEFINES += -DETCDIR=\"$(ETCDIR)\" -DSHAREDIR=\"$(SHAREDIR)\" \ -DEXTRABINDIR=\"$(EXTRABINDIR)\" -DMODULEDIR=\"$(MODULEDIR)\" \ - -DLCDIR=\"$(LCDIR)\" -DLOCALEDIR=\"$(LOCALEDIR)\" \ - -DION3_LOCATION=\"$(BINDIR)/ion3\" + -DLCDIR=\"$(LCDIR)\" -DLOCALEDIR=\"$(LOCALEDIR)\" CFLAGS += $(XOPEN_SOURCE) $(C99_SOURCE) @@ -52,11 +55,11 @@ include $(TOPDIR)/build/rules.mk ###################################### ion3: $(OBJS) $(EXT_OBJS) - $(CC) $(LINKOPTS) $(OBJS) $(WHOLEA) $(EXT_OBJS) $(NO_WHOLEA) $(LDFLAGS) -o $@ + $(CC) $(OBJS) $(WHOLEA) $(EXT_OBJS) $(NO_WHOLEA) $(LDFLAGS) -o $@ preload.c: $(LUA) ../build/mkpreload.lua $(MODULE_LIST) > preload.c _install: $(INSTALLDIR) $(BINDIR) - $(INSTALL) -m $(BIN_MODE) ion3 $(BINDIR) + $(INSTALLBIN) ion3 $(BINDIR) diff --git a/ion/ion.c b/ion/ion.c index 23dce0c..4bbfb60 100644 --- a/ion/ion.c +++ b/ion/ion.c @@ -1,7 +1,7 @@ /* * ion/ion/ion.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ @@ -151,8 +151,8 @@ int main(int argc, char*argv[]) libtu_init(argv[0]); -#ifdef CF_RELOCATABLE - prefix_set(argv[0], ION3_LOCATION); +#ifdef CF_RELOCATABLE_ION3_LOCATION + prefix_set(argv[0], CF_RELOCATABLE_ION3_LOCATION); #endif localedir=prefix_add(LOCALEDIR); diff --git a/ioncore/activity.c b/ioncore/activity.c index 3eba697..30ff4d1 100644 --- a/ioncore/activity.c +++ b/ioncore/activity.c @@ -1,7 +1,7 @@ /* * ion/ioncore/activity.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/activity.h b/ioncore/activity.h index 5197786..8728a2f 100644 --- a/ioncore/activity.h +++ b/ioncore/activity.h @@ -1,7 +1,7 @@ /* * ion/ioncore/activity.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/attach.c b/ioncore/attach.c index 52d0998..1c406b3 100644 --- a/ioncore/attach.c +++ b/ioncore/attach.c @@ -1,7 +1,7 @@ /* * ion/ioncore/attach.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/attach.h b/ioncore/attach.h index ca144fe..6fffd37 100644 --- a/ioncore/attach.h +++ b/ioncore/attach.h @@ -1,7 +1,7 @@ /* * ion/ioncore/attach.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/basicpholder.c b/ioncore/basicpholder.c index f452781..7272908 100644 --- a/ioncore/basicpholder.c +++ b/ioncore/basicpholder.c @@ -1,7 +1,7 @@ /* * ion/ioncore/basicpholder.c * - * Copyright (c) Tuomo Valkonen 2005-2007. + * Copyright (c) Tuomo Valkonen 2005-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/basicpholder.h b/ioncore/basicpholder.h index 780c793..156b4a4 100644 --- a/ioncore/basicpholder.h +++ b/ioncore/basicpholder.h @@ -1,7 +1,7 @@ /* * ion/ioncore/basicpholder.h * - * Copyright (c) Tuomo Valkonen 2005-2007. + * Copyright (c) Tuomo Valkonen 2005-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/binding.c b/ioncore/binding.c index cad47d3..5ca284d 100644 --- a/ioncore/binding.c +++ b/ioncore/binding.c @@ -1,7 +1,7 @@ /* * ion/ioncore/binding.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/binding.h b/ioncore/binding.h index 32cc2be..98d0667 100644 --- a/ioncore/binding.h +++ b/ioncore/binding.h @@ -1,7 +1,7 @@ /* * ion/ioncore/binding.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/bindmaps.c b/ioncore/bindmaps.c index 5948c02..e7318a8 100644 --- a/ioncore/bindmaps.c +++ b/ioncore/bindmaps.c @@ -1,7 +1,7 @@ /* * ion/ioncore/bindmaps.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/bindmaps.h b/ioncore/bindmaps.h index 41e2f58..48631c1 100644 --- a/ioncore/bindmaps.h +++ b/ioncore/bindmaps.h @@ -1,7 +1,7 @@ /* * ion/ioncore/bindmaps.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/classes.h b/ioncore/classes.h index 58698a7..d7076e4 100644 --- a/ioncore/classes.h +++ b/ioncore/classes.h @@ -1,7 +1,7 @@ /* * ion/ioncore/classes.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/clientwin.c b/ioncore/clientwin.c index 1b85dfc..cb528ad 100644 --- a/ioncore/clientwin.c +++ b/ioncore/clientwin.c @@ -1,7 +1,7 @@ /* * ion/ioncore/clientwin.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/clientwin.h b/ioncore/clientwin.h index dfae443..cd0134a 100644 --- a/ioncore/clientwin.h +++ b/ioncore/clientwin.h @@ -1,7 +1,7 @@ /* * ion/ioncore/clientwin.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/colormap.c b/ioncore/colormap.c index ea3fedd..303e319 100644 --- a/ioncore/colormap.c +++ b/ioncore/colormap.c @@ -1,7 +1,7 @@ /* * ion/ioncore/colormap.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/colormap.h b/ioncore/colormap.h index 881d692..8a6c201 100644 --- a/ioncore/colormap.h +++ b/ioncore/colormap.h @@ -1,7 +1,7 @@ /* * ion/ioncore/colormap.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/common.h b/ioncore/common.h index 091b9c4..616e7d9 100644 --- a/ioncore/common.h +++ b/ioncore/common.h @@ -1,7 +1,7 @@ /* * ion/ioncore/common.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/conf-bindings.c b/ioncore/conf-bindings.c index d745a09..d0d2fba 100644 --- a/ioncore/conf-bindings.c +++ b/ioncore/conf-bindings.c @@ -1,7 +1,7 @@ /* * ion/ioncore/conf-bindings.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/conf-bindings.h b/ioncore/conf-bindings.h index 7186cc4..af0ebf1 100644 --- a/ioncore/conf-bindings.h +++ b/ioncore/conf-bindings.h @@ -1,7 +1,7 @@ /* * ion/ioncore/conf-bindings.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/conf.c b/ioncore/conf.c index 1656fc0..edafe94 100644 --- a/ioncore/conf.c +++ b/ioncore/conf.c @@ -1,7 +1,7 @@ /* * ion/ioncore/conf.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/conf.h b/ioncore/conf.h index 6f82163..5435546 100644 --- a/ioncore/conf.h +++ b/ioncore/conf.h @@ -1,7 +1,7 @@ /* * ion/ioncore/conf.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/cursor.c b/ioncore/cursor.c index 884dd5b..ba045c4 100644 --- a/ioncore/cursor.c +++ b/ioncore/cursor.c @@ -1,7 +1,7 @@ /* * ion/ioncore/cursor.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/cursor.h b/ioncore/cursor.h index 5c9c6e5..ab41d85 100644 --- a/ioncore/cursor.h +++ b/ioncore/cursor.h @@ -1,7 +1,7 @@ /* * ion/ioncore/cursor.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/detach.c b/ioncore/detach.c index 8a86640..89187a4 100644 --- a/ioncore/detach.c +++ b/ioncore/detach.c @@ -1,7 +1,7 @@ /* * ion/ioncore/detach.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ @@ -63,6 +63,7 @@ static bool ioncore_do_detach(WRegion *reg, WGroup *grp, WFrameMode framemode, } if(framemode!=FRAME_MODE_UNKNOWN){ + /* TODO: remove/obsolete this special case */ WFramedParam fpa=FRAMEDPARAM_INIT; fpa.mode=framemode; @@ -83,17 +84,20 @@ static bool ioncore_do_detach(WRegion *reg, WGroup *grp, WFrameMode framemode, }else{ WStacking *st=ioncore_find_stacking(reg); + ap.level_set=TRUE; + ap.level=framelevel+1; + if(st!=NULL){ ap.szplcy=st->szplcy; ap.szplcy_set=TRUE; - /*ap.level_set=TRUE; - ap.level=maxof(st->level, STACKING_LEVEL_NORMAL);*/ + /* Hack for modal detached queries, while transients become + * non-modal detached. + */ + if(st->level>STACKING_LEVEL_MODAL1) + ap.level=st->level; } - ap.level_set=TRUE; - ap.level=framelevel+1; - ap.geom_set=TRUE; get_relative_geom(&ap.geom, reg, (WRegion*)grp); diff --git a/ioncore/detach.h b/ioncore/detach.h index f407a08..0a2da1e 100644 --- a/ioncore/detach.h +++ b/ioncore/detach.h @@ -1,7 +1,7 @@ /* * ion/ioncore/detach.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/dummywc.h b/ioncore/dummywc.h index 03d6955..87bafe2 100644 --- a/ioncore/dummywc.h +++ b/ioncore/dummywc.h @@ -1,7 +1,7 @@ /* * ion/ioncore/dummywc.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/event.c b/ioncore/event.c index 217fe1b..02bc5fe 100644 --- a/ioncore/event.c +++ b/ioncore/event.c @@ -1,7 +1,7 @@ /* * ion/ioncore/event.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/event.h b/ioncore/event.h index d83f508..3a810c4 100644 --- a/ioncore/event.h +++ b/ioncore/event.h @@ -1,7 +1,7 @@ /* * ion/ioncore/event.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/eventh.c b/ioncore/eventh.c index bba225c..011093b 100644 --- a/ioncore/eventh.c +++ b/ioncore/eventh.c @@ -1,7 +1,7 @@ /* * ion/ioncore/eventh.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/eventh.h b/ioncore/eventh.h index 67d4e30..af10eb2 100644 --- a/ioncore/eventh.h +++ b/ioncore/eventh.h @@ -1,7 +1,7 @@ /* * ion/ioncore/eventh.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/exec.c b/ioncore/exec.c index 32771a0..bd43fe8 100644 --- a/ioncore/exec.c +++ b/ioncore/exec.c @@ -1,7 +1,7 @@ /* * ion/ioncore/exec.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/exec.h b/ioncore/exec.h index e5802fc..39e0c68 100644 --- a/ioncore/exec.h +++ b/ioncore/exec.h @@ -1,7 +1,7 @@ /* * ion/ioncore/exec.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/extlconv.c b/ioncore/extlconv.c index b0a2bb8..8f36173 100644 --- a/ioncore/extlconv.c +++ b/ioncore/extlconv.c @@ -1,7 +1,7 @@ /* * ion/ioncore/extlconv.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/extlconv.h b/ioncore/extlconv.h index 9e4cd53..d56f9dc 100644 --- a/ioncore/extlconv.h +++ b/ioncore/extlconv.h @@ -1,7 +1,7 @@ /* * ion/ioncore/extlconv.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/extlrx.c b/ioncore/extlrx.c index 50c2acb..155a325 100644 --- a/ioncore/extlrx.c +++ b/ioncore/extlrx.c @@ -1,7 +1,7 @@ /* * ion/ioncore/extlrx.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/float-placement.c b/ioncore/float-placement.c index 2fae298..f36b30f 100644 --- a/ioncore/float-placement.c +++ b/ioncore/float-placement.c @@ -1,7 +1,7 @@ /* * ion/ioncore/float-placement.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/float-placement.h b/ioncore/float-placement.h index 4c8db43..ebde2cf 100644 --- a/ioncore/float-placement.h +++ b/ioncore/float-placement.h @@ -1,7 +1,7 @@ /* * ion/ioncore/float-placement.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/focus.c b/ioncore/focus.c index baada3e..bbba50d 100644 --- a/ioncore/focus.c +++ b/ioncore/focus.c @@ -1,7 +1,7 @@ /* * ion/ioncore/focus.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/focus.h b/ioncore/focus.h index fe0b120..5c702e8 100644 --- a/ioncore/focus.h +++ b/ioncore/focus.h @@ -1,7 +1,7 @@ /* * ion/ioncore/focus.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/frame-draw.c b/ioncore/frame-draw.c index 8591f2a..0037584 100644 --- a/ioncore/frame-draw.c +++ b/ioncore/frame-draw.c @@ -1,7 +1,7 @@ /* * ion/ioncore/frame-draw.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/frame-draw.h b/ioncore/frame-draw.h index 0acc21d..6b8d7d3 100644 --- a/ioncore/frame-draw.h +++ b/ioncore/frame-draw.h @@ -1,7 +1,7 @@ /* * ion/ioncore/frame-draw.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/frame-pointer.c b/ioncore/frame-pointer.c index 79f6865..7b4d8fa 100644 --- a/ioncore/frame-pointer.c +++ b/ioncore/frame-pointer.c @@ -1,7 +1,7 @@ /* * ion/ioncore/frame-pointer.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/frame-pointer.h b/ioncore/frame-pointer.h index 90ba94e..df31c63 100644 --- a/ioncore/frame-pointer.h +++ b/ioncore/frame-pointer.h @@ -1,7 +1,7 @@ /* * ion/ioncore/frame-pointer.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/frame.c b/ioncore/frame.c index ee666bc..cc9903f 100644 --- a/ioncore/frame.c +++ b/ioncore/frame.c @@ -1,7 +1,7 @@ /* * ion/ioncore/frame.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/frame.h b/ioncore/frame.h index 7d5da74..33d846e 100644 --- a/ioncore/frame.h +++ b/ioncore/frame.h @@ -1,7 +1,7 @@ /* * ion/ioncore/frame.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/framedpholder.c b/ioncore/framedpholder.c index a2cd2c5..4597eec 100644 --- a/ioncore/framedpholder.c +++ b/ioncore/framedpholder.c @@ -1,7 +1,7 @@ /* * ion/ioncore/framedpholder.c * - * Copyright (c) Tuomo Valkonen 2005-2007. + * Copyright (c) Tuomo Valkonen 2005-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/framedpholder.h b/ioncore/framedpholder.h index 43032b7..fc25ee3 100644 --- a/ioncore/framedpholder.h +++ b/ioncore/framedpholder.h @@ -1,7 +1,7 @@ /* * ion/ioncore/framedpholder.h * - * Copyright (c) Tuomo Valkonen 2005-2007. + * Copyright (c) Tuomo Valkonen 2005-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/framep.h b/ioncore/framep.h index b614abe..41c1efd 100644 --- a/ioncore/framep.h +++ b/ioncore/framep.h @@ -1,7 +1,7 @@ /* * ion/ioncore/framep.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/fullscreen.c b/ioncore/fullscreen.c index 5279747..2ddf985 100644 --- a/ioncore/fullscreen.c +++ b/ioncore/fullscreen.c @@ -1,7 +1,7 @@ /* * ion/ioncore/fullscreen.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/fullscreen.h b/ioncore/fullscreen.h index fe58fc0..4d70aff 100644 --- a/ioncore/fullscreen.h +++ b/ioncore/fullscreen.h @@ -1,7 +1,7 @@ /* * ion/ioncore/fullscreen.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/global.h b/ioncore/global.h index c6ae9a7..8039f5f 100644 --- a/ioncore/global.h +++ b/ioncore/global.h @@ -1,7 +1,7 @@ /* * ion/ioncore/global.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/gr-util.h b/ioncore/gr-util.h index 1e90e38..f30f33a 100644 --- a/ioncore/gr-util.h +++ b/ioncore/gr-util.h @@ -1,7 +1,7 @@ /* * ion/ioncore/gr-util.h * - * Copyright (c) Tuomo Valkonen 2007. + * Copyright (c) Tuomo Valkonen 2007-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/gr.c b/ioncore/gr.c index 835c7ca..794f1f7 100644 --- a/ioncore/gr.c +++ b/ioncore/gr.c @@ -1,7 +1,7 @@ /* * ion/ioncore/gr.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/gr.h b/ioncore/gr.h index b42c663..516b6e3 100644 --- a/ioncore/gr.h +++ b/ioncore/gr.h @@ -1,7 +1,7 @@ /* * ion/ioncore/gr.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/grab.c b/ioncore/grab.c index 5af822c..c65f288 100644 --- a/ioncore/grab.c +++ b/ioncore/grab.c @@ -2,7 +2,7 @@ * ion/ioncore/grab.c * * Copyright (c) Lukas Schroeder 2002, - * Tuomo Valkonen 2003-2007. + * Tuomo Valkonen 2003-2008. * * See the included file LICENSE for details. * diff --git a/ioncore/grab.h b/ioncore/grab.h index d579984..98f4586 100644 --- a/ioncore/grab.h +++ b/ioncore/grab.h @@ -2,7 +2,7 @@ * ion/ioncore/grab.h * * Copyright (c) Lukas Schroeder 2002, - * Tuomo Valkonen 2003-2007. + * Tuomo Valkonen 2003-2008. * * See the included file LICENSE for details. * diff --git a/ioncore/group-cw.c b/ioncore/group-cw.c index d5b7396..48f234a 100644 --- a/ioncore/group-cw.c +++ b/ioncore/group-cw.c @@ -1,7 +1,7 @@ /* * ion/ioncore/group-cw.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/group-cw.h b/ioncore/group-cw.h index 37d96e2..d5f5afe 100644 --- a/ioncore/group-cw.h +++ b/ioncore/group-cw.h @@ -1,7 +1,7 @@ /* * ion/ioncore/group-cw.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/group-ws.c b/ioncore/group-ws.c index c12d8ec..d122a6d 100644 --- a/ioncore/group-ws.c +++ b/ioncore/group-ws.c @@ -1,7 +1,7 @@ /* * ion/ioncore/group-ws.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/group-ws.h b/ioncore/group-ws.h index e5a2613..e385e28 100644 --- a/ioncore/group-ws.h +++ b/ioncore/group-ws.h @@ -1,7 +1,7 @@ /* * ion/ioncore/groupws.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/group.c b/ioncore/group.c index 886913f..21db4bb 100644 --- a/ioncore/group.c +++ b/ioncore/group.c @@ -1,7 +1,7 @@ /* * ion/ioncore/group.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/group.h b/ioncore/group.h index d09ba9f..d822711 100644 --- a/ioncore/group.h +++ b/ioncore/group.h @@ -1,7 +1,7 @@ /* * ion/ioncore/group.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/grouppholder.c b/ioncore/grouppholder.c index afd8ac6..39ff6fc 100644 --- a/ioncore/grouppholder.c +++ b/ioncore/grouppholder.c @@ -1,7 +1,7 @@ /* * ion/ioncore/grouppholder.c * - * Copyright (c) Tuomo Valkonen 2005-2007. + * Copyright (c) Tuomo Valkonen 2005-2008. * * See the included file LICENSE for details. */ @@ -274,18 +274,21 @@ WRegion *grouppholder_do_attach(WGroupPHolder *ph, int flags, bool grouppholder_do_goto(WGroupPHolder *ph) { - WGroup *ws=ph->group; - - if(ws!=NULL) - return region_goto((WRegion*)ws); - - return FALSE; + return (ph->group!=NULL + ? region_goto((WRegion*)ph->group) + : (ph->recreate_pholder!=NULL + ? pholder_do_goto(ph->recreate_pholder) + : FALSE)); } WRegion *grouppholder_do_target(WGroupPHolder *ph) { - return (WRegion*)ph->group; + return (ph->group!=NULL + ? (WRegion*)ph->group + : (ph->recreate_pholder!=NULL + ? pholder_do_target(ph->recreate_pholder) + : NULL)); } diff --git a/ioncore/grouppholder.h b/ioncore/grouppholder.h index c829537..5c8ca19 100644 --- a/ioncore/grouppholder.h +++ b/ioncore/grouppholder.h @@ -1,7 +1,7 @@ /* * ion/ioncore/grouppholder.h * - * Copyright (c) Tuomo Valkonen 2005-2007. + * Copyright (c) Tuomo Valkonen 2005-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/infowin.c b/ioncore/infowin.c index 791cae0..5dd0b28 100644 --- a/ioncore/infowin.c +++ b/ioncore/infowin.c @@ -1,7 +1,7 @@ /* * ion/ioncore/infowin.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/infowin.h b/ioncore/infowin.h index 26f2ef9..5019d78 100644 --- a/ioncore/infowin.h +++ b/ioncore/infowin.h @@ -1,7 +1,7 @@ /* * ion/ioncore/infowin.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/ioncore.c b/ioncore/ioncore.c index 8974780..cef62df 100644 --- a/ioncore/ioncore.c +++ b/ioncore/ioncore.c @@ -1,7 +1,7 @@ /* * ion/ioncore/ioncore.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ @@ -73,7 +73,7 @@ WGlobal ioncore_g; static const char *progname="ion"; static const char ioncore_copy[]= - "Ion " ION_VERSION ", copyright (c) Tuomo Valkonen 1999-2007."; + "Ion " ION_VERSION ", copyright (c) Tuomo Valkonen 1999-2008."; static const char ioncore_license[]=DUMMY_TR( "This software is licensed under the GNU Lesser General Public License\n" diff --git a/ioncore/ioncore.h b/ioncore/ioncore.h index d443631..7193c08 100644 --- a/ioncore/ioncore.h +++ b/ioncore/ioncore.h @@ -1,7 +1,7 @@ /* * ion/ioncore/focus.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/ioncore_bindings.lua b/ioncore/ioncore_bindings.lua index 6aaf834..a3da00c 100644 --- a/ioncore/ioncore_bindings.lua +++ b/ioncore/ioncore_bindings.lua @@ -1,7 +1,7 @@ -- -- ion/share/ioncore-bindings.lua -- --- Copyright (c) Tuomo Valkonen 2004-2007. +-- Copyright (c) Tuomo Valkonen 2004-2008. -- -- See the included file LICENSE for details. -- diff --git a/ioncore/ioncore_efbb.lua b/ioncore/ioncore_efbb.lua index 982f2d6..f26cdc3 100644 --- a/ioncore/ioncore_efbb.lua +++ b/ioncore/ioncore_efbb.lua @@ -1,7 +1,7 @@ -- -- ion/share/ioncore_efbb.lua -- Minimal emergency fallback bindings. -- --- Copyright (c) Tuomo Valkonen 2004-2007. +-- Copyright (c) Tuomo Valkonen 2004-2008. -- -- See the included file LICENSE for details. -- diff --git a/ioncore/ioncore_ext.lua b/ioncore/ioncore_ext.lua index 8f1bfab..88828d1 100644 --- a/ioncore/ioncore_ext.lua +++ b/ioncore/ioncore_ext.lua @@ -1,7 +1,7 @@ -- -- ion/share/ioncore_ext.lua -- Ioncore Lua library -- --- Copyright (c) Tuomo Valkonen 2004-2007. +-- Copyright (c) Tuomo Valkonen 2004-2008. -- -- See the included file LICENSE for details. -- diff --git a/ioncore/ioncore_luaext.lua b/ioncore/ioncore_luaext.lua index c8e94f4..74d3880 100644 --- a/ioncore/ioncore_luaext.lua +++ b/ioncore/ioncore_luaext.lua @@ -1,7 +1,7 @@ -- -- ion/share/ioncore_luaext.lua -- --- Copyright (c) Tuomo Valkonen 2004-2007. +-- Copyright (c) Tuomo Valkonen 2004-2008. -- -- See the included file LICENSE for details. -- diff --git a/ioncore/ioncore_menudb.lua b/ioncore/ioncore_menudb.lua index 0248b14..fdb0e42 100644 --- a/ioncore/ioncore_menudb.lua +++ b/ioncore/ioncore_menudb.lua @@ -1,7 +1,7 @@ -- -- ion/ioncore/ioncore_menudb.lua -- Routines for defining menus. -- --- Copyright (c) Tuomo Valkonen 2004-2007. +-- Copyright (c) Tuomo Valkonen 2004-2008. -- -- See the included file LICENSE for details. -- diff --git a/ioncore/ioncore_misc.lua b/ioncore/ioncore_misc.lua index a392c53..dde914e 100644 --- a/ioncore/ioncore_misc.lua +++ b/ioncore/ioncore_misc.lua @@ -1,7 +1,7 @@ -- -- ion/share/ioncore_misc.lua -- --- Copyright (c) Tuomo Valkonen 2004-2007. +-- Copyright (c) Tuomo Valkonen 2004-2008. -- -- See the included file LICENSE for details. -- diff --git a/ioncore/ioncore_quasiact.lua b/ioncore/ioncore_quasiact.lua index ce4116d..1374996 100644 --- a/ioncore/ioncore_quasiact.lua +++ b/ioncore/ioncore_quasiact.lua @@ -1,7 +1,7 @@ -- -- ion/share/ioncore_quasiact.lua -- Frame quasiactivation support -- --- Copyright (c) Tuomo Valkonen 2007. +-- Copyright (c) Tuomo Valkonen 2007-2008. -- -- See the included file LICENSE for details. -- diff --git a/ioncore/ioncore_tabnum.lua b/ioncore/ioncore_tabnum.lua index 551dfaf..2a3cbad 100644 --- a/ioncore/ioncore_tabnum.lua +++ b/ioncore/ioncore_tabnum.lua @@ -1,7 +1,7 @@ -- -- ion/share/ioncore_tabnum.lua -- Ioncore tab numbering support -- --- Copyright (c) Tuomo Valkonen 2007. +-- Copyright (c) Tuomo Valkonen 2007-2008. -- -- See the included file LICENSE for details. -- diff --git a/ioncore/ioncore_wd.lua b/ioncore/ioncore_wd.lua index c0b42e5..48bc7fc 100644 --- a/ioncore/ioncore_wd.lua +++ b/ioncore/ioncore_wd.lua @@ -1,7 +1,7 @@ -- -- ion/share/ioncore_wd.lua -- --- Copyright (c) Tuomo Valkonen 2004-2007. +-- Copyright (c) Tuomo Valkonen 2004-2008. -- -- See the included file LICENSE for details. -- diff --git a/ioncore/ioncore_winprops.lua b/ioncore/ioncore_winprops.lua index cae9c63..7497356 100644 --- a/ioncore/ioncore_winprops.lua +++ b/ioncore/ioncore_winprops.lua @@ -1,7 +1,7 @@ -- -- ion/share/ioncore_winprops.lua -- --- Copyright (c) Tuomo Valkonen 2004-2007. +-- Copyright (c) Tuomo Valkonen 2004-2008. -- -- See the included file LICENSE for details. -- diff --git a/ioncore/kbresize.c b/ioncore/kbresize.c index 636ac1d..7fe00c3 100644 --- a/ioncore/kbresize.c +++ b/ioncore/kbresize.c @@ -1,7 +1,7 @@ /* * ion/ioncore/kbresize.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/kbresize.h b/ioncore/kbresize.h index b4ac87a..f05857f 100644 --- a/ioncore/kbresize.h +++ b/ioncore/kbresize.h @@ -1,7 +1,7 @@ /* * ion/ioncore/kbresize.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/key.c b/ioncore/key.c index ad7d179..5238383 100644 --- a/ioncore/key.c +++ b/ioncore/key.c @@ -1,7 +1,7 @@ /* * ion/ioncore/key.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/key.h b/ioncore/key.h index 059ca5d..614186e 100644 --- a/ioncore/key.h +++ b/ioncore/key.h @@ -1,7 +1,7 @@ /* * ion/ioncore/key.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/llist.c b/ioncore/llist.c index ecee912..f9cc92d 100644 --- a/ioncore/llist.c +++ b/ioncore/llist.c @@ -1,7 +1,7 @@ /* * ion/ioncore/llist.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/llist.h b/ioncore/llist.h index ebe71f8..d3807a9 100644 --- a/ioncore/llist.h +++ b/ioncore/llist.h @@ -1,7 +1,7 @@ /* * ion/ioncore/llist.h * - * Copyright (c) Tuomo Valkonen 2005-2007. + * Copyright (c) Tuomo Valkonen 2005-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/manage.c b/ioncore/manage.c index f1b04c6..52cd0b8 100644 --- a/ioncore/manage.c +++ b/ioncore/manage.c @@ -1,7 +1,7 @@ /* * ion/ioncore/manage.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/manage.h b/ioncore/manage.h index f745d66..3db5a1f 100644 --- a/ioncore/manage.h +++ b/ioncore/manage.h @@ -1,7 +1,7 @@ /* * ion/ioncore/manage.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/modules.c b/ioncore/modules.c index b49f95c..10e1c29 100644 --- a/ioncore/modules.c +++ b/ioncore/modules.c @@ -1,7 +1,7 @@ /* * ion/ioncore/modules.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/modules.h b/ioncore/modules.h index e73e108..ac9edfd 100644 --- a/ioncore/modules.h +++ b/ioncore/modules.h @@ -1,7 +1,7 @@ /* * ion/ioncore/modules.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/mplex.c b/ioncore/mplex.c index 8af9148..53b6952 100644 --- a/ioncore/mplex.c +++ b/ioncore/mplex.c @@ -1,7 +1,7 @@ /* * ion/ioncore/mplex.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/mplex.h b/ioncore/mplex.h index aced27f..7b72b31 100644 --- a/ioncore/mplex.h +++ b/ioncore/mplex.h @@ -1,7 +1,7 @@ /* * ion/ioncore/mplex.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/mplexpholder.c b/ioncore/mplexpholder.c index 3cbf5fd..712cfba 100644 --- a/ioncore/mplexpholder.c +++ b/ioncore/mplexpholder.c @@ -1,7 +1,7 @@ /* * ion/ioncore/mplexpholder.c * - * Copyright (c) Tuomo Valkonen 2005-2007. + * Copyright (c) Tuomo Valkonen 2005-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/mplexpholder.h b/ioncore/mplexpholder.h index aee4678..6806408 100644 --- a/ioncore/mplexpholder.h +++ b/ioncore/mplexpholder.h @@ -1,7 +1,7 @@ /* * ion/ioncore/mplexpholder.h * - * Copyright (c) Tuomo Valkonen 2005-2007. + * Copyright (c) Tuomo Valkonen 2005-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/mwmhints.c b/ioncore/mwmhints.c index a2bb33d..445a1f0 100644 --- a/ioncore/mwmhints.c +++ b/ioncore/mwmhints.c @@ -1,7 +1,7 @@ /* * ion/ioncore/mwmhints.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/mwmhints.h b/ioncore/mwmhints.h index 9a64eb3..35e7355 100644 --- a/ioncore/mwmhints.h +++ b/ioncore/mwmhints.h @@ -1,7 +1,7 @@ /* * ion/ioncore/mwmhints.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/names.c b/ioncore/names.c index ce4d2ae..b114e10 100644 --- a/ioncore/names.c +++ b/ioncore/names.c @@ -1,7 +1,7 @@ /* * ion/ioncore/names.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/names.h b/ioncore/names.h index b35bc60..d579ac9 100644 --- a/ioncore/names.h +++ b/ioncore/names.h @@ -1,7 +1,7 @@ /* * ion/ioncore/names.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/navi.c b/ioncore/navi.c index 3ce27d3..527d894 100644 --- a/ioncore/navi.c +++ b/ioncore/navi.c @@ -1,7 +1,7 @@ /* * ion/ioncore/navi.c * - * Copyright (c) Tuomo Valkonen 2006-2007. + * Copyright (c) Tuomo Valkonen 2006-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/navi.h b/ioncore/navi.h index c86a3a4..6f88e60 100644 --- a/ioncore/navi.h +++ b/ioncore/navi.h @@ -1,7 +1,7 @@ /* * ion/ioncore/navi.h * - * Copyright (c) Tuomo Valkonen 2006-2007. + * Copyright (c) Tuomo Valkonen 2006-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/netwm.c b/ioncore/netwm.c index 07e1dee..202af7b 100644 --- a/ioncore/netwm.c +++ b/ioncore/netwm.c @@ -1,7 +1,7 @@ /* * ion/ioncore/netwm.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/netwm.h b/ioncore/netwm.h index 1203e23..db0e6f8 100644 --- a/ioncore/netwm.h +++ b/ioncore/netwm.h @@ -1,7 +1,7 @@ /* * ion/ioncore/netwm.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/pholder.c b/ioncore/pholder.c index 45c5d0b..d702b16 100644 --- a/ioncore/pholder.c +++ b/ioncore/pholder.c @@ -1,7 +1,7 @@ /* * ion/ioncore/pholder.c * - * Copyright (c) Tuomo Valkonen 2005-2007. + * Copyright (c) Tuomo Valkonen 2005-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/pholder.h b/ioncore/pholder.h index 4d07f16..8b8df7e 100644 --- a/ioncore/pholder.h +++ b/ioncore/pholder.h @@ -1,7 +1,7 @@ /* * ion/ioncore/pholder.h * - * Copyright (c) Tuomo Valkonen 2005-2007. + * Copyright (c) Tuomo Valkonen 2005-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/pointer.c b/ioncore/pointer.c index f4fae71..51bcf9f 100644 --- a/ioncore/pointer.c +++ b/ioncore/pointer.c @@ -1,7 +1,7 @@ /* * ion/ioncore/pointer.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/pointer.h b/ioncore/pointer.h index cd1a62b..7a5b147 100644 --- a/ioncore/pointer.h +++ b/ioncore/pointer.h @@ -1,7 +1,7 @@ /* * ion/ioncore/pointer.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/presize.c b/ioncore/presize.c index fb121d9..07dd5c2 100644 --- a/ioncore/presize.c +++ b/ioncore/presize.c @@ -1,7 +1,7 @@ /* * ion/ioncore/presize.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/presize.h b/ioncore/presize.h index 79133ed..5a52e9d 100644 --- a/ioncore/presize.h +++ b/ioncore/presize.h @@ -1,7 +1,7 @@ /* * ion/ioncore/presize.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/property.c b/ioncore/property.c index 84aad61..a8029d2 100644 --- a/ioncore/property.c +++ b/ioncore/property.c @@ -1,7 +1,7 @@ /* * ion/ioncore/property.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/property.h b/ioncore/property.h index aeb8182..19f180c 100644 --- a/ioncore/property.h +++ b/ioncore/property.h @@ -1,7 +1,7 @@ /* * ion/ioncore/property.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/rectangle.c b/ioncore/rectangle.c index 3096cd9..8e84512 100644 --- a/ioncore/rectangle.c +++ b/ioncore/rectangle.c @@ -1,7 +1,7 @@ /* * ion/ioncore/rectangle.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/rectangle.h b/ioncore/rectangle.h index fa0a2b2..19e8c11 100644 --- a/ioncore/rectangle.h +++ b/ioncore/rectangle.h @@ -1,7 +1,7 @@ /* * ion/ioncore/rectangle.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/regbind.c b/ioncore/regbind.c index 68ef792..765d1a8 100644 --- a/ioncore/regbind.c +++ b/ioncore/regbind.c @@ -1,7 +1,7 @@ /* * ion/regbind.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/regbind.h b/ioncore/regbind.h index adf78ff..8ec8b8c 100644 --- a/ioncore/regbind.h +++ b/ioncore/regbind.h @@ -1,7 +1,7 @@ /* * ion/ioncore/regbind.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/reginfo.c b/ioncore/reginfo.c index 41fc8d6..0a69f78 100644 --- a/ioncore/reginfo.c +++ b/ioncore/reginfo.c @@ -1,7 +1,7 @@ /* * ion/ioncore/reginfo.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/reginfo.h b/ioncore/reginfo.h index 6e5ffb5..29d2d51 100644 --- a/ioncore/reginfo.h +++ b/ioncore/reginfo.h @@ -1,7 +1,7 @@ /* * ion/ioncore/reginfo.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/region-iter.h b/ioncore/region-iter.h index f012d23..ce25e81 100644 --- a/ioncore/region-iter.h +++ b/ioncore/region-iter.h @@ -1,7 +1,7 @@ /* * ion/ioncore/region-iter.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/region.c b/ioncore/region.c index 2a8e9fe..261d654 100644 --- a/ioncore/region.c +++ b/ioncore/region.c @@ -1,7 +1,7 @@ /* * ion/ioncore/region.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/region.h b/ioncore/region.h index 82483ad..950de9d 100644 --- a/ioncore/region.h +++ b/ioncore/region.h @@ -1,7 +1,7 @@ /* * ion/ioncore/region.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/resize.c b/ioncore/resize.c index 1592f00..0da668d 100644 --- a/ioncore/resize.c +++ b/ioncore/resize.c @@ -1,7 +1,7 @@ /* * ion/ioncore/resize.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/resize.h b/ioncore/resize.h index 2c69ed9..7b71bd5 100644 --- a/ioncore/resize.h +++ b/ioncore/resize.h @@ -1,7 +1,7 @@ /* * ion/ioncore/resize.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/return.c b/ioncore/return.c index 9ebabc5..be2d367 100644 --- a/ioncore/return.c +++ b/ioncore/return.c @@ -1,7 +1,7 @@ /* * ion/ioncore/return.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/return.h b/ioncore/return.h index 0d20b92..a88bac5 100644 --- a/ioncore/return.h +++ b/ioncore/return.h @@ -1,7 +1,7 @@ /* * ion/ioncore/return.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/rootwin.c b/ioncore/rootwin.c index f9b6905..1468302 100644 --- a/ioncore/rootwin.c +++ b/ioncore/rootwin.c @@ -1,7 +1,7 @@ /* * ion/ioncore/rootwin.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/rootwin.h b/ioncore/rootwin.h index 8e8bf7d..41aab4e 100644 --- a/ioncore/rootwin.h +++ b/ioncore/rootwin.h @@ -1,7 +1,7 @@ /* * ion/ioncore/rootwin.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/saveload.c b/ioncore/saveload.c index c76c68e..71ddb9d 100644 --- a/ioncore/saveload.c +++ b/ioncore/saveload.c @@ -1,7 +1,7 @@ /* * ion/ioncore/saveload.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/saveload.h b/ioncore/saveload.h index 587dfbf..049b2c0 100644 --- a/ioncore/saveload.h +++ b/ioncore/saveload.h @@ -1,7 +1,7 @@ /* * ion/ioncore/saveload.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/screen-notify.c b/ioncore/screen-notify.c index 30e0c97..522a0a5 100644 --- a/ioncore/screen-notify.c +++ b/ioncore/screen-notify.c @@ -1,7 +1,7 @@ /* * ion/ioncore/screen-notify.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/screen-notify.h b/ioncore/screen-notify.h index a7b37b8..bbaac26 100644 --- a/ioncore/screen-notify.h +++ b/ioncore/screen-notify.h @@ -1,7 +1,7 @@ /* * ion/ioncore/screen-notify.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/screen.c b/ioncore/screen.c index 8d59d12..8aafadb 100644 --- a/ioncore/screen.c +++ b/ioncore/screen.c @@ -1,7 +1,7 @@ /* * ion/ioncore/screen.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/screen.h b/ioncore/screen.h index 743a134..52752cc 100644 --- a/ioncore/screen.h +++ b/ioncore/screen.h @@ -1,7 +1,7 @@ /* * ion/ioncore/screen.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/selection.c b/ioncore/selection.c index c93742a..1e99ed9 100644 --- a/ioncore/selection.c +++ b/ioncore/selection.c @@ -1,7 +1,7 @@ /* * ion/ioncore/selection.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/selection.h b/ioncore/selection.h index fc2437a..4ae022a 100644 --- a/ioncore/selection.h +++ b/ioncore/selection.h @@ -1,7 +1,7 @@ /* * ion/ioncore/selection.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/sizehint.c b/ioncore/sizehint.c index 0dc0702..d346946 100644 --- a/ioncore/sizehint.c +++ b/ioncore/sizehint.c @@ -1,7 +1,7 @@ /* * ion/ioncore/sizehint.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/sizehint.h b/ioncore/sizehint.h index 55f3f29..078b873 100644 --- a/ioncore/sizehint.h +++ b/ioncore/sizehint.h @@ -1,7 +1,7 @@ /* * ion/ioncore/sizehint.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/sizepolicy.c b/ioncore/sizepolicy.c index e2cb4de..8801df7 100644 --- a/ioncore/sizepolicy.c +++ b/ioncore/sizepolicy.c @@ -1,7 +1,7 @@ /* * ion/ioncore/sizepolicy.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/sizepolicy.h b/ioncore/sizepolicy.h index a0aa1e3..4e7ff54 100644 --- a/ioncore/sizepolicy.h +++ b/ioncore/sizepolicy.h @@ -1,7 +1,7 @@ /* * ion/ioncore/sizepolicy.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/stacking.c b/ioncore/stacking.c index 296e054..3749115 100644 --- a/ioncore/stacking.c +++ b/ioncore/stacking.c @@ -1,7 +1,7 @@ /* * ion/ioncore/stacking.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/stacking.h b/ioncore/stacking.h index c08484e..e8c9638 100644 --- a/ioncore/stacking.h +++ b/ioncore/stacking.h @@ -1,7 +1,7 @@ /* * ion/ioncore/stacking.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/strings.c b/ioncore/strings.c index eb7e408..15ebde1 100644 --- a/ioncore/strings.c +++ b/ioncore/strings.c @@ -1,7 +1,7 @@ /* * ion/ioncore/strings.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/strings.h b/ioncore/strings.h index e285085..915c88b 100644 --- a/ioncore/strings.h +++ b/ioncore/strings.h @@ -1,7 +1,7 @@ /* * ion/ioncore/strings.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/tags.c b/ioncore/tags.c index 2343e9d..b905483 100644 --- a/ioncore/tags.c +++ b/ioncore/tags.c @@ -1,7 +1,7 @@ /* * ion/ioncore/tags.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/tags.h b/ioncore/tags.h index 43a9b1f..1f7da32 100644 --- a/ioncore/tags.h +++ b/ioncore/tags.h @@ -1,7 +1,7 @@ /* * ion/ioncore/tags.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/window.c b/ioncore/window.c index 3de0eef..3018467 100644 --- a/ioncore/window.c +++ b/ioncore/window.c @@ -1,7 +1,7 @@ /* * ion/ioncore/window.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/window.h b/ioncore/window.h index b605485..48fc192 100644 --- a/ioncore/window.h +++ b/ioncore/window.h @@ -1,7 +1,7 @@ /* * ion/ioncore/window.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/xic.c b/ioncore/xic.c index 2fe2238..df659ab 100644 --- a/ioncore/xic.c +++ b/ioncore/xic.c @@ -1,7 +1,7 @@ /* * ion/ioncore/xic.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/xic.h b/ioncore/xic.h index 1e935ac..fe3bd7e 100644 --- a/ioncore/xic.h +++ b/ioncore/xic.h @@ -1,7 +1,7 @@ /* * ion/ioncore/xic.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/xwindow.c b/ioncore/xwindow.c index b9cd1aa..fec8e4c 100644 --- a/ioncore/xwindow.c +++ b/ioncore/xwindow.c @@ -1,7 +1,7 @@ /* * ion/ioncore/xwindow.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/ioncore/xwindow.h b/ioncore/xwindow.h index 2e37fc6..cb37695 100644 --- a/ioncore/xwindow.h +++ b/ioncore/xwindow.h @@ -1,7 +1,7 @@ /* * ion/ioncore/xwindow.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/libmainloop/defer.c b/libmainloop/defer.c index 3153955..90e02af 100644 --- a/libmainloop/defer.c +++ b/libmainloop/defer.c @@ -1,7 +1,7 @@ /* * ion/libmainloop/defer.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/libmainloop/defer.h b/libmainloop/defer.h index 90f77a2..9e93e40 100644 --- a/libmainloop/defer.h +++ b/libmainloop/defer.h @@ -1,7 +1,7 @@ /* * ion/libmainloop/defer.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/libmainloop/exec.c b/libmainloop/exec.c index fd6ef6b..a2d853b 100644 --- a/libmainloop/exec.c +++ b/libmainloop/exec.c @@ -1,7 +1,7 @@ /* * ion/mainloop/exec.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/libmainloop/exec.h b/libmainloop/exec.h index d9a87e7..5947b9a 100644 --- a/libmainloop/exec.h +++ b/libmainloop/exec.h @@ -1,7 +1,7 @@ /* * ion/libmainloop/exec.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/libmainloop/hooks.c b/libmainloop/hooks.c index d2d2127..4a3a9f7 100644 --- a/libmainloop/hooks.c +++ b/libmainloop/hooks.c @@ -1,7 +1,7 @@ /* * ion/mainloop/hooks.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/libmainloop/hooks.h b/libmainloop/hooks.h index b9b3318..ecf5c8c 100644 --- a/libmainloop/hooks.h +++ b/libmainloop/hooks.h @@ -1,7 +1,7 @@ /* * ion/mainloop/hooks.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/libmainloop/signal.c b/libmainloop/signal.c index 37ee995..877e3ec 100644 --- a/libmainloop/signal.c +++ b/libmainloop/signal.c @@ -1,7 +1,7 @@ /* * ion/libmainloop/signal.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/libmainloop/signal.h b/libmainloop/signal.h index 3eaa2fe..72691dc 100644 --- a/libmainloop/signal.h +++ b/libmainloop/signal.h @@ -1,7 +1,7 @@ /* * ion/mainloop/signal.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/mod_dock/dock.c b/mod_dock/dock.c index 6da1a6f..6c0f421 100644 --- 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 - * Copyright (C) 2004-2007 Tuomo Valkonen + * Copyright (C) 2004-2008 Tuomo Valkonen * * by Tom Payne * based on code by Per Olofsson diff --git a/mod_menu/grabmenu.c b/mod_menu/grabmenu.c index 9192a95..5c44bed 100644 --- a/mod_menu/grabmenu.c +++ b/mod_menu/grabmenu.c @@ -1,7 +1,7 @@ /* * ion/mod_menu/grabmenu.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/mod_menu/main.c b/mod_menu/main.c index 6daa80f..19d8c3e 100644 --- a/mod_menu/main.c +++ b/mod_menu/main.c @@ -1,7 +1,7 @@ /* * ion/mod_menu/main.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/mod_menu/main.h b/mod_menu/main.h index 883cefb..b0befd7 100644 --- a/mod_menu/main.h +++ b/mod_menu/main.h @@ -1,7 +1,7 @@ /* * ion/mod_menu/main.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/mod_menu/menu.c b/mod_menu/menu.c index c87dc59..3114a72 100644 --- a/mod_menu/menu.c +++ b/mod_menu/menu.c @@ -1,7 +1,7 @@ /* * ion/mod_menu/menu.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/mod_menu/menu.h b/mod_menu/menu.h index 7ad247c..d596e33 100644 --- a/mod_menu/menu.h +++ b/mod_menu/menu.h @@ -1,7 +1,7 @@ /* * ion/mod_menu/menu.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/mod_menu/mkmenu.c b/mod_menu/mkmenu.c index 041e666..14d95e6 100644 --- a/mod_menu/mkmenu.c +++ b/mod_menu/mkmenu.c @@ -1,7 +1,7 @@ /* * ion/mod_menu/mkmenu.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/mod_menu/mkmenu.h b/mod_menu/mkmenu.h index 7a961c8..7c96839 100644 --- a/mod_menu/mkmenu.h +++ b/mod_menu/mkmenu.h @@ -1,7 +1,7 @@ /* * ion/mod_menu/mkmenu.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/mod_menu/mod_menu.lua b/mod_menu/mod_menu.lua index 368115b..d5078f7 100644 --- 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. -- --- Copyright (c) Tuomo Valkonen 2004-2007. +-- Copyright (c) Tuomo Valkonen 2004-2008. -- -- See the included file LICENSE for details. -- diff --git a/mod_query/complete.c b/mod_query/complete.c index a658037..90f2b5b 100644 --- a/mod_query/complete.c +++ b/mod_query/complete.c @@ -1,7 +1,7 @@ /* * ion/mod_query/complete.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/mod_query/complete.h b/mod_query/complete.h index 3386b18..95e8c70 100644 --- a/mod_query/complete.h +++ b/mod_query/complete.h @@ -1,7 +1,7 @@ /* * ion/mod_query/complete.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/mod_query/edln.c b/mod_query/edln.c index ca28b38..ade34c1 100644 --- a/mod_query/edln.c +++ b/mod_query/edln.c @@ -1,7 +1,7 @@ /* * ion/mod_query/edln.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/mod_query/edln.h b/mod_query/edln.h index 2d46535..6febfee 100644 --- a/mod_query/edln.h +++ b/mod_query/edln.h @@ -1,7 +1,7 @@ /* * ion/mod_query/edln.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/mod_query/fwarn.c b/mod_query/fwarn.c index 32eb497..0caf928 100644 --- a/mod_query/fwarn.c +++ b/mod_query/fwarn.c @@ -1,7 +1,7 @@ /* * ion/mod_query/query.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/mod_query/fwarn.h b/mod_query/fwarn.h index 9355286..25e17db 100644 --- a/mod_query/fwarn.h +++ b/mod_query/fwarn.h @@ -1,7 +1,7 @@ /* * ion/mod_query/fwarn.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/mod_query/history.c b/mod_query/history.c index 0501da7..dc32d72 100644 --- a/mod_query/history.c +++ b/mod_query/history.c @@ -1,7 +1,7 @@ /* * ion/mod_query/history.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/mod_query/history.h b/mod_query/history.h index ad98f90..541bb48 100644 --- a/mod_query/history.h +++ b/mod_query/history.h @@ -1,7 +1,7 @@ /* * ion/mod_query/history.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/mod_query/input.c b/mod_query/input.c index 53efd3c..9061002 100644 --- a/mod_query/input.c +++ b/mod_query/input.c @@ -1,7 +1,7 @@ /* * ion/mod_query/input.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/mod_query/input.h b/mod_query/input.h index e3d06e5..8e9eef2 100644 --- a/mod_query/input.h +++ b/mod_query/input.h @@ -1,7 +1,7 @@ /* * ion/mod_query/input.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/mod_query/inputp.h b/mod_query/inputp.h index 5366a1d..d2a3a4e 100644 --- a/mod_query/inputp.h +++ b/mod_query/inputp.h @@ -1,7 +1,7 @@ /* * ion/mod_query/inputp.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/mod_query/listing.c b/mod_query/listing.c index 598e656..21ffd4f 100644 --- a/mod_query/listing.c +++ b/mod_query/listing.c @@ -1,7 +1,7 @@ /* * ion/mod_query/listing.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/mod_query/listing.h b/mod_query/listing.h index b8eb288..831f804 100644 --- a/mod_query/listing.h +++ b/mod_query/listing.h @@ -1,7 +1,7 @@ /* * ion/mod_query/listing.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/mod_query/main.c b/mod_query/main.c index 2d46cd5..da04441 100644 --- a/mod_query/main.c +++ b/mod_query/main.c @@ -1,7 +1,7 @@ /* * ion/mod_query/main.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/mod_query/main.h b/mod_query/main.h index f09b765..92b81fe 100644 --- a/mod_query/main.h +++ b/mod_query/main.h @@ -1,7 +1,7 @@ /* * ion/mod_query/main.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/mod_query/mod_query.lua b/mod_query/mod_query.lua index f4913f3..d3ef7a0 100644 --- 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 -- --- Copyright (c) Tuomo Valkonen 2004-2007. +-- Copyright (c) Tuomo Valkonen 2004-2008. -- -- See the included file LICENSE for details. -- diff --git a/mod_query/mod_query_chdir.lua b/mod_query/mod_query_chdir.lua index 083cf50..c3eeb6a 100644 --- a/mod_query/mod_query_chdir.lua +++ b/mod_query/mod_query_chdir.lua @@ -1,7 +1,7 @@ -- -- ion/query/mod_query_chdir.lua -- --- Copyright (c) Tuomo Valkonen 2004-2007. +-- Copyright (c) Tuomo Valkonen 2004-2008. -- -- See the included file LICENSE for details. -- diff --git a/mod_query/query.c b/mod_query/query.c index 7585b02..8aadc40 100644 --- a/mod_query/query.c +++ b/mod_query/query.c @@ -1,7 +1,7 @@ /* * ion/mod_query/query.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/mod_query/query.h b/mod_query/query.h index bc23d2b..56237ae 100644 --- a/mod_query/query.h +++ b/mod_query/query.h @@ -1,7 +1,7 @@ /* * ion/mod_query/query.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/mod_query/wedln-wrappers.c b/mod_query/wedln-wrappers.c index ebb76dc..82ef6de 100644 --- a/mod_query/wedln-wrappers.c +++ b/mod_query/wedln-wrappers.c @@ -1,7 +1,7 @@ /* * ion/mod_query/wedln-wrappers.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/mod_query/wedln.c b/mod_query/wedln.c index 0567c14..5a6aecc 100644 --- a/mod_query/wedln.c +++ b/mod_query/wedln.c @@ -1,7 +1,7 @@ /* * ion/mod_query/wedln.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/mod_query/wedln.h b/mod_query/wedln.h index 9a72864..e20a7c9 100644 --- a/mod_query/wedln.h +++ b/mod_query/wedln.h @@ -1,7 +1,7 @@ /* * ion/mod_query/wedln.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/mod_query/wmessage.c b/mod_query/wmessage.c index f3dda0f..9c3d468 100644 --- a/mod_query/wmessage.c +++ b/mod_query/wmessage.c @@ -1,7 +1,7 @@ /* * ion/mod_query/wmessage.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/mod_query/wmessage.h b/mod_query/wmessage.h index 6e936a8..089b482 100644 --- a/mod_query/wmessage.h +++ b/mod_query/wmessage.h @@ -1,7 +1,7 @@ /* * ion/mod_query/wmessage.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/mod_sm/sm.c b/mod_sm/sm.c index 03de1c6..9451489 100644 --- a/mod_sm/sm.c +++ b/mod_sm/sm.c @@ -1,7 +1,7 @@ /* * ion/mod_sm/sm.c * - * Copyright (c) Tuomo Valkonen 2004-2007. + * Copyright (c) Tuomo Valkonen 2004-2008. * * See the included file LICENSE for details. */ diff --git a/mod_sm/sm_matchwin.c b/mod_sm/sm_matchwin.c index eb5b7a2..a26027e 100644 --- a/mod_sm/sm_matchwin.c +++ b/mod_sm/sm_matchwin.c @@ -1,7 +1,7 @@ /* * ion/mod_sm/sm_mathcwin.c * - * Copyright (c) Tuomo Valkonen 2004-2007. + * Copyright (c) Tuomo Valkonen 2004-2008. * * 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 def2a97..6e93945 100644 --- a/mod_sm/sm_matchwin.h +++ b/mod_sm/sm_matchwin.h @@ -1,7 +1,7 @@ /* * ion/mod_sm/sm_mathcwin.c * - * Copyright (c) Tuomo Valkonen 2004-2007. + * Copyright (c) Tuomo Valkonen 2004-2008. * * 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 a4373d0..52d6955 100644 --- a/mod_sm/sm_session.c +++ b/mod_sm/sm_session.c @@ -1,7 +1,7 @@ /* * ion/mod_sm/sm_session.c * - * Copyright (c) Tuomo Valkonen 2004-2007. + * Copyright (c) Tuomo Valkonen 2004-2008. * * 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 3fa3532..a4cc980 100644 --- a/mod_sm/sm_session.h +++ b/mod_sm/sm_session.h @@ -1,7 +1,7 @@ /* * ion/mod_sm/sm_session.h * - * Copyright (c) Tuomo Valkonen 2004-2007. + * Copyright (c) Tuomo Valkonen 2004-2008. * * 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 c94615b..ae5d7f9 100644 --- a/mod_sp/main.c +++ b/mod_sp/main.c @@ -1,7 +1,7 @@ /* * ion/mod_sp/main.c * - * Copyright (c) Tuomo Valkonen 2004-2007. + * Copyright (c) Tuomo Valkonen 2004-2008. * * See the included file LICENSE for details. */ diff --git a/mod_sp/main.h b/mod_sp/main.h index c08030f..6ed8d60 100644 --- a/mod_sp/main.h +++ b/mod_sp/main.h @@ -1,7 +1,7 @@ /* * ion/mod_sp/main.h * - * Copyright (c) Tuomo Valkonen 2004-2007. + * Copyright (c) Tuomo Valkonen 2004-2008. * * See the included file LICENSE for details. */ diff --git a/mod_statusbar/draw.c b/mod_statusbar/draw.c index 639295f..b466306 100644 --- a/mod_statusbar/draw.c +++ b/mod_statusbar/draw.c @@ -1,7 +1,7 @@ /* * ion/mod_statusbar/draw.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/mod_statusbar/draw.h b/mod_statusbar/draw.h index 2cda82b..19386b3 100644 --- a/mod_statusbar/draw.h +++ b/mod_statusbar/draw.h @@ -1,7 +1,7 @@ /* * ion/mod_statusbar/draw.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/mod_statusbar/main.c b/mod_statusbar/main.c index 4f95e2d..c54e17e 100644 --- a/mod_statusbar/main.c +++ b/mod_statusbar/main.c @@ -1,7 +1,7 @@ /* * ion/mod_statusbar/main.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/mod_statusbar/main.h b/mod_statusbar/main.h index 806adc9..90c3c3a 100644 --- a/mod_statusbar/main.h +++ b/mod_statusbar/main.h @@ -1,7 +1,7 @@ /* * ion/mod_statusbar/main.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/mod_statusbar/mod_statusbar.lua b/mod_statusbar/mod_statusbar.lua index b2bcbe7..c370082 100644 --- a/mod_statusbar/mod_statusbar.lua +++ b/mod_statusbar/mod_statusbar.lua @@ -1,7 +1,7 @@ -- -- ion/mod_statusbar/mod_statusbar.lua -- --- Copyright (c) Tuomo Valkonen 2004-2007. +-- Copyright (c) Tuomo Valkonen 2004-2008. -- -- See the included file LICENSE for details. -- diff --git a/mod_statusbar/statusbar.c b/mod_statusbar/statusbar.c index 838fd98..3f74100 100644 --- a/mod_statusbar/statusbar.c +++ b/mod_statusbar/statusbar.c @@ -1,7 +1,7 @@ /* * ion/mod_statusbar/statusbar.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/mod_statusbar/statusbar.h b/mod_statusbar/statusbar.h index 8c1cec0..9d33588 100644 --- a/mod_statusbar/statusbar.h +++ b/mod_statusbar/statusbar.h @@ -1,7 +1,7 @@ /* * ion/mod_statusbar/statusbar.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/mod_statusbar/statusd-launch.c b/mod_statusbar/statusd-launch.c index c07fa2f..1f597b2 100644 --- a/mod_statusbar/statusd-launch.c +++ b/mod_statusbar/statusd-launch.c @@ -1,7 +1,7 @@ /* * ion/mod_statusbar/statusd-launch.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/mod_tiling/main.c b/mod_tiling/main.c index 36c5e26..7a482dc 100644 --- a/mod_tiling/main.c +++ b/mod_tiling/main.c @@ -1,7 +1,7 @@ /* * ion/mod_tiling/main.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/mod_tiling/main.h b/mod_tiling/main.h index ade0cf5..5405ef0 100644 --- a/mod_tiling/main.h +++ b/mod_tiling/main.h @@ -1,7 +1,7 @@ /* * ion/mod_tiling/main.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/mod_tiling/mod_tiling.lua b/mod_tiling/mod_tiling.lua index 428c3f6..f8913b2 100644 --- 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 -- --- Copyright (c) Tuomo Valkonen 2004-2007. +-- Copyright (c) Tuomo Valkonen 2004-2008. -- -- 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 75570e0..4c57fbf 100644 --- a/mod_tiling/ops.c +++ b/mod_tiling/ops.c @@ -1,7 +1,7 @@ /* * ion/mod_tiling/ops.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/mod_tiling/panehandle.c b/mod_tiling/panehandle.c index fae133e..0420d96 100644 --- a/mod_tiling/panehandle.c +++ b/mod_tiling/panehandle.c @@ -1,7 +1,7 @@ /* * ion/mod_tiling/panehandle.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/mod_tiling/panehandle.h b/mod_tiling/panehandle.h index 8aa8b7c..5556c91 100644 --- a/mod_tiling/panehandle.h +++ b/mod_tiling/panehandle.h @@ -1,7 +1,7 @@ /* * ion/mod_tiling/panehandle.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/mod_tiling/placement.c b/mod_tiling/placement.c index 7e45806..3fda75d 100644 --- a/mod_tiling/placement.c +++ b/mod_tiling/placement.c @@ -1,7 +1,7 @@ /* * ion/mod_tiling/placement.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/mod_tiling/placement.h b/mod_tiling/placement.h index 9279cb7..18724a9 100644 --- a/mod_tiling/placement.h +++ b/mod_tiling/placement.h @@ -1,7 +1,7 @@ /* * ion/mod_tiling/placement.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/mod_tiling/split-stdisp.c b/mod_tiling/split-stdisp.c index ac6175c..9d2aabd 100644 --- a/mod_tiling/split-stdisp.c +++ b/mod_tiling/split-stdisp.c @@ -1,7 +1,7 @@ /* * ion/mod_tiling/split-stdisp.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/mod_tiling/split-stdisp.h b/mod_tiling/split-stdisp.h index b2b9159..d3bb00b 100644 --- a/mod_tiling/split-stdisp.h +++ b/mod_tiling/split-stdisp.h @@ -1,7 +1,7 @@ /* * ion/mod_tiling/split-stdisp.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/mod_tiling/split.c b/mod_tiling/split.c index c0a20b8..a179005 100644 --- a/mod_tiling/split.c +++ b/mod_tiling/split.c @@ -1,7 +1,7 @@ /* * ion/mod_tiling/split.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/mod_tiling/split.h b/mod_tiling/split.h index 332b92c..fedd179 100644 --- a/mod_tiling/split.h +++ b/mod_tiling/split.h @@ -1,7 +1,7 @@ /* * ion/mod_tiling/split.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/mod_tiling/splitfloat.c b/mod_tiling/splitfloat.c index bc1abb6..8c6683f 100644 --- a/mod_tiling/splitfloat.c +++ b/mod_tiling/splitfloat.c @@ -1,7 +1,7 @@ /* * ion/mod_tiling/splitext.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/mod_tiling/splitfloat.h b/mod_tiling/splitfloat.h index 270aed0..53544a6 100644 --- a/mod_tiling/splitfloat.h +++ b/mod_tiling/splitfloat.h @@ -1,7 +1,7 @@ /* * ion/mod_tiling/splitfloat.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/mod_tiling/tiling.c b/mod_tiling/tiling.c index 8d9346a..4040d82 100644 --- a/mod_tiling/tiling.c +++ b/mod_tiling/tiling.c @@ -1,7 +1,7 @@ /* * ion/mod_tiling/tiling.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/mod_tiling/tiling.h b/mod_tiling/tiling.h index 990dd55..129f267 100644 --- a/mod_tiling/tiling.h +++ b/mod_tiling/tiling.h @@ -1,7 +1,7 @@ /* * ion/mod_tiling/tiling.h * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ diff --git a/pwm/Makefile b/pwm/Makefile index 83f3100..2721bbf 100644 --- a/pwm/Makefile +++ b/pwm/Makefile @@ -33,17 +33,20 @@ SOURCES += preload.c TO_CLEAN += preload.c LIBS += -lSM -lICE else -LINKOPTS = $(EXPORT_DYNAMIC) +LDFLAGS += $(EXPORT_DYNAMIC) WHOLEA = -Wl,-whole-archive NO_WHOLEA = -Wl,-no-whole-archive endif +ifeq ($(RELOCATABLE),1) +DEFINES += -DCF_RELOCATABLE_PWM3_LOCATION=\"$(BINDIR)/pwm3\" +endif + EXT_OBJS += ../ioncore/ioncore.a DEFINES += -DETCDIR=\"$(ETCDIR)\" -DSHAREDIR=\"$(SHAREDIR)\" \ -DEXTRABINDIR=\"$(EXTRABINDIR)\" -DMODULEDIR=\"$(MODULEDIR)\" \ - -DLCDIR=\"$(LCDIR)\" -DLOCALEDIR=\"$(LOCALEDIR)\" \ - -DPWM3_LOCATION=\"$(BINDIR)/pwm3\" + -DLCDIR=\"$(LCDIR)\" -DLOCALEDIR=\"$(LOCALEDIR)\" ifndef PWM_ETCDIR PWM_ETCDIR = $(ETCDIR) @@ -60,14 +63,14 @@ include $(TOPDIR)/build/rules.mk ###################################### pwm3: $(OBJS) $(EXT_OBJS) - $(CC) $(LINKOPTS) $(OBJS) $(WHOLEA) $(EXT_OBJS) $(NO_WHOLEA) $(LDFLAGS) -o $@ + $(CC) $(OBJS) $(WHOLEA) $(EXT_OBJS) $(NO_WHOLEA) $(LDFLAGS) -o $@ preload.c: $(LUA) ../build/mkpreload.lua $(PWM_MODULE_LIST) > preload.c _install: $(INSTALLDIR) $(BINDIR) - $(INSTALL) -m $(BIN_MODE) pwm3 $(BINDIR) + $(INSTALLBIN) pwm3 $(BINDIR) $(INSTALLDIR) $(PWM_ETCDIR) for i in $(ETC); do \ $(INSTALL) -m $(DATA_MODE) $$i $(PWM_ETCDIR); \ diff --git a/pwm/pwm.c b/pwm/pwm.c index 178cf76..422bb40 100644 --- a/pwm/pwm.c +++ b/pwm/pwm.c @@ -1,7 +1,7 @@ /* * ion/pwm/pwm.c * - * Copyright (c) Tuomo Valkonen 1999-2007. + * Copyright (c) Tuomo Valkonen 1999-2008. * * See the included file LICENSE for details. */ @@ -98,8 +98,8 @@ int main(int argc, char*argv[]) libtu_init(argv[0]); -#ifdef CF_RELOCATABLE - prefix_set(argv[0], PWM3_LOCATION); +#ifdef CF_RELOCATABLE_PWM3_LOCATION + prefix_set(argv[0], CF_RELOCATABLE_PWM3_LOCATION); #endif localedir=prefix_add(LOCALEDIR); diff --git a/system.mk b/system.mk index 26ea7f7..b592858 100644 --- a/system.mk +++ b/system.mk @@ -6,12 +6,10 @@ ## Installation paths ## +# Installation path prefix. Unless you know what you're doing, the default +# of /usr/local is likely the correct choice. PREFIX=/usr/local -# For relocatable build, use the following, and start with absolute path. -# RELOCATABLE=1 -# PREFIX= - # Unless you are creating a package conforming to some OS's standards, you # probably do not want to modify the following directories: @@ -47,9 +45,11 @@ LOCALEDIR=$(PREFIX)/share/locale # Set PRELOAD_MODULES=1 if your system does not support dynamically loaded # modules through 'libdl' or has non-standard naming conventions. +# You will likely need this option on e.g. Cygwin and Mac OS X. #PRELOAD_MODULES=1 -# Flags to link with libdl. +# Flags to link with libdl. Even if PRELOAD_MODULES=1, you may need this +# setting (for e.g. Lua, when not instructed by pkg-config). DL_LIBS=-ldl @@ -77,6 +77,7 @@ LUAC=$(LUA_DIR)/bin/luac ## X libraries, includes and options ## +# Paths X11_PREFIX=/usr/X11R6 # SunOS/Solaris #X11_PREFIX=/usr/openwin @@ -100,30 +101,46 @@ DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WORKAROUND ## -## libc +## Localisation ## -# You may uncomment this if you know your system has -# asprintf and vasprintf in the c library. (gnu libc has.) -# If HAS_SYSTEM_ASPRINTF is not defined, an implementation -# in sprintf_2.2/ is used. -#HAS_SYSTEM_ASPRINTF=1 - # If you're on an archaic system (such as relatively recent *BSD releases) # without even dummy multibyte/widechar and localisation support, you may # have to uncomment the following line: #DEFINES += -DCF_NO_LOCALE -DCF_NO_GETTEXT -# On some other systems you may something like this: +# On some other systems you may need to explicitly link against libintl. #EXTRA_LIBS += -lintl -#EXTRA_INCLUDES += +# You may also need to give the location of its headers. The following +# should work on Mac OS X (which needs the above option as well) with +# macports. +#EXTRA_INCLUDES += -I/opt/local/include + + +## +## libc +## + +# You may uncomment this if you know that your system C libary provides +# asprintf and vasprintf. (GNU libc does.) If HAS_SYSTEM_ASPRINTF is not +# defined, an implementation provided in libtu/sprintf_2.2/ is used. +#HAS_SYSTEM_ASPRINTF=1 -# clock_gettime for monotonic time +# The following setting is needed with GNU libc for clock_gettime and the +# monotonic clock. Other systems may not need it, or may not provide a +# monotonic clock at all (which Ion can live with, and usually detect). EXTRA_LIBS += -lrt +# +# If you're using/have gcc, it is unlikely that you need to modify +# any of the settings below this line. +# +##################################################################### + + ## -## C compiler +## C compiler. ## CC=gcc @@ -134,8 +151,8 @@ WARN= -W -Wimplicit -Wreturn-type -Wswitch -Wcomment \ -Wtrigraphs -Wformat -Wchar-subscripts \ -Wparentheses -pedantic -Wuninitialized -CFLAGS=-Os $(WARN) $(DEFINES) $(EXTRA_INCLUDES) $(INCLUDES) -LDFLAGS=-Os $(EXTRA_LIBS) $(LIBS) +CFLAGS=-Os $(WARN) $(DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) +LDFLAGS=$(LIBS) $(EXTRA_LIBS) EXPORT_DYNAMIC=-Xlinker --export-dynamic # The following options are mainly for development use and can be used @@ -167,9 +184,10 @@ EXPORT_DYNAMIC=-Xlinker --export-dynamic ## DEPEND_FILE=.depend -DO_MAKE_DEPEND=$(CC) -MM $(DEFINES) $(EXTRA_INCLUDES) $(INCLUDES) +DO_MAKE_DEPEND=$(CC) -MM $(DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) MAKE_DEPEND=$(DO_MAKE_DEPEND) $(SOURCES) > $(DEPEND_FILE) + ## ## AR ## @@ -184,11 +202,19 @@ RANLIB=ranlib ## INSTALL=sh $(TOPDIR)/install-sh -c +INSTALL_STRIP=-s INSTALLDIR=mkdir -p BIN_MODE=755 DATA_MODE=644 -STRIP=strip - RM=rm + + +## +## Debugging +## + +#INSTALL_STRIP = +#CFLAGS += -g + diff --git a/utils/ion-completefile/Makefile b/utils/ion-completefile/Makefile index 659500f..8491638 100644 --- a/utils/ion-completefile/Makefile +++ b/utils/ion-completefile/Makefile @@ -27,4 +27,4 @@ ion-completefile: $(SOURCES) _install: $(INSTALLDIR) $(EXTRABINDIR) - $(INSTALL) -s -m $(BIN_MODE) ion-completefile $(EXTRABINDIR) + $(INSTALLBIN) ion-completefile $(EXTRABINDIR) diff --git a/utils/ion-statusd/Makefile b/utils/ion-statusd/Makefile index 3df31f9..0a0afac 100644 --- a/utils/ion-statusd/Makefile +++ b/utils/ion-statusd/Makefile @@ -34,8 +34,8 @@ include $(TOPDIR)/build/rules.mk ###################################### ion-statusd: $(OBJS) $(EXT_OBJS) - $(CC) $(LINKOPTS) $(OBJS) $(EXT_OBJS) $(LDFLAGS) -o $@ + $(CC) $(OBJS) $(EXT_OBJS) $(LDFLAGS) -o $@ _install: lc_install $(INSTALLDIR) $(EXTRABINDIR) - $(INSTALL) -s -m $(BIN_MODE) ion-statusd $(EXTRABINDIR) + $(INSTALLBIN) ion-statusd $(EXTRABINDIR) diff --git a/utils/ion-statusd/exec.c b/utils/ion-statusd/exec.c index 9ccc2d9..3270cb8 100644 --- a/utils/ion-statusd/exec.c +++ b/utils/ion-statusd/exec.c @@ -1,7 +1,7 @@ /* * ion/utils/ion-statusd/exec.c * - * Copyright (c) Tuomo Valkonen 2005-2006. + * Copyright (c) Tuomo Valkonen 2005-2008. * * 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/utils/ion-statusd/extlrx.c b/utils/ion-statusd/extlrx.c index 4c13e33..d7d1fb5 100644 --- a/utils/ion-statusd/extlrx.c +++ b/utils/ion-statusd/extlrx.c @@ -1,7 +1,7 @@ /* * ion/utils/ion-statusd/extlrx.c * - * Copyright (c) Tuomo Valkonen 2004-2006. + * Copyright (c) Tuomo Valkonen 2004-2008. * * 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/utils/ion-statusd/ion-statusd.c b/utils/ion-statusd/ion-statusd.c index 5822fe6..6402746 100644 --- 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 * - * Copyright (c) Tuomo Valkonen 2004-2006. + * Copyright (c) Tuomo Valkonen 2004-2008. * * 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 @@ -65,7 +65,7 @@ static OptParserOpt ion_opts[]={ static const char statusd_copy[]= - "Ion-statusd " ION_VERSION ", copyright (c) Tuomo Valkonen 2004-2005."; + "Ion-statusd " ION_VERSION ", copyright (c) Tuomo Valkonen 2004-2008."; static const char statusd_license[]=DUMMY_TR( @@ -161,7 +161,7 @@ int main(int argc, char*argv[]) libtu_init(argv[0]); -#ifdef CF_RELOCATABLE +#ifdef STATUSD_LOCATION prefix_set(argv[0], STATUSD_LOCATION); #endif diff --git a/utils/ion-statusd/statusd_date.lua b/utils/ion-statusd/statusd_date.lua index ea36258..6f048c7 100644 --- 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 -- --- Copyright (c) Tuomo Valkonen 2004-2006. +-- Copyright (c) Tuomo Valkonen 2004-2008. -- -- 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/utils/ion-statusd/statusd_load.lua b/utils/ion-statusd/statusd_load.lua index 88162af..104b07a 100644 --- 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 -- --- Copyright (c) Tuomo Valkonen 2004-2006. +-- Copyright (c) Tuomo Valkonen 2004-2008. -- -- 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/utils/ion-statusd/statusd_mail.lua b/utils/ion-statusd/statusd_mail.lua index 71cfea9..48406a4 100644 --- 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 -- --- Copyright (c) Tuomo Valkonen 2004-2006. +-- Copyright (c) Tuomo Valkonen 2004-2008. -- -- 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/version.h b/version.h index 2317f10..10af9dd 100644 --- a/version.h +++ b/version.h @@ -1,2 +1,3 @@ -#define ION_VERSION "3rc-20071220" +#define ION_RELEASE "3rc-20080103" +#define ION_VERSION ION_RELEASE #define ION_API_VERSION "3" -- 2.39.5