aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Lillqvist <tml@src.gnome.org>2008-03-04 06:45:45 +0800
committerTor Lillqvist <tml@src.gnome.org>2008-03-04 06:45:45 +0800
commit0a1b17b1b9fe724e0010effd191713b647947480 (patch)
tree02565e141006235083c060078b7e0e85d5d42b5f
parentd393305b816df088fc6b7aa6dba109e3ef6b91f2 (diff)
downloadgsoc2013-evolution-0a1b17b1b9fe724e0010effd191713b647947480.tar
gsoc2013-evolution-0a1b17b1b9fe724e0010effd191713b647947480.tar.gz
gsoc2013-evolution-0a1b17b1b9fe724e0010effd191713b647947480.tar.bz2
gsoc2013-evolution-0a1b17b1b9fe724e0010effd191713b647947480.tar.lz
gsoc2013-evolution-0a1b17b1b9fe724e0010effd191713b647947480.tar.xz
gsoc2013-evolution-0a1b17b1b9fe724e0010effd191713b647947480.tar.zst
gsoc2013-evolution-0a1b17b1b9fe724e0010effd191713b647947480.zip
Move the call to set_paths() on Windows earlier before
gnome_program_init() so that it affects gconfd-2. svn path=/trunk/; revision=35130
-rw-r--r--shell/main.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/shell/main.c b/shell/main.c
index 1ef3104506..f2fe0b6a99 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -680,6 +680,10 @@ main (int argc, char **argv)
g_option_context_set_translation_domain(context, GETTEXT_PACKAGE);
+#ifdef G_OS_WIN32
+ set_paths ();
+#endif
+
program = gnome_program_init (PACKAGE, VERSION, LIBGNOMEUI_MODULE, argc, argv,
GNOME_PROGRAM_STANDARD_PROPERTIES,
GNOME_PARAM_GOPTION_CONTEXT, context,
@@ -701,10 +705,6 @@ main (int argc, char **argv)
exit (0);
}
-#ifdef G_OS_WIN32
- set_paths ();
-#endif
-
client = gconf_client_get_default ();
#if DEVELOPMENT