[gnumeric] GUI: Adjust Ubuntu hack.



commit 707fe35e841a1a29f753cd86dcaa18a0a5565b3a
Author: Morten Welinder <terra gnome org>
Date:   Fri Mar 28 12:53:48 2014 -0400

    GUI: Adjust Ubuntu hack.
    
    Modules get triggered by parsing gtk+ options, so we need to set the
    environment variable earlier.

 ChangeLog              |    4 ++++
 src/main-application.c |   16 ++++++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 3384278..6533010 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-03-28  Morten Welinder  <terra gnome org>
+
+       * src/main-application.c (main): Move Ubuntu hack earlier.
+
 2014-03-27  Morten Welinder  <terra gnome org>
 
        * src/main-application.c (main): Attempt to banish ubuntu's
diff --git a/src/main-application.c b/src/main-application.c
index 627add9..e19da10 100644
--- a/src/main-application.c
+++ b/src/main-application.c
@@ -238,6 +238,14 @@ main (int argc, char const **argv)
        /* No code before here, we need to init threads */
        argv = gnm_pre_parse_init (argc, argv);
 
+       /*
+        * Attempt to disable Ubuntu's funky, non-working scroll
+        * bars.  This needs to be done before gtk starts loading
+        * modules.  Note: the following call will not replace
+        * an existing setting, so you can run with =1 if you like.
+        */
+       g_setenv ("LIBOVERLAY_SCROLLBAR", "0", FALSE);
+
 #ifdef G_OS_WIN32
        has_console = FALSE;
        {
@@ -265,14 +273,6 @@ main (int argc, char const **argv)
        with_gui = !func_def_file && !func_state_file && !split_funcdocs;
 
        if (with_gui) {
-               /*
-                * Attempt to disable Ubuntu's funky, non-working scroll
-                * bars.  This needs to be done before gtk starts loading
-                * modules.  Note: the following call will not replace
-                * an existing setting, so you can run with =1 if you like.
-                */
-               g_setenv ("LIBOVERLAY_SCROLLBAR", "0", FALSE);
-
                gnm_session_init (argv[0]);
        }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]