[libgsf] python: don't call gnome_vfs_init.



commit 09c2dbc12e92debde83cdf28447b425a167df4de
Author: Morten Welinder <terra gnome org>
Date:   Wed Jan 27 13:16:11 2010 -0500

    python: don't call gnome_vfs_init.

 NEWS                     |    1 +
 python/ChangeLog         |    5 +++++
 python/gsfgnome.override |    2 ++
 3 files changed, 8 insertions(+), 0 deletions(-)
---
diff --git a/NEWS b/NEWS
index 5bdc93f..c10f766 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ libgsf 1.14.17
 Morten:
 	* Fix xml parser crash.
 	* Write meta-data values in name order.
+	* Don't call gnome_vfs_init in python binding.  [#599973]
 
 --------------------------------------------------------------------------
 libgsf 1.14.16
diff --git a/python/ChangeLog b/python/ChangeLog
index dfd896c..671ec42 100644
--- a/python/ChangeLog
+++ b/python/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-27  Morten Welinder  <terra gnome org>
+
+	* gsfgnome.override: Don't call gnome_vfs_init is we're using gio.
+	#599973.
+
 2009-10-11  Morten Welinder <terra gnome org>
 
 	* Release 1.14.16
diff --git a/python/gsfgnome.override b/python/gsfgnome.override
index 220cb09..4b8ad5c 100644
--- a/python/gsfgnome.override
+++ b/python/gsfgnome.override
@@ -23,7 +23,9 @@ import gsf.Input as PyGsfInput_Type
 import gsf.Output as PyGsfOutput_Type
 %%
 init
+#ifndef LIBGSF_GNOMEVFS_VIA_GIO
   gnome_vfs_init();
+#endif
 %%
 ignore-glob
  _*



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