pygobject r855 - in trunk: . glib

[johan svn gnome org]

Author: johan
Date: Sat Jul 26 08:23:01 2008
New Revision: 855
URL: http://svn.gnome.org/viewvc/pygobject?rev=855&view=rev

Log:
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



Modified:
   trunk/ChangeLog
   trunk/glib/glibmodule.c
   trunk/glib/pygiochannel.c
   trunk/glib/pygspawn.c

Modified: trunk/glib/glibmodule.c
==============================================================================
--- trunk/glib/glibmodule.c	(original)
+++ trunk/glib/glibmodule.c	Sat Jul 26 08:23:01 2008
@@ -340,7 +340,7 @@
     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 @@
         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);

Modified: trunk/glib/pygiochannel.c
==============================================================================
--- trunk/glib/pygiochannel.c	(original)
+++ trunk/glib/pygiochannel.c	Sat Jul 26 08:23:01 2008
@@ -426,7 +426,7 @@
     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 @@
         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);

Modified: trunk/glib/pygspawn.c
==============================================================================
--- trunk/glib/pygspawn.c	(original)
+++ trunk/glib/pygspawn.c	Sat Jul 26 08:23:01 2008
@@ -132,7 +132,7 @@
 	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 @@
                 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 @@
         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;