From ca19109ac6f2aee2f7340068e4e9fd66b0b626d9 Mon Sep 17 00:00:00 2001
From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
Date: Thu, 31 Mar 2022 13:16:53 -0300
Subject: [PATCH] clutter/image: Drop ClutterImageError

Error can be delegated to Cogl now.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2355>
---
 clutter/clutter/clutter-image.c | 33 ++++++---------------------------
 clutter/clutter/clutter-image.h | 25 -------------------------
 2 files changed, 6 insertions(+), 52 deletions(-)

diff --git a/clutter/clutter/clutter-image.c b/clutter/clutter/clutter-image.c
index 6af4afc03..2ca059fcb 100644
--- a/clutter/clutter/clutter-image.c
+++ b/clutter/clutter/clutter-image.c
@@ -62,12 +62,6 @@ G_DEFINE_TYPE_WITH_CODE (ClutterImage, clutter_image, G_TYPE_OBJECT,
                          G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_CONTENT,
                                                 clutter_content_iface_init))
 
-GQuark
-clutter_image_error_quark (void)
-{
-  return g_quark_from_static_string ("clutter-image-error-quark");
-}
-
 static CoglTexture *
 create_texture_from_data (unsigned int      width,
                           unsigned int      height,
@@ -268,15 +262,10 @@ clutter_image_set_data (ClutterImage     *image,
                                             pixel_format,
                                             row_stride,
                                             data,
-                                            NULL);
+                                            error);
 
   if (priv->texture == NULL)
-    {
-      g_set_error_literal (error, CLUTTER_IMAGE_ERROR,
-                           CLUTTER_IMAGE_ERROR_INVALID_DATA,
-                           "Unable to load image data");
-      return FALSE;
-    }
+    return FALSE;
 
   clutter_content_invalidate (CLUTTER_CONTENT (image));
   update_image_size (image);
@@ -333,15 +322,10 @@ clutter_image_set_bytes (ClutterImage     *image,
                                             pixel_format,
                                             row_stride,
                                             g_bytes_get_data (data, NULL),
-                                            NULL);
+                                            error);
 
   if (priv->texture == NULL)
-    {
-      g_set_error_literal (error, CLUTTER_IMAGE_ERROR,
-                           CLUTTER_IMAGE_ERROR_INVALID_DATA,
-                           "Unable to load image data");
-      return FALSE;
-    }
+    return FALSE;
 
   clutter_content_invalidate (CLUTTER_CONTENT (image));
   update_image_size (image);
@@ -401,7 +385,7 @@ clutter_image_set_area (ClutterImage                 *image,
                                                 pixel_format,
                                                 row_stride,
                                                 data,
-                                                NULL);
+                                                error);
     }
   else
     {
@@ -424,12 +408,7 @@ clutter_image_set_area (ClutterImage                 *image,
     }
 
   if (priv->texture == NULL)
-    {
-      g_set_error_literal (error, CLUTTER_IMAGE_ERROR,
-                           CLUTTER_IMAGE_ERROR_INVALID_DATA,
-                           "Unable to load image data");
-      return FALSE;
-    }
+    return FALSE;
 
   clutter_content_invalidate (CLUTTER_CONTENT (image));
   update_image_size (image);
diff --git a/clutter/clutter/clutter-image.h b/clutter/clutter/clutter-image.h
index 7f02099e6..b220a49f8 100644
--- a/clutter/clutter/clutter-image.h
+++ b/clutter/clutter/clutter-image.h
@@ -41,33 +41,10 @@ G_BEGIN_DECLS
 #define CLUTTER_IS_IMAGE_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_IMAGE))
 #define CLUTTER_IMAGE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_IMAGE, ClutterImageClass))
 
-/**
- * CLUTTER_IMAGE_ERROR:
- *
- * Error domain for the #ClutterImageError enumeration.
- *
- * Since: 1.10
- */
-#define CLUTTER_IMAGE_ERROR             (clutter_image_error_quark ())
-
 typedef struct _ClutterImage           ClutterImage;
 typedef struct _ClutterImagePrivate    ClutterImagePrivate;
 typedef struct _ClutterImageClass      ClutterImageClass;
 
-/**
- * ClutterImageError:
- * @CLUTTER_IMAGE_ERROR_INVALID_DATA: Invalid data passed to the
- *   clutter_image_set_data() function.
- *
- * Error enumeration for #ClutterImage.
- *
- * Since: 1.10
- */
-typedef enum
-{
-  CLUTTER_IMAGE_ERROR_INVALID_DATA
-} ClutterImageError;
-
 /**
  * ClutterImage:
  *
@@ -101,8 +78,6 @@ struct _ClutterImageClass
   gpointer _padding[16];
 };
 
-CLUTTER_EXPORT
-GQuark clutter_image_error_quark (void);
 CLUTTER_EXPORT
 GType clutter_image_get_type (void) G_GNUC_CONST;