diff options
author | rathnor <rathnor> | 2003-07-17 23:39:34 (GMT) |
---|---|---|
committer | rathnor <rathnor> | 2003-07-17 23:39:34 (GMT) |
commit | 06d723aefe7fb794f50b1e7a0ad8ad4473ae8ac6 (patch) | |
tree | d4ace0cac61816df486bb5ab4073a5a0d9425bd1 | |
parent | ea0762530343d07e80ea667bb646836e2dfe4b1d (diff) | |
download | fluxbox_lack-06d723aefe7fb794f50b1e7a0ad8ad4473ae8ac6.zip fluxbox_lack-06d723aefe7fb794f50b1e7a0ad8ad4473ae8ac6.tar.bz2 |
updates from han
- solaris fix for fb-gm
- some additions to .cvsignore
-rw-r--r-- | data/styles/.cvsignore | 2 | ||||
-rw-r--r-- | src/.cvsignore | 1 | ||||
-rwxr-xr-x | util/fluxbox-generate_menu | 6 |
3 files changed, 7 insertions, 2 deletions
diff --git a/data/styles/.cvsignore b/data/styles/.cvsignore new file mode 100644 index 0000000..282522d --- /dev/null +++ b/data/styles/.cvsignore | |||
@@ -0,0 +1,2 @@ | |||
1 | Makefile | ||
2 | Makefile.in | ||
diff --git a/src/.cvsignore b/src/.cvsignore index 06fd55e..cd148f5 100644 --- a/src/.cvsignore +++ b/src/.cvsignore | |||
@@ -3,3 +3,4 @@ | |||
3 | Makefile | 3 | Makefile |
4 | Makefile.in | 4 | Makefile.in |
5 | fluxbox | 5 | fluxbox |
6 | defaults.hh | ||
diff --git a/util/fluxbox-generate_menu b/util/fluxbox-generate_menu index 40b4aa3..2e7ce88 100755 --- a/util/fluxbox-generate_menu +++ b/util/fluxbox-generate_menu | |||
@@ -22,7 +22,7 @@ | |||
22 | # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | # DEALINGS IN THE SOFTWARE. | 23 | # DEALINGS IN THE SOFTWARE. |
24 | # | 24 | # |
25 | # $Id: fluxbox-generate_menu,v 1.39 2003/07/03 13:05:38 fluxgen Exp $ | 25 | # $Id: fluxbox-generate_menu,v 1.40 2003/07/17 23:39:34 rathnor Exp $ |
26 | 26 | ||
27 | # | 27 | # |
28 | # Portability notes: | 28 | # Portability notes: |
@@ -100,7 +100,7 @@ EOF | |||
100 | } | 100 | } |
101 | 101 | ||
102 | # ugly code for solaris compat. | 102 | # ugly code for solaris compat. |
103 | case $(uname) in | 103 | case `uname` in |
104 | Linux|*BSD) | 104 | Linux|*BSD) |
105 | find_it() { | 105 | find_it() { |
106 | which $1 > /dev/null 2>&1 && shift && $* | 106 | which $1 > /dev/null 2>&1 && shift && $* |
@@ -931,6 +931,8 @@ append_submenu "${FBSETTINGSMENU}" | |||
931 | "[exec] (Windowname) {xprop WM_CLASS|cut -d \\\" -f 2|xmessage -file - -center}" | 931 | "[exec] (Windowname) {xprop WM_CLASS|cut -d \\\" -f 2|xmessage -file - -center}" |
932 | find_it import append "[exec] (screenshot) {import screenshot.png && qiv -W 50 screenshot.png}" | 932 | find_it import append "[exec] (screenshot) {import screenshot.png && qiv -W 50 screenshot.png}" |
933 | find_it fbrun append "[exec] (Run) {fbrun}" | 933 | find_it fbrun append "[exec] (Run) {fbrun}" |
934 | find_it switch append "[exec] (gtk-theme-switch) {switch}" | ||
935 | find_it switch2 append "[exec] (gtk2-theme-switch) {switch2}" | ||
934 | find_it fluxbox-generate_menu append "[exec] (regenerate menu) {fluxbox-generate_menu}" | 936 | find_it fluxbox-generate_menu append "[exec] (regenerate menu) {fluxbox-generate_menu}" |
935 | append_menu_end | 937 | append_menu_end |
936 | 938 | ||