mirror of
https://github.com/brl/mutter.git
synced 2025-08-12 11:24:40 +00:00
src: Stop using GSlice
It has been inofficially deprecated for years, is known to cause issues with valgrind and potentially hides memory corruption. Lets stop using it. Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1512>
This commit is contained in:
@@ -129,13 +129,13 @@ static void
|
||||
meta_key_binding_free (MetaKeyBinding *binding)
|
||||
{
|
||||
resolved_key_combo_reset (&binding->resolved_combo);
|
||||
g_slice_free (MetaKeyBinding, binding);
|
||||
g_free (binding);
|
||||
}
|
||||
|
||||
static MetaKeyBinding *
|
||||
meta_key_binding_copy (MetaKeyBinding *binding)
|
||||
{
|
||||
MetaKeyBinding *clone = g_slice_dup (MetaKeyBinding, binding);
|
||||
MetaKeyBinding *clone = g_memdup2 (binding, sizeof (MetaKeyBinding));
|
||||
resolved_key_combo_copy (&binding->resolved_combo,
|
||||
&clone->resolved_combo);
|
||||
return clone;
|
||||
@@ -825,7 +825,7 @@ rebuild_binding_table (MetaKeyBindingManager *keys,
|
||||
{
|
||||
MetaKeyHandler *handler = HANDLER (pref->name);
|
||||
|
||||
b = g_slice_new0 (MetaKeyBinding);
|
||||
b = g_new0 (MetaKeyBinding, 1);
|
||||
b->name = pref->name;
|
||||
b->handler = handler;
|
||||
b->flags = handler->flags;
|
||||
@@ -848,7 +848,7 @@ rebuild_binding_table (MetaKeyBindingManager *keys,
|
||||
{
|
||||
MetaKeyHandler *handler = HANDLER ("external-grab");
|
||||
|
||||
b = g_slice_new0 (MetaKeyBinding);
|
||||
b = g_new0 (MetaKeyBinding, 1);
|
||||
b->name = grab->name;
|
||||
b->handler = handler;
|
||||
b->flags = grab->flags;
|
||||
@@ -1695,7 +1695,7 @@ meta_display_grab_accelerator (MetaDisplay *display,
|
||||
|
||||
g_hash_table_insert (external_grabs, grab->name, grab);
|
||||
|
||||
binding = g_slice_new0 (MetaKeyBinding);
|
||||
binding = g_new0 (MetaKeyBinding, 1);
|
||||
binding->name = grab->name;
|
||||
binding->handler = HANDLER ("external-grab");
|
||||
binding->combo = combo;
|
||||
|
@@ -201,7 +201,7 @@ meta_sequence_info_new (MetaGestureTracker *tracker,
|
||||
priv = meta_gesture_tracker_get_instance_private (tracker);
|
||||
ms = priv->autodeny_timeout;
|
||||
|
||||
info = g_slice_new0 (MetaSequenceInfo);
|
||||
info = g_new0 (MetaSequenceInfo, 1);
|
||||
info->tracker = tracker;
|
||||
info->sequence = event->touch.sequence;
|
||||
info->state = META_SEQUENCE_NONE;
|
||||
@@ -220,7 +220,7 @@ meta_sequence_info_free (MetaSequenceInfo *info)
|
||||
if (info->state == META_SEQUENCE_NONE)
|
||||
meta_gesture_tracker_set_sequence_state (info->tracker, info->sequence,
|
||||
META_SEQUENCE_REJECTED);
|
||||
g_slice_free (MetaSequenceInfo, info);
|
||||
g_free (info);
|
||||
}
|
||||
|
||||
static gboolean
|
||||
|
@@ -271,7 +271,7 @@ meta_stack_tracker_dump (MetaStackTracker *tracker)
|
||||
static void
|
||||
meta_stack_op_free (MetaStackOp *op)
|
||||
{
|
||||
g_slice_free (MetaStackOp, op);
|
||||
g_free (op);
|
||||
}
|
||||
|
||||
static int
|
||||
@@ -647,7 +647,7 @@ meta_stack_tracker_record_add (MetaStackTracker *tracker,
|
||||
guint64 window,
|
||||
gulong serial)
|
||||
{
|
||||
MetaStackOp *op = g_slice_new (MetaStackOp);
|
||||
MetaStackOp *op = g_new0 (MetaStackOp, 1);
|
||||
|
||||
op->any.type = STACK_OP_ADD;
|
||||
op->any.serial = serial;
|
||||
@@ -661,7 +661,7 @@ meta_stack_tracker_record_remove (MetaStackTracker *tracker,
|
||||
guint64 window,
|
||||
gulong serial)
|
||||
{
|
||||
MetaStackOp *op = g_slice_new (MetaStackOp);
|
||||
MetaStackOp *op = g_new0 (MetaStackOp, 1);
|
||||
|
||||
op->any.type = STACK_OP_REMOVE;
|
||||
op->any.serial = serial;
|
||||
@@ -676,7 +676,7 @@ meta_stack_tracker_record_raise_above (MetaStackTracker *tracker,
|
||||
guint64 sibling,
|
||||
gulong serial)
|
||||
{
|
||||
MetaStackOp *op = g_slice_new (MetaStackOp);
|
||||
MetaStackOp *op = g_new0 (MetaStackOp, 1);
|
||||
|
||||
op->any.type = STACK_OP_RAISE_ABOVE;
|
||||
op->any.serial = serial;
|
||||
@@ -692,7 +692,7 @@ meta_stack_tracker_record_lower_below (MetaStackTracker *tracker,
|
||||
guint64 sibling,
|
||||
gulong serial)
|
||||
{
|
||||
MetaStackOp *op = g_slice_new (MetaStackOp);
|
||||
MetaStackOp *op = g_new0 (MetaStackOp, 1);
|
||||
|
||||
op->any.type = STACK_OP_LOWER_BELOW;
|
||||
op->any.serial = serial;
|
||||
|
Reference in New Issue
Block a user