totem r5945 - in trunk: . src/plugins

[pwithnall svn gnome org]

Author: pwithnall
Date: Tue Feb  3 20:10:33 2009
New Revision: 5945
URL: http://svn.gnome.org/viewvc/totem?rev=5945&view=rev

Log:
2009-02-03  Philip Withnall  <philip tecnocode co uk>

	* src/plugins/totem-python-module.c (totem_python_module_load):
	Ensure Python's initialised before loading any Python modules.
	Makes Totem more robust in the case of bug #570087.



Modified:
   trunk/ChangeLog
   trunk/src/plugins/totem-python-module.c

Modified: trunk/src/plugins/totem-python-module.c
==============================================================================
--- trunk/src/plugins/totem-python-module.c	(original)
+++ trunk/src/plugins/totem-python-module.c	Tue Feb  3 20:10:33 2009
@@ -277,6 +277,8 @@
 	Py_ssize_t pos = 0;
 	gboolean res = FALSE;
 
+	g_return_val_if_fail (Py_IsInitialized (), FALSE);
+
 	state = pyg_gil_state_ensure();
 
 	main_module = PyImport_AddModule ("__main__");