[Xfce4-commits] <xfce4-settings:master> Missed two memory allocation conversions.

[Nick Schermer]

Updating branch refs/heads/master
         to a3e511c8d37b9e4036d6db3e6be6e7a01b6f466f (commit)
       from 3213df6a2ecc810da22cb8d484b52dc230326a47 (commit)

commit a3e511c8d37b9e4036d6db3e6be6e7a01b6f466f
Author: Nick Schermer <nick at xfce.org>
Date:   Sun May 8 12:02:23 2011 +0200

    Missed two memory allocation conversions.

 xfsettingsd/clipboard-manager.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/xfsettingsd/clipboard-manager.c b/xfsettingsd/clipboard-manager.c
index d3b0290..0bfe5c1 100644
--- a/xfsettingsd/clipboard-manager.c
+++ b/xfsettingsd/clipboard-manager.c
@@ -393,7 +393,7 @@ receive_incrementally (GsdClipboardManager *manager,
                         tdata->data = data;
                         tdata->length = length;
                 } else {
-                        tdata->data = realloc (tdata->data, tdata->length + length + 1);
+                        tdata->data = g_realloc (tdata->data, tdata->length + length + 1);
                         memcpy (tdata->data + tdata->length, data, length + 1);
                         tdata->length += length;
                         XFree (data);
@@ -642,7 +642,7 @@ convert_clipboard (GsdClipboardManager *manager,
                 }
 
                 for (i = 0; i < nitems; i += 2) {
-                        rdata = (IncrConversion *) malloc (sizeof (IncrConversion));
+                        rdata = g_slice_new (IncrConversion);
                         rdata->requestor = xev->xselectionrequest.requestor;
                         rdata->target = multiple[i];
                         rdata->property = multiple[i+1];