From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 3 Mar 2023 11:41:41 +0000 (-0500)
Subject: gdk: Stop using g_slice
X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~1^2~553^2~7
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=98ff6c0d4d18b2b5e58f99d86c8a8af0db9b4a06;p=gtk4.git

gdk: Stop using g_slice
---

diff --git a/gdk/gdkclipboard.c b/gdk/gdkclipboard.c
index 349b993740..b1f56715a7 100644
--- a/gdk/gdkclipboard.c
+++ b/gdk/gdkclipboard.c
@@ -750,7 +750,7 @@ static void
 free_value (gpointer value)
 {
   g_value_unset (value);
-  g_slice_free (GValue, value);
+  g_free (value);
 }
 
 static void
@@ -771,7 +771,7 @@ gdk_clipboard_read_value_internal (GdkClipboard        *clipboard,
   task = g_task_new (clipboard, cancellable, callback, user_data);
   g_task_set_priority (task, io_priority);
   g_task_set_source_tag (task, source_tag);
-  value = g_slice_new0 (GValue);
+  value = g_new0 (GValue, 1);
   g_value_init (value, type);
   g_task_set_task_data (task, value, free_value);
 
diff --git a/gdk/gdkcontentdeserializer.c b/gdk/gdkcontentdeserializer.c
index 7511aba467..e270de5bae 100644
--- a/gdk/gdkcontentdeserializer.c
+++ b/gdk/gdkcontentdeserializer.c
@@ -410,7 +410,7 @@ gdk_content_register_deserializer (const char                *mime_type,
   g_return_if_fail (mime_type != NULL);
   g_return_if_fail (deserialize != NULL);
 
-  deserializer = g_slice_new0 (Deserializer);
+  deserializer = g_new0 (Deserializer, 1);
 
   deserializer->mime_type = g_intern_string (mime_type);
   deserializer->type = type;
diff --git a/gdk/gdkcontentformats.c b/gdk/gdkcontentformats.c
index 172fa1712e..cb2528fbee 100644
--- a/gdk/gdkcontentformats.c
+++ b/gdk/gdkcontentformats.c
@@ -112,7 +112,7 @@ gdk_content_formats_new_take (GType *      gtypes,
                               const char **mime_types,
                               gsize        n_mime_types)
 {
-  GdkContentFormats *result = g_slice_new0 (GdkContentFormats);
+  GdkContentFormats *result = g_new0 (GdkContentFormats, 1);
   result->ref_count = 1;
 
   result->gtypes = gtypes;
@@ -287,7 +287,7 @@ gdk_content_formats_unref (GdkContentFormats *formats)
 
   g_free (formats->gtypes);
   g_free (formats->mime_types);
-  g_slice_free (GdkContentFormats, formats);
+  g_free (formats);
 }
 
 /**
@@ -611,7 +611,7 @@ gdk_content_formats_builder_new (void)
 {
   GdkContentFormatsBuilder *builder;
 
-  builder = g_slice_new0 (GdkContentFormatsBuilder);
+  builder = g_new0 (GdkContentFormatsBuilder, 1);
   builder->ref_count = 1;
 
   return builder;
@@ -665,7 +665,7 @@ gdk_content_formats_builder_unref (GdkContentFormatsBuilder *builder)
     return;
 
   gdk_content_formats_builder_clear (builder);
-  g_slice_free (GdkContentFormatsBuilder, builder);
+  g_free (builder);
 }
 
 /**
diff --git a/gdk/gdkcontentserializer.c b/gdk/gdkcontentserializer.c
index da9f668d8c..16fe2c5870 100644
--- a/gdk/gdkcontentserializer.c
+++ b/gdk/gdkcontentserializer.c
@@ -416,7 +416,7 @@ gdk_content_register_serializer (GType                    type,
   g_return_if_fail (mime_type != NULL);
   g_return_if_fail (serialize != NULL);
 
-  serializer = g_slice_new0 (Serializer);
+  serializer = g_new0 (Serializer, 1);
 
   serializer->mime_type = g_intern_string (mime_type);
   serializer->type = type;
diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index bebe26f38c..32ad4aee7a 100644
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -322,7 +322,7 @@ static void
 free_pointer_info (GdkPointerSurfaceInfo *info)
 {
   g_clear_object (&info->surface_under_pointer);
-  g_slice_free (GdkPointerSurfaceInfo, info);
+  g_free (info);
 }
 
 static void
@@ -834,7 +834,7 @@ _gdk_display_get_pointer_info (GdkDisplay *display,
 
   if (G_UNLIKELY (!info))
     {
-      info = g_slice_new0 (GdkPointerSurfaceInfo);
+      info = g_new0 (GdkPointerSurfaceInfo, 1);
       g_hash_table_insert (display->pointers_info, device, info);
     }
 
diff --git a/gdk/gdkdrop.c b/gdk/gdkdrop.c
index afc51aeda2..df0bb067cb 100644
--- a/gdk/gdkdrop.c
+++ b/gdk/gdkdrop.c
@@ -767,7 +767,7 @@ static void
 free_value (gpointer value)
 {
   g_value_unset (value);
-  g_slice_free (GValue, value);
+  g_free (value);
 }
 
 static void
@@ -790,7 +790,7 @@ gdk_drop_read_value_internal (GdkDrop             *self,
   task = g_task_new (self, cancellable, callback, user_data);
   g_task_set_priority (task, io_priority);
   g_task_set_source_tag (task, source_tag);
-  value = g_slice_new0 (GValue);
+  value = g_new0 (GValue, 1);
   g_value_init (value, type);
   g_task_set_task_data (task, value, free_value);
 
diff --git a/gdk/gdkframetimings.c b/gdk/gdkframetimings.c
index 22d9623746..e15890fff5 100644
--- a/gdk/gdkframetimings.c
+++ b/gdk/gdkframetimings.c
@@ -43,7 +43,7 @@ _gdk_frame_timings_new (gint64 frame_counter)
 {
   GdkFrameTimings *timings;
 
-  timings = g_slice_new0 (GdkFrameTimings);
+  timings = g_new0 (GdkFrameTimings, 1);
   timings->ref_count = 1;
   timings->frame_counter = frame_counter;
 
@@ -99,9 +99,7 @@ gdk_frame_timings_unref (GdkFrameTimings *timings)
 
   timings->ref_count--;
   if (timings->ref_count == 0)
-    {
-      g_slice_free (GdkFrameTimings, timings);
-    }
+    g_free (timings);
 }
 
 /**
diff --git a/gdk/gdkpipeiostream.c b/gdk/gdkpipeiostream.c
index 55221603bf..6dabda9de7 100644
--- a/gdk/gdkpipeiostream.c
+++ b/gdk/gdkpipeiostream.c
@@ -50,7 +50,7 @@ gdk_io_pipe_new (void)
 {
   GdkIOPipe *pipe;
 
-  pipe = g_slice_new0 (GdkIOPipe);
+  pipe = g_new0 (GdkIOPipe, 1);
   pipe->ref_count = 1;
 
   g_mutex_init (&pipe->mutex);
@@ -76,7 +76,7 @@ gdk_io_pipe_unref (GdkIOPipe *pipe)
   g_cond_clear (&pipe->cond);
   g_mutex_clear (&pipe->mutex);
 
-  g_slice_free (GdkIOPipe, pipe);
+  g_free (pipe);
 }
 
 static void
diff --git a/gdk/gdkrgba.c b/gdk/gdkrgba.c
index 9b52204038..f80c9df98a 100644
--- a/gdk/gdkrgba.c
+++ b/gdk/gdkrgba.c
@@ -67,7 +67,12 @@ G_DEFINE_BOXED_TYPE (GdkRGBA, gdk_rgba,
 GdkRGBA *
 gdk_rgba_copy (const GdkRGBA *rgba)
 {
-  return g_slice_dup (GdkRGBA, rgba);
+  GdkRGBA *copy;
+
+  copy = g_new (GdkRGBA, 1);
+  memcpy (copy, rgba, sizeof (GdkRGBA));
+
+  return copy;
 }
 
 /**
@@ -79,7 +84,7 @@ gdk_rgba_copy (const GdkRGBA *rgba)
 void
 gdk_rgba_free (GdkRGBA *rgba)
 {
-  g_slice_free (GdkRGBA, rgba);
+  g_free (rgba);
 }
 
 /**
diff --git a/gdk/gdktexturedownloader.c b/gdk/gdktexturedownloader.c
index 4a948dc40a..a3d25e7bb7 100644
--- a/gdk/gdktexturedownloader.c
+++ b/gdk/gdktexturedownloader.c
@@ -76,7 +76,7 @@ gdk_texture_downloader_new (GdkTexture *texture)
 
   g_return_val_if_fail (GDK_IS_TEXTURE (texture), NULL);
 
-  self = g_slice_new (GdkTextureDownloader);
+  self = g_new (GdkTextureDownloader, 1);
   gdk_texture_downloader_init (self, texture);
 
   return self;
@@ -121,7 +121,7 @@ gdk_texture_downloader_free (GdkTextureDownloader *self)
   g_return_if_fail (self != NULL);
 
   gdk_texture_downloader_finish (self);
-  g_slice_free (GdkTextureDownloader, self);
+  g_free (self);
 }
 
 /**