Permalink
Browse files

* rewrote the inherited licences part of the readme file to take into…

… account 9wm's switch to the MIT licence

* updated the menu options
* integrated more changes from Mats Erik Andersson:
	* added a simple mechanism which updates the menu in the running instance of WindowLab
  • Loading branch information...
1 parent 0cbb250 commit 2437fea0213e16fb3dc488a332b47f9f9e6a2511 @nickgravgaard committed Oct 1, 2009
Showing with 54 additions and 37 deletions.
  1. +8 −0 CHANGELOG
  2. +31 −26 README
  3. +4 −1 misc.c
  4. +2 −2 windowlab.h
  5. +9 −8 windowlab.menurc
View
@@ -1,3 +1,11 @@
+1.36 (2009-10-01)
+
+* rewrote the inherited licences part of the readme file to take into account 9wm's switch to the MIT licence
+* updated the menu options
+* integrated more changes from Mats Erik Andersson:
+ * added a simple mechanism which updates the menu in the running instance of WindowLab
+
+
1.35 (2009-09-20)
* integrated changes from Mats Erik Andersson (thanks!):
View
@@ -125,35 +125,40 @@ Thanks to Decklin Foster who wrote the original aewm (v1.1.2 to be precise) on w
-ORIGINAL AEWM LICENCE
+INHERITED LICENCES
-License
-======================================================================
+aewm
-Copyright (c) 1998-2001 Decklin Foster.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS", WITHOUT ANY EXPRESS
-OR IMPLIED WARRANTIES OF ANY KIND. IN NO EVENT SHALL THE AUTHOR BE
-HELD LIABLE FOR ANY DAMAGES CONNECTED WITH THE USE OF THIS PROGRAM.
-
-You are granted permission to copy, publish, distribute, and/or sell
-copies of this program and any modified versions or derived works,
-provided that this copyright and notice are not removed or altered.
+> Copyright (c) 1998-2001 Decklin Foster.
+>
+> THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS", WITHOUT ANY EXPRESS
+> OR IMPLIED WARRANTIES OF ANY KIND. IN NO EVENT SHALL THE AUTHOR BE
+> HELD LIABLE FOR ANY DAMAGES CONNECTED WITH THE USE OF THIS PROGRAM.
+>
+> You are granted permission to copy, publish, distribute, and/or sell
+> copies of this program and any modified versions or derived works,
+> provided that this copyright and notice are not removed or altered.
-Portions of the code were based on 9wm, which contains this license:
+9wm
-> 9wm is free software, and is Copyright (c) 1994 by David Hogan.
-> Permission is granted to all sentient beings to use this software,
-> to make copies of it, and to distribute those copies, provided
-> that:
+> Copyright (c) 1994 David Hogan
+> Copyright (c) 2009 The Estate of David Hogan
+>
+> Permission is hereby granted, free of charge, to any person obtaining a copy
+> of this software and associated documentation files (the "Software"), to deal
+> in the Software without restriction, including without limitation the rights
+> to use, copy, modify, merge, publish, distribute, sublicence, and/or sell
+> copies of the Software, and to permit persons to whom the Software is
+> furnished to do so, subject to the following conditions:
>
-> (1) the copyright and licence notices are left intact
-> (2) the recipients are aware that it is free software
-> (3) any unapproved changes in functionality are either
-> (i) only distributed as patches
-> or (ii) distributed as a new program which is not called 9wm
-> and whose documentation gives credit where it is due
-> (4) the author is not held responsible for any defects
-> or shortcomings in the software, or damages caused by it.
+> The above copyright notice and this permission notice shall be included in
+> all copies or substantial portions of the Software.
>
-> There is no warranty for this software. Have a nice day.
+> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+> THE SOFTWARE.
+
View
@@ -80,9 +80,12 @@ void sig_handler(int signal)
{
case SIGINT:
case SIGTERM:
- case SIGHUP:
quit_nicely();
break;
+ case SIGHUP:
+ free_menuitems();
+ get_menuitems();
+ break;
case SIGCHLD:
while ((pid = waitpid(-1, &status, WNOHANG)) != 0)
{
View
@@ -21,8 +21,8 @@
#ifndef WINDOWLAB_H
#define WINDOWLAB_H
-#define VERSION "1.35"
-#define RELEASEDATE "2009-09-20"
+#define VERSION "1.36"
+#define RELEASEDATE "2009-10-01"
#include <errno.h>
#include <limits.h>
View
@@ -1,13 +1,14 @@
# make sure each line ends in LF not CRLF!
xterm:xterm
-GVIM:gvim
-Xffm:xffm /
-Mozilla:mozilla
-Gaim:gaim
-X-Chat:xchat
-XMMS:xmms
-xv:xv
-The GIMP:gimp
+gedit:gedit
+Nautilus:nautilus
+Firefox:firefox
+Pidgin:pidgin
+XChat:xchat
+Rhythmbox:rhythmbox
+Totem:totem
+GIMP:gimp
Edit menu:gvim /etc/X11/windowlab/windowlab.menurc
About:windowlab -about | xmessage -file -
+Reload:pkill -HUP windowlab
Quit:skill windowlab

0 comments on commit 2437fea

Please sign in to comment.