From 3ca53efc5489066f294d6aa40f6fa926c1ad68fa Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Tue, 26 Feb 2008 17:31:07 +0000
Subject: [PATCH] vncrc, xinitrc: Don't do so much Gnome fiddling.

The Gnome settings stuff screws up VNC mightily.  The panel (well,
actually, some panel applets) doesn't seem to like running multiple
instances.  And the keyboard configuration completely scrambles the
keymap.
---
 vncrc   | 2 +-
 xinitrc | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/vncrc b/vncrc
index 00f0627..a4c6d6b 100644
--- a/vncrc
+++ b/vncrc
@@ -1,5 +1,5 @@
 ## VNC settings
 
-$geometry = "1270x960";
+$geometry = "1280x1024";
 $depth = 16;
 $vncStartup = "$ENV{HOME}/.vncsession";
diff --git a/xinitrc b/xinitrc
index 4ef815b..43ca142 100755
--- a/xinitrc
+++ b/xinitrc
@@ -11,7 +11,6 @@ cleanup=":"
 xset b 10 2000 50
 xset r rate 500 50
 xset m 1 1
-$xx gnome-settings-daemon&
 $xx mail-notification&
 $xx $VNCSESSION || $xx gkrellm&
 if [ "$XINIT_TEST" = "" ] || [ "$XWIDTH" = "" ] || [ "$XHEIGHT" = "" ]; then
@@ -45,8 +44,9 @@ $xx $wm $EOPTS&
 if ! $xx $VNCSESSION; then
   xscreensaver-command -exit
   xscreensaver -no-splash&
+  $xx gnome-settings-daemon&
+  $xx gnome-panel&
 fi
-$xx gnome-panel&
 
 # --- Emacs window measurements ---
 #
-- 
2.11.0