[Goodies-commits] r7000 - in gigolo/trunk: . src

[Enrico Troeger]

Author: enrico
Date: 2009-03-26 18:25:09 +0000 (Thu, 26 Mar 2009)
New Revision: 7000

Modified:
   gigolo/trunk/ChangeLog
   gigolo/trunk/src/settings.c
Log:
When starting without an existing configuration, check whether GIO_USE_VOLUME_MONITOR is set and if so, use its value as default.

Modified: gigolo/trunk/ChangeLog
===================================================================
--- gigolo/trunk/ChangeLog	2009-03-26 12:08:41 UTC (rev 6999)
+++ gigolo/trunk/ChangeLog	2009-03-26 18:25:09 UTC (rev 7000)
@@ -1,3 +1,10 @@
+2009-03-26  Enrico Tröger  <enrico(at)xfce(dot)org>
+
+ * src/settings.c:
+   When starting without an existing configuration, check whether
+   GIO_USE_VOLUME_MONITOR is set and if so, use its value as default.
+
+
 2009-03-22  Enrico Tröger  <enrico(at)xfce(dot)org>
 
  * src/bookmarkdialog.c, src/bookmarkdialog.h, src/bookmarkeditdialog.c,

Modified: gigolo/trunk/src/settings.c
===================================================================
--- gigolo/trunk/src/settings.c	2009-03-26 12:08:41 UTC (rev 6999)
+++ gigolo/trunk/src/settings.c	2009-03-26 18:25:09 UTC (rev 7000)
@@ -477,6 +477,7 @@
 	GKeyFile *k;
 	GError *error = NULL;
 	gsize i;
+	const gchar *default_vm_impl;
 
 	k = g_key_file_new();
 	if (! g_key_file_load_from_file(k, priv->config_filename, G_KEY_FILE_NONE, &error))
@@ -486,7 +487,11 @@
 		error = NULL;
 	}
 
-	priv->vm_impl = get_setting_string(k, SECTION_GENERAL, "vm_impl", DEFAULT_VM_IMPL);
+	default_vm_impl = g_getenv("GIO_USE_VOLUME_MONITOR");
+	if (! NZV(default_vm_impl))
+		default_vm_impl = DEFAULT_VM_IMPL;
+
+	priv->vm_impl = get_setting_string(k, SECTION_GENERAL, "vm_impl", default_vm_impl);
 	priv->file_manager = get_setting_string(k, SECTION_GENERAL, "file_manager", "gvfs-open");
 	priv->autoconnect_interval = get_setting_int(k, SECTION_GENERAL, "autoconnect_interval",
 		DEFAULT_AUTOCONNECT_INTERVAL);