From c0e479bfab91e9972219acdb6bb232c846a36242 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Sun, 24 Dec 2006 05:32:38 +0000 Subject: [PATCH] Use gslice for GtkBorder (#383557). 2006-12-24 Behdad Esfahbod * gtk/gtkstyle.c (gtk_border_copy), (gtk_border_free): Use gslice for GtkBorder (#383557). --- ChangeLog | 5 +++++ gtk/gtkstyle.c | 12 ++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2078b6cc62..07aa9703e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-12-24 Behdad Esfahbod + + * gtk/gtkstyle.c (gtk_border_copy), (gtk_border_free): Use gslice for + GtkBorder (#383557). + 2006-12-24 Behdad Esfahbod Bug 340141 – Update to Pango 1.16 API diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c index e10f743bd3..b7d1d8f0a8 100644 --- a/gtk/gtkstyle.c +++ b/gtk/gtkstyle.c @@ -6407,7 +6407,15 @@ gtk_paint_resize_grip (GtkStyle *style, GtkBorder * gtk_border_copy (const GtkBorder *border) { - return (GtkBorder *)g_memdup (border, sizeof (GtkBorder)); + GtkBorder *ret; + + g_return_val_if_fail (border != NULL, NULL); + + ret = g_slice_new (GtkBorder); + + *ret = *border; + + return ret; } /** @@ -6419,7 +6427,7 @@ gtk_border_copy (const GtkBorder *border) void gtk_border_free (GtkBorder *border) { - g_free (border); + g_slice_free (GtkBorder, border); } GType