diff --git a/wmail/src/common.c b/wmail/src/common.c index 8887cb2..e536e62 100644 --- a/wmail/src/common.c +++ b/wmail/src/common.c @@ -2,8 +2,9 @@ // common.c // common defines and typedefs, part of wmail // -// Copyright 2000~2002, Sven Geisenhainer . -// All rights reserved. +// Copyright 2000-2002, Sven Geisenhainer . +// Copyright 2016-2017, Doug Torrance . +// Copyright 2019, Jeremy Sowden . // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions diff --git a/wmail/src/common.h b/wmail/src/common.h index a7441d6..02385c8 100644 --- a/wmail/src/common.h +++ b/wmail/src/common.h @@ -2,8 +2,9 @@ // common.h // common defines and typedefs, part of wmail // -// Copyright 2000~2002, Sven Geisenhainer . -// All rights reserved. +// Copyright 2000-2002, Sven Geisenhainer . +// Copyright 2016-2017, Doug Torrance . +// Copyright 2019, Jeremy Sowden . // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions @@ -53,9 +54,6 @@ // filename of the config-file #define WMAIL_RC_FILE ".wmailrc" -#define WMAIL_NAME "wmail" -#define WMAIL_VERSION "wmail v2.0 (C) 2000~2002 Sven Geisenhainer " - #define WMAIL_READSTATUS "O" /////////////////////////////////////////////////////////////////////////////// diff --git a/wmail/src/config.c b/wmail/src/config.c index 4f380f2..6a523b9 100644 --- a/wmail/src/config.c +++ b/wmail/src/config.c @@ -2,8 +2,9 @@ // config.c // configuration file parser, part of wmail // -// Copyright 2000~2002, Sven Geisenhainer . -// All rights reserved. +// Copyright 2000-2002, Sven Geisenhainer . +// Copyright 2016-2017, Doug Torrance . +// Copyright 2019, Jeremy Sowden . // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions diff --git a/wmail/src/config.h b/wmail/src/config.h index 3199d1f..2e6281b 100644 --- a/wmail/src/config.h +++ b/wmail/src/config.h @@ -2,8 +2,9 @@ // config.h // configuration file parser, part of wmail // -// Copyright 2000~2002, Sven Geisenhainer . -// All rights reserved. +// Copyright 2000-2002, Sven Geisenhainer . +// Copyright 2016-2017, Doug Torrance . +// Copyright 2019, Jeremy Sowden . // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions diff --git a/wmail/src/wmail.c b/wmail/src/wmail.c index 26be223..6178651 100644 --- a/wmail/src/wmail.c +++ b/wmail/src/wmail.c @@ -3,10 +3,9 @@ // email indicator tool designed as docklet for Window Maker // main c source-file // -// wmail version 2.0 -// -// Copyright 2000~2002, Sven Geisenhainer . -// All rights reserved. +// Copyright 2000-2002, Sven Geisenhainer . +// Copyright 2016-2017, Doug Torrance . +// Copyright 2019, Jeremy Sowden . // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions @@ -248,7 +247,7 @@ int main( int argc, char **argv ) // parse cmdline-args and override defaults and cfg-file settings DAParseArguments( argc, argv, options, sizeof(options) / sizeof(DAProgramOption), - WMAIL_NAME, WMAIL_VERSION ); + PACKAGE_NAME, PACKAGE_STRING ); if( options[0].used ) config.givenOptions |= CL_DISPLAY; diff --git a/wmail/wmailrc-sample b/wmail/wmailrc-sample index d5776d2..bb2e4e6 100644 --- a/wmail/wmailrc-sample +++ b/wmail/wmailrc-sample @@ -1,6 +1,6 @@ #-*-shell-script-*-############################################################ # -# .wmailrc - wmail v2.0 configuration file +# .wmailrc - wmail v2.1 configuration file # note: cmd-line options always overide the settings in this file unless you # force runtime reconfiguration by clicking on the docklets display area #