[pygobject] gerror: Add "_to_py" suffix to pygi_error_marshal



commit 2fc1a689a81614649d042965997f4546b0a58ada
Author: Simon Feltman <sfeltman src gnome org>
Date:   Sat Feb 27 17:21:53 2016 -0800

    gerror: Add "_to_py" suffix to pygi_error_marshal
    
    This will allow for the a pygi_error_marshal_from_py function.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=685197

 gi/pygi-error.c |    8 ++++----
 gi/pygi-error.h |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/gi/pygi-error.c b/gi/pygi-error.c
index b019a09..725c7c6 100644
--- a/gi/pygi-error.c
+++ b/gi/pygi-error.c
@@ -29,7 +29,7 @@ static PyObject *PyGError = NULL;
 static PyObject *exception_table = NULL;
 
 /**
- * pygi_error_marshal:
+ * pygi_error_marshal_to_py:
  * @error: a pointer to the GError.
  *
  * Checks to see if @error has been set.  If @error has been set, then a
@@ -38,7 +38,7 @@ static PyObject *exception_table = NULL;
  * Returns: a GLib.GError Python exception object, or NULL.
  */
 PyObject *
-pygi_error_marshal (GError **error)
+pygi_error_marshal_to_py (GError **error)
 {
     PyGILState_STATE state;
     PyObject *exc_type;
@@ -97,7 +97,7 @@ pygi_error_check (GError **error)
 
     state = pyglib_gil_state_ensure();
 
-    exc_instance = pygi_error_marshal (error);
+    exc_instance = pygi_error_marshal_to_py (error);
     PyErr_SetObject(PyGError, exc_instance);
     Py_DECREF(exc_instance);
     g_clear_error(error);
@@ -235,7 +235,7 @@ _pygi_marshal_to_py_gerror (PyGIInvokeState   *state,
     GError *error = arg->v_pointer;
     PyObject *py_obj = NULL;
 
-    py_obj = pygi_error_marshal (&error);
+    py_obj = pygi_error_marshal_to_py (&error);
 
     if (arg_cache->transfer == GI_TRANSFER_EVERYTHING && error != NULL) {
         g_error_free (error);
diff --git a/gi/pygi-error.h b/gi/pygi-error.h
index 72d2be0..2ef62f9 100644
--- a/gi/pygi-error.h
+++ b/gi/pygi-error.h
@@ -29,7 +29,7 @@ G_BEGIN_DECLS
 
 gboolean      pygi_error_check              (GError **error);
 
-PyObject*     pygi_error_marshal            (GError **error);
+PyObject*     pygi_error_marshal_to_py      (GError **error);
 
 gboolean      pygi_gerror_exception_check   (GError **error);
 


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