From 50ce759eca180200175916edd961fe331eeb1904 Mon Sep 17 00:00:00 2001
From: Michael Natterer <mitch@gimp.org>
Date: Thu, 10 Jul 2025 23:27:54 +0200
Subject: [PATCH] libgimp*: revert using g_set_str() outside app/

---
 libgimpthumb/gimpthumbnail.c            |  6 ++++--
 libgimpwidgets/gimpcellrenderertoggle.c |  4 +++-
 libgimpwidgets/gimpcontroller.c         | 10 ++++++----
 libgimpwidgets/gimpdialog.c             |  3 ++-
 libgimpwidgets/gimplabelstringwidget.c  |  7 ++++---
 libgimpwidgets/gimpunitstore.c          | 10 ++++------
 6 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/libgimpthumb/gimpthumbnail.c b/libgimpthumb/gimpthumbnail.c
index 5f46ebc3c4..407c972a64 100644
--- a/libgimpthumb/gimpthumbnail.c
+++ b/libgimpthumb/gimpthumbnail.c
@@ -312,7 +312,8 @@ gimp_thumbnail_set_property (GObject      *object,
       thumbnail->image_filesize = g_value_get_int64 (value);
       break;
     case PROP_IMAGE_MIMETYPE:
-      g_set_str (&thumbnail->image_mimetype, g_value_get_string (value));
+      g_free (thumbnail->image_mimetype);
+      thumbnail->image_mimetype = g_value_dup_string (value);
       break;
     case PROP_IMAGE_WIDTH:
       thumbnail->image_width = g_value_get_int (value);
@@ -321,7 +322,8 @@ gimp_thumbnail_set_property (GObject      *object,
       thumbnail->image_height = g_value_get_int (value);
       break;
     case PROP_IMAGE_TYPE:
-      g_set_str (&thumbnail->image_type, g_value_get_string (value));
+      g_free (thumbnail->image_type);
+      thumbnail->image_type = g_value_dup_string (value);
       break;
     case PROP_IMAGE_NUM_LAYERS:
       thumbnail->image_num_layers = g_value_get_int (value);
diff --git a/libgimpwidgets/gimpcellrenderertoggle.c b/libgimpwidgets/gimpcellrenderertoggle.c
index 9906314713..79e541decb 100644
--- a/libgimpwidgets/gimpcellrenderertoggle.c
+++ b/libgimpwidgets/gimpcellrenderertoggle.c
@@ -217,7 +217,9 @@ gimp_cell_renderer_toggle_set_property (GObject      *object,
   switch (param_id)
     {
     case PROP_ICON_NAME:
-      g_set_str (&toggle->icon_name, g_value_get_string (value));
+      if (toggle->icon_name)
+        g_free (toggle->icon_name);
+      toggle->icon_name = g_value_dup_string (value);
       break;
 
     case PROP_ICON_SIZE:
diff --git a/libgimpwidgets/gimpcontroller.c b/libgimpwidgets/gimpcontroller.c
index de47a734b3..df76176b4b 100644
--- a/libgimpwidgets/gimpcontroller.c
+++ b/libgimpwidgets/gimpcontroller.c
@@ -164,12 +164,15 @@ gimp_controller_set_property (GObject      *object,
   switch (property_id)
     {
     case PROP_NAME:
-      g_set_str (&priv->name, g_value_get_string (value));
+      if (priv->name)
+        g_free (priv->name);
+      priv->name = g_value_dup_string (value);
       break;
     case PROP_STATE:
-      g_set_str (&priv->state, g_value_get_string (value));
+      if (priv->state)
+        g_free (priv->state);
+      priv->state = g_value_dup_string (value);
       break;
-
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
       break;
@@ -193,7 +196,6 @@ gimp_controller_get_property (GObject    *object,
     case PROP_STATE:
       g_value_set_string (value, priv->state);
       break;
-
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
       break;
diff --git a/libgimpwidgets/gimpdialog.c b/libgimpwidgets/gimpdialog.c
index cde655269f..da6004f123 100644
--- a/libgimpwidgets/gimpdialog.c
+++ b/libgimpwidgets/gimpdialog.c
@@ -248,7 +248,8 @@ gimp_dialog_set_property (GObject      *object,
       break;
 
     case PROP_HELP_ID:
-      g_set_str (&private->help_id, g_value_get_string (value));
+      g_free (private->help_id);
+      private->help_id = g_value_dup_string (value);
       gimp_help_set_help_data (GTK_WIDGET (object), NULL, private->help_id);
       break;
 
diff --git a/libgimpwidgets/gimplabelstringwidget.c b/libgimpwidgets/gimplabelstringwidget.c
index c4b7f80c7c..c0f3ec2d4a 100644
--- a/libgimpwidgets/gimplabelstringwidget.c
+++ b/libgimpwidgets/gimplabelstringwidget.c
@@ -179,10 +179,11 @@ gimp_label_string_widget_set_property (GObject      *object,
   switch (property_id)
     {
     case PROP_VALUE:
-      if (g_set_str (&widget->value, g_value_get_string (value)))
+      if (g_strcmp0 (widget->value, g_value_get_string (value)) != 0)
         {
-          g_signal_emit (object,
-                         gimp_label_string_widget_signals[VALUE_CHANGED], 0);
+          g_free (widget->value);
+          widget->value = g_value_dup_string (value);
+          g_signal_emit (object, gimp_label_string_widget_signals[VALUE_CHANGED], 0);
         }
       break;
     case PROP_WIDGET:
diff --git a/libgimpwidgets/gimpunitstore.c b/libgimpwidgets/gimpunitstore.c
index 72750d6604..58d4f99eca 100644
--- a/libgimpwidgets/gimpunitstore.c
+++ b/libgimpwidgets/gimpunitstore.c
@@ -244,25 +244,23 @@ gimp_unit_store_set_property (GObject      *object,
           private->resolutions = g_new0 (gdouble, private->num_values);
         }
       break;
-
     case PROP_HAS_PIXELS:
       gimp_unit_store_set_has_pixels (GIMP_UNIT_STORE (object),
                                       g_value_get_boolean (value));
       break;
-
     case PROP_HAS_PERCENT:
       gimp_unit_store_set_has_percent (GIMP_UNIT_STORE (object),
                                        g_value_get_boolean (value));
       break;
-
     case PROP_SHORT_FORMAT:
-      g_set_str (&private->short_format, g_value_get_string (value));
+      g_free (private->short_format);
+      private->short_format = g_value_dup_string (value);
       if (! private->short_format)
         private->short_format = g_strdup ("%a");
       break;
-
     case PROP_LONG_FORMAT:
-      g_set_str (&private->long_format, g_value_get_string (value));
+      g_free (private->long_format);
+      private->long_format = g_value_dup_string (value);
       if (! private->long_format)
         private->long_format = g_strdup ("%a");
       break;