From d6aaef99542a1180fb4f980dd6888d1775f7fd91 Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Thu, 28 Mar 2019 22:45:23 +0100
Subject: [PATCH] clutter: Drop _() define

It's an unused no-op, we can do without it.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/672
---
 clutter/clutter/clutter-backend.c            |  2 +-
 clutter/clutter/clutter-image.c              |  6 +++---
 clutter/clutter/clutter-main.c               |  4 ++--
 clutter/clutter/clutter-private.h            |  1 -
 clutter/clutter/deprecated/clutter-texture.c | 12 ++++++------
 5 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/clutter/clutter/clutter-backend.c b/clutter/clutter/clutter-backend.c
index aad3d38f7..2aa7659f3 100644
--- a/clutter/clutter/clutter-backend.c
+++ b/clutter/clutter/clutter-backend.c
@@ -399,7 +399,7 @@ clutter_backend_real_create_context (ClutterBackend  *backend,
       else
         g_set_error_literal (error, CLUTTER_INIT_ERROR,
                              CLUTTER_INIT_ERROR_BACKEND,
-                            _("Unable to initialize the Clutter backend: no available drivers found."));
+                             "Unable to initialize the Clutter backend: no available drivers found.");
 
       return FALSE;
     }
diff --git a/clutter/clutter/clutter-image.c b/clutter/clutter/clutter-image.c
index 266c68799..61ad78c62 100644
--- a/clutter/clutter/clutter-image.c
+++ b/clutter/clutter/clutter-image.c
@@ -256,7 +256,7 @@ clutter_image_set_data (ClutterImage     *image,
     {
       g_set_error_literal (error, CLUTTER_IMAGE_ERROR,
                            CLUTTER_IMAGE_ERROR_INVALID_DATA,
-                           _("Unable to load image data"));
+                           "Unable to load image data");
       return FALSE;
     }
 
@@ -325,7 +325,7 @@ clutter_image_set_bytes (ClutterImage     *image,
     {
       g_set_error_literal (error, CLUTTER_IMAGE_ERROR,
                            CLUTTER_IMAGE_ERROR_INVALID_DATA,
-                           _("Unable to load image data"));
+                           "Unable to load image data");
       return FALSE;
     }
 
@@ -419,7 +419,7 @@ clutter_image_set_area (ClutterImage                 *image,
     {
       g_set_error_literal (error, CLUTTER_IMAGE_ERROR,
                            CLUTTER_IMAGE_ERROR_INVALID_DATA,
-                           _("Unable to load image data"));
+                           "Unable to load image data");
       return FALSE;
     }
 
diff --git a/clutter/clutter/clutter-main.c b/clutter/clutter/clutter-main.c
index 899799e53..76fbc7789 100644
--- a/clutter/clutter/clutter-main.c
+++ b/clutter/clutter/clutter-main.c
@@ -1279,8 +1279,8 @@ clutter_get_option_group (void)
   context = _clutter_context_get_default ();
 
   group = g_option_group_new ("clutter",
-                              _("Clutter Options"),
-                              _("Show Clutter Options"),
+                              "Clutter Options",
+                              "Show Clutter Options",
                               NULL,
                               NULL);
 
diff --git a/clutter/clutter/clutter-private.h b/clutter/clutter/clutter-private.h
index a4e69ce2b..b39e09d77 100644
--- a/clutter/clutter/clutter-private.h
+++ b/clutter/clutter/clutter-private.h
@@ -85,7 +85,6 @@ typedef struct _ClutterVertex4          ClutterVertex4;
 /* keep this for source compatibility with clutter */
 #define P_(String) (String)
 #define N_(String) (String)
-#define _(String) (String)
 
 /* This is a replacement for the nearbyint function which always rounds to the
  * nearest integer. nearbyint is apparently a C99 function so it might not
diff --git a/clutter/clutter/deprecated/clutter-texture.c b/clutter/clutter/deprecated/clutter-texture.c
index 2632fc19d..40da8efcb 100644
--- a/clutter/clutter/deprecated/clutter-texture.c
+++ b/clutter/clutter/deprecated/clutter-texture.c
@@ -1563,7 +1563,7 @@ clutter_texture_set_from_data (ClutterTexture     *texture,
 
       g_set_error (&inner_error, CLUTTER_TEXTURE_ERROR,
                    CLUTTER_TEXTURE_ERROR_BAD_FORMAT,
-                   _("Failed to load the image data"));
+                   "Failed to load the image data");
 
       g_signal_emit (texture, texture_signals[LOAD_FINISHED], 0, inner_error);
 
@@ -1722,7 +1722,7 @@ clutter_texture_set_from_yuv_data (ClutterTexture     *texture,
     {
       g_set_error (error, CLUTTER_TEXTURE_ERROR,
                    CLUTTER_TEXTURE_ERROR_NO_YUV,
-                   _("YUV textures are not supported"));
+                   "YUV textures are not supported");
       return FALSE;
     }
 
@@ -1731,7 +1731,7 @@ clutter_texture_set_from_yuv_data (ClutterTexture     *texture,
     {
       g_set_error (error, CLUTTER_TEXTURE_ERROR,
 		   CLUTTER_TEXTURE_ERROR_BAD_FORMAT,
-		   _("YUV2 textures are not supported"));
+		   "YUV2 textures are not supported");
       return FALSE;
     }
 
@@ -1958,7 +1958,7 @@ clutter_texture_async_load (ClutterTexture *self,
     {
       g_set_error (error, CLUTTER_TEXTURE_ERROR,
 		   CLUTTER_TEXTURE_ERROR_BAD_FORMAT,
-                   _("Failed to load the image data"));
+                   "Failed to load the image data");
       return FALSE;
     }
   else
@@ -2055,7 +2055,7 @@ clutter_texture_set_from_file (ClutterTexture *texture,
     {
       g_set_error (&internal_error, CLUTTER_TEXTURE_ERROR,
                    CLUTTER_TEXTURE_ERROR_BAD_FORMAT,
-		   _("Failed to load the image data"));
+		   "Failed to load the image data");
     }
 
   if (internal_error != NULL)
@@ -2357,7 +2357,7 @@ clutter_texture_set_area_from_rgb_data (ClutterTexture     *texture,
     {
       g_set_error (error, CLUTTER_TEXTURE_ERROR,
 		   CLUTTER_TEXTURE_ERROR_BAD_FORMAT,
-		   _("Failed to load the image data"));
+		   "Failed to load the image data");
       return FALSE;
     }