[gnumeric] Init: don't initialize gnome-vfs anymore, even if someone links it in.



commit 3eccfb48226e0e4b6564cc50b5956112cc3e2b42
Author: Morten Welinder <terra gnome org>
Date:   Mon Oct 24 09:46:00 2011 -0400

    Init: don't initialize gnome-vfs anymore, even if someone links it in.

 ChangeLog         |    5 +++++
 NEWS              |    1 +
 src/libgnumeric.c |   20 --------------------
 3 files changed, 6 insertions(+), 20 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 927182d..02b520f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-24  Morten Welinder  <terra gnome org>
+
+	* src/libgnumeric.c (gnm_init): Don't bother initializing
+	gnome-vfs anymore.
+
 2011-10-22 Andreas J. Guelzow <aguelzow pyrshep ca>
 
 	* src/rendered-value.c (rv_adjust_filter): use zoom rather than scale
diff --git a/NEWS b/NEWS
index b56ba6d..23d9635 100644
--- a/NEWS
+++ b/NEWS
@@ -64,6 +64,7 @@ Morten:
 	* Fix leaks.
 	* Fix GUI crash for invalid dates.
 	* Embed ui files into the Gnumeric binary.
+	* Get rid of obsolete code.
 
 Valek:
 	* In xls import, set LABEL encoding based on FONT charset converted to 
diff --git a/src/libgnumeric.c b/src/libgnumeric.c
index 02ce1fb..3242b4b 100644
--- a/src/libgnumeric.c
+++ b/src/libgnumeric.c
@@ -233,24 +233,6 @@ gnumeric_check_for_components (void)
 }
 #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 (void)
 {
@@ -259,8 +241,6 @@ gnm_init (void)
 		return;
 	inited = TRUE;
 
-	call_gnome_vfs_init ();
-
 	libgoffice_init ();
 	go_plugin_service_define ("function_group",
 		&plugin_service_function_group_get_type);



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