diff options
| author | Dana Jansens <danakj@orodu.net> | 2010-01-08 10:22:30 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2010-01-08 10:22:30 -0500 |
| commit | 73575c10ce3ede1637e4f959b56e1f7d5f110b91 (patch) | |
| tree | 9af1e7061d53dcc62be4000fc206cfcaa71cc4a8 /data | |
| parent | 4f414ed0f124fa67b61d347899aa3b30aa0294f1 (diff) | |
| parent | f163c46eaf01ced8405fa36a3bf4a5c488f0f5aa (diff) | |
Merge branch 'backport' into work
Conflicts:
Makefile.am
openbox/actions/focus.c
openbox/config.c
openbox/event.c
openbox/menuframe.c
Diffstat (limited to 'data')
| -rw-r--r-- | data/rc.xml | 13 | ||||
| -rw-r--r-- | data/xsession/openbox-gnome-session.in | 2 |
2 files changed, 11 insertions, 4 deletions
diff --git a/data/rc.xml b/data/rc.xml index e5eb9178..f5f3712f 100644 --- a/data/rc.xml +++ b/data/rc.xml @@ -673,9 +673,16 @@ menu is hidden again --> <middle>no</middle> <!-- center submenus vertically about the parent entry --> - <submenuShowDelay>100</submenuShowDelay> - <!-- this one is easy, time to delay before showing a submenu after hovering - over the parent entry --> + <submenuShowDelay>200</submenuShowDelay> + <!-- time to delay before showing a submenu after hovering over the parent + entry. + if this is a negative value, then the delay is infinite and the + submenu will not be shown until it is clicked on --> + <submenuHideDelay>400</submenuHideDelay> + <!-- time to delay before hiding a submenu when selecting another + entry in parent menu --> + if this is a negative value, then the delay is infinite and the + submenu will not be hidden until a different submenu is opened --> <applicationIcons>yes</applicationIcons> <!-- controls if icons appear in the client-list-(combined-)menu --> <manageDesktops>yes</manageDesktops> diff --git a/data/xsession/openbox-gnome-session.in b/data/xsession/openbox-gnome-session.in index de46bec5..6765ae82 100644 --- a/data/xsession/openbox-gnome-session.in +++ b/data/xsession/openbox-gnome-session.in @@ -46,7 +46,7 @@ else OB_SESSION=$(gconftool-2 -g $SPATH/openbox_session 2> /dev/null) # update the GNOME/Openbox session if needed - if x$OB_SESSION != x$SESSION; then + if test x$OB_SESSION != x$SESSION; then # the default session changed or we didn't run GNOME/Openbox before gconftool-2 -t list --list-type=strings -s $SPATH/openbox_session \ "$SESSION" 2> /dev/null |