summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Ostorga <vostorga@gentoo.org>2009-11-06 01:09:43 +0000
committerVictor Ostorga <vostorga@gentoo.org>2009-11-06 01:09:43 +0000
commit89f2eb1d97d3cd13d468d396fd9a38368389fd5c (patch)
tree63f0cbfa670127ba55af34b733e5e97e1f8b3dcf /x11-wm/openbox/files
parentVersion bump. (diff)
downloadhistorical-89f2eb1d97d3cd13d468d396fd9a38368389fd5c.tar.gz
historical-89f2eb1d97d3cd13d468d396fd9a38368389fd5c.tar.bz2
historical-89f2eb1d97d3cd13d468d396fd9a38368389fd5c.zip
Fixing openbox session with >gnome-base/gnome-session-2.22 , bug #275138
Package-Manager: portage-2.1.6.13/cvs/Linux i686
Diffstat (limited to 'x11-wm/openbox/files')
-rw-r--r--x11-wm/openbox/files/openbox-gnomesession.patch18
1 files changed, 18 insertions, 0 deletions
diff --git a/x11-wm/openbox/files/openbox-gnomesession.patch b/x11-wm/openbox/files/openbox-gnomesession.patch
new file mode 100644
index 000000000000..42b866fad489
--- /dev/null
+++ b/x11-wm/openbox/files/openbox-gnomesession.patch
@@ -0,0 +1,18 @@
+diff -up openbox-3.4.7.2/data/xsession/openbox-gnome-session.in.gnomesession openbox-3.4.7.2/data/xsession/openbox-gnome-session.in
+--- openbox-3.4.7.2/data/xsession/openbox-gnome-session.in.gnomesession 2008-12-09 18:06:37.000000000 +0100
++++ openbox-3.4.7.2/data/xsession/openbox-gnome-session.in 2008-12-09 19:04:14.000000000 +0100
+@@ -11,5 +11,12 @@ fi
+ xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES -remove _NET_CURRENT_DESKTOP 2> /dev/null
+
+ # Run GNOME with Openbox as its window manager
+-export WINDOW_MANAGER="@bindir@/openbox"
+-exec gnome-session --choose-session=openbox-session "$@"
++SESSION=$(gconftool-2 -g /desktop/gnome/session/default_session 2> /dev/null)
++test -z "$SESSION" && SESSION="[openbox]"
++echo "$SESSION" | grep -q openbox || SESSION="${SESSION%]},openbox]"
++
++OPENBOX_SESSION=$(gconftool-2 -g /desktop/gnome/session/openbox_session 2> /dev/null)
++[ "$SESSION" != "$OPENBOX_SESSION" ] && gconftool-2 -t list --list-type=strings -s \
++ /desktop/gnome/session/openbox_session "$SESSION" 2> /dev/null
++
++exec gnome-session --default-session-key /desktop/gnome/session/openbox_session "$@"