reviewed by: Johan Dahlin

2007-07-02  Sebastian Granjoux  <seb.sfo@free.fr>

    reviewed by: Johan Dahlin

    * gobject/gobjectmodule.c: (pyg_gerror_exception_check):
    * tests/test_gtype.py:
    * tests/testhelpermodule.c: (_wrap_test_gerror_exception):

    Fix a bug in pyg_error_exception_check, add a test, Fixes #449879


svn path=/trunk/; revision=678

4 files changed, 51 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 6e87c8e..13b5b32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-07-02  Sebastian Granjoux  <seb.sfo@free.fr>
+
+	reviewed by: Johan Dahlin
+
+	* gobject/gobjectmodule.c: (pyg_gerror_exception_check):
+	* tests/test_gtype.py:
+	* tests/testhelpermodule.c: (_wrap_test_gerror_exception):
+
+	Fix a bug in pyg_error_exception_check, add a test, Fixes #449879
+
 2007-06-17  Gustavo J. A. M. Carneiro  <gjc@gnome.org>
 
 	* gobject/pygobject.h: Add a flags field to PyGObject; uses
diff --git a/gobject/gobjectmodule.c b/gobject/gobjectmodule.c
index 8316a20..bf7b42b 100644
--- a/gobject/gobjectmodule.c
+++ b/gobject/gobjectmodule.c
@@ -3044,7 +3044,7 @@ pyg_gerror_exception_check(GError **error)
         PyErr_Print();
         return -2;
     }
-    if (!value || !PyErr_GivenExceptionMatches(type, (PyObject *) &gerror_exc)) {
+    if (!value || !PyErr_GivenExceptionMatches(type, (PyObject *) gerror_exc)) {
         PyErr_Restore(type, value, traceback);
         PyErr_Print();
         return -2;
diff --git a/tests/test_gtype.py b/tests/test_gtype.py
index cbf3e1c..df75ccf 100644
--- a/tests/test_gtype.py
+++ b/tests/test_gtype.py
@@ -3,6 +3,16 @@ import unittest
 from gobject import GType
 from common import gobject, testhelper
 
+def raiseGError():
+    err = gobject.GError
+    err.message = "Test conversion between exception and GError"
+    err.code = 1
+    err.domain = ""
+    raise err
+
+def test_raiseGError():
+    testhelper.test_gerror_exception(raiseGError)
+
 class GTypeTest(unittest.TestCase):
     def checkType(self, expected, *objects):
         # First, double check so we get back what we sent
@@ -62,6 +72,9 @@ class GTypeTest(unittest.TestCase):
         array = [1, 2, 3, "foo", True, None]
         self.assertEqual(array, testhelper.test_value_array(array))
 
+    def testGError(self):
+        self.assertRaises(gobject.GError, test_raiseGError)
+
     # XXX: Flags, Enums
 
 class MyObject(gobject.GObject):
diff --git a/tests/testhelpermodule.c b/tests/testhelpermodule.c
index d35aecc..8d9419e 100644
--- a/tests/testhelpermodule.c
+++ b/tests/testhelpermodule.c
@@ -468,6 +468,32 @@ _wrap_test_value_array(PyObject *self, PyObject *args)
   return pyg_value_as_pyobject(value, FALSE);
 }
 
+static PyObject *
+_wrap_test_gerror_exception(PyObject *self, PyObject *args)
+{
+    PyObject *py_method;
+    PyObject *py_args;
+    PyObject *py_ret;
+    GError *err = NULL;
+
+    if (!PyArg_ParseTuple(args, "O", &py_method))
+        return NULL;
+
+    py_args = PyTuple_New(0);
+    py_ret = PyObject_CallObject(py_method, py_args);
+    if (pyg_gerror_exception_check(&err)) {
+        pyg_error_check(&err);
+        return NULL;
+    }	    
+
+    Py_DECREF(py_method);
+    Py_DECREF(py_args);
+    Py_DECREF(py_ret);
+
+    Py_INCREF(Py_None);
+    return Py_None;
+}
+
 static PyMethodDef testhelper_functions[] = {
     { "get_test_thread", (PyCFunction)_wrap_get_test_thread, METH_NOARGS },
     { "get_unknown", (PyCFunction)_wrap_get_unknown, METH_NOARGS },
@@ -475,6 +501,7 @@ static PyMethodDef testhelper_functions[] = {
     { "test_g_object_new", (PyCFunction)_wrap_test_g_object_new, METH_NOARGS },
     { "connectcallbacks", (PyCFunction)_wrap_connectcallbacks, METH_VARARGS },
     { "test_value_array", (PyCFunction)_wrap_test_value_array, METH_VARARGS },
+    { "test_gerror_exception", (PyCFunction)_wrap_test_gerror_exception, METH_VARARGS },
     { NULL, NULL }
 };