[libpeas] Tidy up pygobject initialisation
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libpeas] Tidy up pygobject initialisation
- Date: Wed, 7 Jul 2010 21:30:20 +0000 (UTC)
commit f6a0ff34b0706ab7132364ded6e11e29951b85fd
Author: Philip Withnall <philip tecnocode co uk>
Date: Wed Jul 7 22:16:06 2010 +0100
Tidy up pygobject initialisation
We were using a deprecated macro which made things harder than they
should be.
loaders/python/peas-plugin-loader-python.c | 15 +--------------
1 files changed, 1 insertions(+), 14 deletions(-)
---
diff --git a/loaders/python/peas-plugin-loader-python.c b/loaders/python/peas-plugin-loader-python.c
index 0646a6d..aa20a0e 100644
--- a/loaders/python/peas-plugin-loader-python.c
+++ b/loaders/python/peas-plugin-loader-python.c
@@ -426,19 +426,6 @@ peas_plugin_loader_python_add_module_path (PeasPluginLoaderPython *self,
return TRUE;
}
-/* Note: the following function is needed because init_pyobject is a *macro*
- * which in case of error set the PyErr and then make the calling function
- * return behind our back.
- * It's up to the caller to check the result with PyErr_Occurred ()
- */
-static void
-peas_init_pygobject (void)
-{
- init_pygobject_check (PYGOBJECT_MAJOR_VERSION,
- PYGOBJECT_MINOR_VERSION,
- PYGOBJECT_MICRO_VERSION);
-}
-
static gboolean
peas_python_init (PeasPluginLoaderPython *loader)
{
@@ -468,7 +455,7 @@ peas_python_init (PeasPluginLoaderPython *loader)
peas_plugin_loader_python_add_module_path (loader, PEAS_PYEXECDIR);
/* import gobject */
- peas_init_pygobject ();
+ pygobject_init (PYGOBJECT_MAJOR_VERSION, PYGOBJECT_MINOR_VERSION, PYGOBJECT_MICRO_VERSION);
if (PyErr_Occurred ())
{
g_warning ("Error initializing Python interpreter: could not "
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]