summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Dahlin <johan@gnome.org>2008-07-26 08:23:01 +0000
committerJohan Dahlin <johan@src.gnome.org>2008-07-26 08:23:01 +0000
commit215c9ddd9fbb3d2248a31acfb8e213a122be4cd1 (patch)
tree0e758f01735f95cf37c986cb367b33642607d8aa
parent6ac66c8fb6be0f3b27508582063afaced63250c1 (diff)
downloadpygobject-215c9ddd9fbb3d2248a31acfb8e213a122be4cd1.tar.gz
pygobject-215c9ddd9fbb3d2248a31acfb8e213a122be4cd1.tar.xz
pygobject-215c9ddd9fbb3d2248a31acfb8e213a122be4cd1.zip
Use g_slice_new instead of g_new
2008-07-26 Johan Dahlin <johan@gnome.org> * glib/glibmodule.c (child_watch_dnotify), (pyglib_child_watch_add): * glib/pygiochannel.c (pyg_iowatch_data_free), (py_io_channel_add_watch): * glib/pygspawn.c (_pyg_spawn_async_callback), (pyglib_spawn_async): Use g_slice_new instead of g_new svn path=/trunk/; revision=855
-rw-r--r--ChangeLog10
-rw-r--r--glib/glibmodule.c4
-rw-r--r--glib/pygiochannel.c4
-rw-r--r--glib/pygspawn.c6
4 files changed, 17 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 11caf73..25c7cf5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-07-26 Johan Dahlin <johan@gnome.org>
+
+ * glib/glibmodule.c (child_watch_dnotify),
+ (pyglib_child_watch_add):
+ * glib/pygiochannel.c (pyg_iowatch_data_free),
+ (py_io_channel_add_watch):
+ * glib/pygspawn.c (_pyg_spawn_async_callback),
+ (pyglib_spawn_async):
+ Use g_slice_new instead of g_new
+
2008-07-25 Johan Dahlin <johan@gnome.org>
* gobject/Makefile.am:
diff --git a/glib/glibmodule.c b/glib/glibmodule.c
index 830da13..0abf505 100644
--- a/glib/glibmodule.c
+++ b/glib/glibmodule.c
@@ -340,7 +340,7 @@ child_watch_dnotify(gpointer data)
struct _PyGChildData *child_data = (struct _PyGChildData *) data;
Py_DECREF(child_data->func);
Py_XDECREF(child_data->data);
- g_free(child_data);
+ g_slice_free(struct _PyGChildData, child_data);
}
@@ -364,7 +364,7 @@ pyglib_child_watch_add(PyObject *unused, PyObject *args, PyObject *kwargs)
return NULL;
}
- child_data = g_new(struct _PyGChildData, 1);
+ child_data = g_slice_new(struct _PyGChildData);
child_data->func = func;
child_data->data = user_data;
Py_INCREF(child_data->func);
diff --git a/glib/pygiochannel.c b/glib/pygiochannel.c
index 609cdab..697f91e 100644
--- a/glib/pygiochannel.c
+++ b/glib/pygiochannel.c
@@ -426,7 +426,7 @@ pyg_iowatch_data_free(PyGIOWatchData *data)
Py_DECREF(data->callback);
Py_XDECREF(data->user_data);
Py_DECREF(data->iochannel);
- g_free(data);
+ g_slice_free(PyGIOWatchData, data);
}
static gboolean
@@ -489,7 +489,7 @@ py_io_channel_add_watch(PyObject *self, PyObject *args, PyObject *kwargs)
return NULL;
}
- data = g_new(PyGIOWatchData, 1);
+ data = g_slice_new(PyGIOWatchData);
data->callback = callback; Py_INCREF(callback);
data->user_data = user_data; Py_XINCREF(user_data);
data->iochannel = self; Py_INCREF(self);
diff --git a/glib/pygspawn.c b/glib/pygspawn.c
index 7f35f58..515cdd9 100644
--- a/glib/pygspawn.c
+++ b/glib/pygspawn.c
@@ -132,7 +132,7 @@ _pyg_spawn_async_callback(gpointer user_data)
PyErr_Print();
Py_DECREF(data->func);
Py_XDECREF(data->data);
- g_free(data);
+ g_slice_free(struct _PyGChildSetupData, data);
pyglib_gil_state_release(gil);
}
@@ -234,7 +234,7 @@ pyglib_spawn_async(PyObject *object, PyObject *args, PyObject *kwargs)
g_free(envp);
return NULL;
}
- callback_data = g_new(struct _PyGChildSetupData, 1);
+ callback_data = g_slice_new(struct _PyGChildSetupData);
callback_data->func = func;
callback_data->data = user_data;
Py_INCREF(callback_data->func);
@@ -257,7 +257,7 @@ pyglib_spawn_async(PyObject *object, PyObject *args, PyObject *kwargs)
if (callback_data) {
Py_DECREF(callback_data->func);
Py_XDECREF(callback_data->data);
- g_free(callback_data);
+ g_slice_free(struct _PyGChildSetupData, callback_data);
}
pyglib_error_check(&error);
return NULL;