gnumeric r16939 - in trunk: . src

[mortenw svn gnome org]

Author: mortenw
Date: Sat Nov  1 23:22:54 2008
New Revision: 16939
URL: http://svn.gnome.org/viewvc/gnumeric?rev=16939&view=rev

Log:
2008-11-01  Morten Welinder  <terra gnome org>

	* src/libgnumeric.c (call_gnome_vfs_init): Call gnome_vfs_init
	only if someone linked it in.



Modified:
   trunk/ChangeLog
   trunk/src/libgnumeric.c

Modified: trunk/src/libgnumeric.c
==============================================================================
--- trunk/src/libgnumeric.c	(original)
+++ trunk/src/libgnumeric.c	Sat Nov  1 23:22:54 2008
@@ -63,10 +63,6 @@
 #include <goffice/app/go-plugin-loader-module.h>
 #include <glade/glade.h>
 
-#ifdef GNM_WITH_GNOME
-#include <libgnomevfs/gnome-vfs-init.h>
-#endif
-
 #ifdef HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>
 #endif
@@ -246,12 +242,28 @@
 }
 #endif
 
+/* If something links in gnome-vfs, be kind and initialize it.  */
+static void
+call_gnome_vfs_init (void)
+{
+	GModule *self = g_module_open (NULL, 0);
+	gboolean ok;
+	gpointer gvi = NULL;
+	gboolean (*_gnome_vfs_init) (void);
+
+	if (!self) return;
+	ok = g_module_symbol (self, "gnome_vfs_init", &gvi);
+	g_module_close (self);
+	if (!ok || gvi == NULL) return;
+
+	_gnome_vfs_init = (gboolean (*) (void))gvi;
+	_gnome_vfs_init ();
+}
+
 void
 gnm_init (gboolean fast)
 {
-#if defined (GNM_WITH_GNOME) || defined (GNM_USE_HILDON)
-	gnome_vfs_init ();
-#endif
+	call_gnome_vfs_init ();
 
 	libgoffice_init ();
 	plugin_service_define ("function_group",