[pygobject] Fix deprecated g_value_[gs]et_char()
- From: Martin Pitt <martinpitt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pygobject] Fix deprecated g_value_[gs]et_char()
- Date: Wed, 15 Feb 2012 13:36:52 +0000 (UTC)
commit 18342edded05d3d9cccf648ed92bc1cac95c51eb
Author: Martin Pitt <martin pitt ubuntu com>
Date: Wed Feb 15 13:31:23 2012 +0100
Fix deprecated g_value_[gs]et_char()
Replace with _schar(). We depend on glib >= 2.31 already.
gi/_gobject/ffi-marshaller.c | 2 +-
gi/_gobject/pygtype.c | 6 +++---
gi/pygi-argument.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/gi/_gobject/ffi-marshaller.c b/gi/_gobject/ffi-marshaller.c
index 60cfc34..39ebe16 100644
--- a/gi/_gobject/ffi-marshaller.c
+++ b/gi/_gobject/ffi-marshaller.c
@@ -102,7 +102,7 @@ g_value_from_ffi_type (GValue *gvalue, gpointer *value)
g_value_set_string (gvalue, *(gchar**)value);
break;
case G_TYPE_CHAR:
- g_value_set_char (gvalue, *(gchar*)value);
+ g_value_set_schar (gvalue, *(gchar*)value);
break;
case G_TYPE_UCHAR:
g_value_set_uchar (gvalue, *(guchar*)value);
diff --git a/gi/_gobject/pygtype.c b/gi/_gobject/pygtype.c
index ffd99a5..79e9dc6 100644
--- a/gi/_gobject/pygtype.c
+++ b/gi/_gobject/pygtype.c
@@ -768,12 +768,12 @@ pyg_value_from_pyobject(GValue *value, PyObject *obj)
case G_TYPE_CHAR:
#if PY_VERSION_HEX < 0x03000000
if (PyString_Check(obj)) {
- g_value_set_char(value, PyString_AsString(obj)[0]);
+ g_value_set_schar(value, PyString_AsString(obj)[0]);
} else
#endif
if (PyUnicode_Check(obj)) {
tmp = PyUnicode_AsUTF8String(obj);
- g_value_set_char(value, PYGLIB_PyBytes_AsString(tmp)[0]);
+ g_value_set_schar(value, PYGLIB_PyBytes_AsString(tmp)[0]);
Py_DECREF(tmp);
} else {
PyErr_Clear();
@@ -1027,7 +1027,7 @@ pyg_value_as_pyobject(const GValue *value, gboolean copy_boxed)
else
break;
case G_TYPE_CHAR: {
- gint8 val = g_value_get_char(value);
+ gint8 val = g_value_get_schar(value);
return PYGLIB_PyUnicode_FromStringAndSize((char *)&val, 1);
}
case G_TYPE_UCHAR: {
diff --git a/gi/pygi-argument.c b/gi/pygi-argument.c
index fce91b4..4cfacfc 100644
--- a/gi/pygi-argument.c
+++ b/gi/pygi-argument.c
@@ -1839,7 +1839,7 @@ _pygi_argument_from_g_value(const GValue *value,
arg.v_uint = g_value_get_uint (value);
break;
case GI_TYPE_TAG_UNICHAR:
- arg.v_uint32 = g_value_get_char (value);
+ arg.v_uint32 = g_value_get_schar (value);
break;
case GI_TYPE_TAG_FLOAT:
arg.v_float = g_value_get_float (value);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]