[aisleriot] sol: Sanitise the environment

[Christian Persch <chpe src gnome org>]

commit 7387f4fdced2e0290c6837c9e19e454f8f3d826a
Author: Christian Persch <chpe gnome org>
Date:   Tue Mar 12 19:08:56 2013 +0100

    sol: Sanitise the environment

 configure.ac |    2 +-
 src/sol.c    |    6 ++++++
 2 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f50d615..2e5dc90 100644
--- a/configure.ac
+++ b/configure.ac
@@ -135,7 +135,7 @@ AC_ARG_WITH([card-theme-formats],
   [],[with_card_theme_formats=default])
 
 case "$with_card_theme_formats" in
-  default) with_card_theme_formats="svg" ;;
+  default) with_card_theme_formats="svg,pysol" ;;
   all) with_card_theme_formats="svg,kde,fixed,sliced,pysol" ;;
 esac
 
diff --git a/src/sol.c b/src/sol.c
index 0b82226..993baa9 100644
--- a/src/sol.c
+++ b/src/sol.c
@@ -162,7 +162,13 @@ main (int argc, char *argv[])
   g_setenv ("GUILE_WARN_DEPRECATED", "detailed", TRUE);
   g_setenv ("GUILE_AUTO_COMPILE", "0", TRUE);
 
+  /* Set some env vars to disable ubuntu crap. They'll certainly patch this
+   * out in their package, but anyone running from git will get the right
+   * behaviour.
+   */
+  g_setenv ("LIBOVERLAY_SCROLLBAR", "0", TRUE);
   g_setenv ("UBUNTU_MENUPROXY", "0", TRUE);
+  g_setenv ("NO_UNITY_GTK_MODULE", "1", TRUE);
 
   scm_boot_guile (argc, argv, main_prog, NULL); /* no return */