From 89ea91df969b72e40d5e53bce4668be8d0dc94b0 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Tue, 8 Jul 2025 00:29:41 +0200 Subject: [PATCH] app, libgimp*: more g_set_str() and some other stuff in the same spirit --- app/config/gimpdialogconfig.c | 18 +++++--------- app/config/gimpdisplayconfig.c | 6 ++--- app/config/gimpearlyrc.c | 3 +-- app/config/gimpgeglconfig.c | 9 +++---- app/config/gimpguiconfig.c | 18 +++++--------- app/config/gimppluginconfig.c | 23 ++++------------- app/core/gimpcontext.c | 33 +++++++++---------------- app/core/gimptemplate.c | 16 +++--------- app/display/gimpcanvastext.c | 2 +- app/display/gimpdisplayshell.c | 6 ++--- app/display/gimptoolline.c | 3 +-- app/display/gimptoolrectangle.c | 3 +-- app/paint/gimppaintcore.c | 3 +-- app/text/gimptext.c | 11 +++------ app/tools/gimpbucketfilloptions.c | 3 +-- app/tools/gimptextoptions.c | 3 +-- app/widgets/gimpdockwindow.c | 1 - app/widgets/gimpsettingsbox.c | 25 ++++++------------- app/widgets/gimpstringaction.c | 5 ++-- libgimp/gimpprocedure.c | 1 - libgimpthumb/gimpthumbnail.c | 6 ++--- libgimpwidgets/gimpcellrenderertoggle.c | 4 +-- libgimpwidgets/gimpcontroller.c | 10 +++----- libgimpwidgets/gimpdialog.c | 3 +-- libgimpwidgets/gimplabelstringwidget.c | 7 +++--- libgimpwidgets/gimpunitstore.c | 10 +++++--- 26 files changed, 77 insertions(+), 155 deletions(-) diff --git a/app/config/gimpdialogconfig.c b/app/config/gimpdialogconfig.c index 89b934b087..aa29c744ef 100644 --- a/app/config/gimpdialogconfig.c +++ b/app/config/gimpdialogconfig.c @@ -632,8 +632,7 @@ gimp_dialog_config_set_property (GObject *object, break; case PROP_COLOR_PROFILE_PATH: - g_set_str (&config->color_profile_path, - g_value_get_string (value)); + g_set_str (&config->color_profile_path, g_value_get_string (value)); break; case PROP_IMAGE_CONVERT_PROFILE_INTENT: @@ -686,8 +685,7 @@ gimp_dialog_config_set_property (GObject *object, break; case PROP_LAYER_NEW_NAME: - g_set_str (&config->layer_new_name, - g_value_get_string (value)); + g_set_str (&config->layer_new_name, g_value_get_string (value)); break; case PROP_LAYER_NEW_MODE: config->layer_new_mode = g_value_get_enum (value); @@ -730,8 +728,7 @@ gimp_dialog_config_set_property (GObject *object, break; case PROP_CHANNEL_NEW_NAME: - g_set_str (&config->channel_new_name, - g_value_get_string (value)); + g_set_str (&config->channel_new_name, g_value_get_string (value)); break; case PROP_CHANNEL_NEW_COLOR: g_clear_object (&config->channel_new_color); @@ -739,21 +736,18 @@ gimp_dialog_config_set_property (GObject *object, break; case PROP_PATH_NEW_NAME: - g_set_str (&config->path_new_name, - g_value_get_string (value)); + g_set_str (&config->path_new_name, g_value_get_string (value)); break; case PROP_PATH_EXPORT_PATH: - g_set_str (&config->path_export_path, - g_value_get_string (value)); + g_set_str (&config->path_export_path, g_value_get_string (value)); break; case PROP_PATH_EXPORT_ACTIVE_ONLY: config->path_export_active_only = g_value_get_boolean (value); break; case PROP_PATH_IMPORT_PATH: - g_set_str (&config->path_import_path, - g_value_get_string (value)); + g_set_str (&config->path_import_path, g_value_get_string (value)); break; case PROP_PATH_IMPORT_MERGE: config->path_import_merge = g_value_get_boolean (value); diff --git a/app/config/gimpdisplayconfig.c b/app/config/gimpdisplayconfig.c index f003bfcfe4..e3299963d9 100644 --- a/app/config/gimpdisplayconfig.c +++ b/app/config/gimpdisplayconfig.c @@ -518,12 +518,10 @@ gimp_display_config_set_property (GObject *object, display_config->show_paint_tool_cursor = g_value_get_boolean (value); break; case PROP_IMAGE_TITLE_FORMAT: - g_set_str (&display_config->image_title_format, - g_value_get_string (value)); + g_set_str (&display_config->image_title_format, g_value_get_string (value)); break; case PROP_IMAGE_STATUS_FORMAT: - g_set_str (&display_config->image_status_format, - g_value_get_string (value)); + g_set_str (&display_config->image_status_format, g_value_get_string (value)); break; case PROP_MONITOR_XRESOLUTION: display_config->monitor_xres = g_value_get_double (value); diff --git a/app/config/gimpearlyrc.c b/app/config/gimpearlyrc.c index e428280c28..e9e5c5257d 100644 --- a/app/config/gimpearlyrc.c +++ b/app/config/gimpearlyrc.c @@ -206,8 +206,7 @@ gimp_early_rc_set_property (GObject *object, break; case PROP_LANGUAGE: - g_set_str (&rc->language, - g_value_get_string (value)); + g_set_str (&rc->language, g_value_get_string (value)); break; #ifdef G_OS_WIN32 diff --git a/app/config/gimpgeglconfig.c b/app/config/gimpgeglconfig.c index cb9af0f36d..e6aae48bb8 100644 --- a/app/config/gimpgeglconfig.c +++ b/app/config/gimpgeglconfig.c @@ -202,18 +202,15 @@ gimp_gegl_config_set_property (GObject *object, switch (property_id) { case PROP_TEMP_PATH: - g_set_str (&gegl_config->temp_path, - g_value_get_string (value)); + g_set_str (&gegl_config->temp_path, g_value_get_string (value)); break; case PROP_SWAP_PATH: - g_set_str (&gegl_config->swap_path, - g_value_get_string (value)); + g_set_str (&gegl_config->swap_path, g_value_get_string (value)); break; case PROP_SWAP_COMPRESSION: - g_set_str (&gegl_config->swap_compression, - g_value_get_string (value)); + g_set_str (&gegl_config->swap_compression, g_value_get_string (value)); break; case PROP_NUM_PROCESSORS: diff --git a/app/config/gimpguiconfig.c b/app/config/gimpguiconfig.c index c2cddbcffb..111a10e617 100644 --- a/app/config/gimpguiconfig.c +++ b/app/config/gimpguiconfig.c @@ -684,12 +684,10 @@ gimp_gui_config_set_property (GObject *object, gui_config->toolbox_groups = g_value_get_boolean (value); break; case PROP_THEME_PATH: - g_set_str (&gui_config->theme_path, - g_value_get_string (value)); + g_set_str (&gui_config->theme_path, g_value_get_string (value)); break; case PROP_THEME: - g_set_str (&gui_config->theme, - g_value_get_string (value)); + g_set_str (&gui_config->theme, g_value_get_string (value)); break; case PROP_THEME_SCHEME: gui_config->theme_scheme = g_value_get_enum (value); @@ -704,12 +702,10 @@ gimp_gui_config_set_property (GObject *object, gui_config->viewables_follow_theme = g_value_get_boolean (value); break; case PROP_ICON_THEME_PATH: - g_set_str (&gui_config->icon_theme_path, - g_value_get_string (value)); + g_set_str (&gui_config->icon_theme_path, g_value_get_string (value)); break; case PROP_ICON_THEME: - g_set_str (&gui_config->icon_theme, - g_value_get_string (value)); + g_set_str (&gui_config->icon_theme, g_value_get_string (value)); break; case PROP_PREFER_SYMBOLIC_ICONS: gui_config->prefer_symbolic_icons = g_value_get_boolean (value); @@ -724,8 +720,7 @@ gimp_gui_config_set_property (GObject *object, gui_config->show_help_button = g_value_get_boolean (value); break; case PROP_HELP_LOCALES: - g_set_str (&gui_config->help_locales, - g_value_get_string (value)); + g_set_str (&gui_config->help_locales, g_value_get_string (value)); break; case PROP_HELP_BROWSER: gui_config->help_browser = g_value_get_enum (value); @@ -734,8 +729,7 @@ gimp_gui_config_set_property (GObject *object, gui_config->user_manual_online = g_value_get_boolean (value); break; case PROP_USER_MANUAL_ONLINE_URI: - g_set_str (&gui_config->user_manual_online_uri, - g_value_get_string (value)); + g_set_str (&gui_config->user_manual_online_uri, g_value_get_string (value)); break; case PROP_ACTION_HISTORY_SIZE: gui_config->action_history_size = g_value_get_int (value); diff --git a/app/config/gimppluginconfig.c b/app/config/gimppluginconfig.c index 37e80eb3ab..98cb7d7605 100644 --- a/app/config/gimppluginconfig.c +++ b/app/config/gimppluginconfig.c @@ -150,28 +150,19 @@ gimp_plugin_config_set_property (GObject *object, switch (property_id) { case PROP_FRACTALEXPLORER_PATH: - g_set_str (&plugin_config->fractalexplorer_path, - g_value_get_string (value)); + g_set_str (&plugin_config->fractalexplorer_path, g_value_get_string (value)); break; - case PROP_GFIG_PATH: - g_set_str (&plugin_config->gfig_path, - g_value_get_string (value)); + g_set_str (&plugin_config->gfig_path, g_value_get_string (value)); break; - case PROP_GFLARE_PATH: - g_set_str (&plugin_config->gflare_path, - g_value_get_string (value)); + g_set_str (&plugin_config->gflare_path, g_value_get_string (value)); break; - case PROP_GIMPRESSIONIST_PATH: - g_set_str (&plugin_config->gimpressionist_path, - g_value_get_string (value)); + g_set_str (&plugin_config->gimpressionist_path, g_value_get_string (value)); break; - case PROP_SCRIPT_FU_PATH: - g_set_str (&plugin_config->script_fu_path, - g_value_get_string (value)); + g_set_str (&plugin_config->script_fu_path, g_value_get_string (value)); break; default: @@ -193,19 +184,15 @@ gimp_plugin_config_get_property (GObject *object, case PROP_FRACTALEXPLORER_PATH: g_value_set_string (value, plugin_config->fractalexplorer_path); break; - case PROP_GFIG_PATH: g_value_set_string (value, plugin_config->gfig_path); break; - case PROP_GFLARE_PATH: g_value_set_string (value, plugin_config->gflare_path); break; - case PROP_GIMPRESSIONIST_PATH: g_value_set_string (value, plugin_config->gimpressionist_path); break; - case PROP_SCRIPT_FU_PATH: g_value_set_string (value, plugin_config->script_fu_path); break; diff --git a/app/core/gimpcontext.c b/app/core/gimpcontext.c index 8de71fd4f1..28e5810368 100644 --- a/app/core/gimpcontext.c +++ b/app/core/gimpcontext.c @@ -2296,8 +2296,7 @@ static void gimp_context_paint_info_dirty (GimpPaintInfo *paint_info, GimpContext *context) { - g_set_str (&context->paint_name, - gimp_object_get_name (paint_info)); + g_set_str (&context->paint_name, gimp_object_get_name (paint_info)); g_signal_emit (context, gimp_context_signals[PROP_NAME_CHANGED], 0, GIMP_CONTEXT_PROP_PAINT_INFO); @@ -2646,8 +2645,7 @@ static void gimp_context_brush_dirty (GimpBrush *brush, GimpContext *context) { - g_set_str (&context->brush_name, - gimp_object_get_name (brush)); + g_set_str (&context->brush_name, gimp_object_get_name (brush)); g_signal_emit (context, gimp_context_signals[PROP_NAME_CHANGED], 0, GIMP_CONTEXT_PROP_BRUSH); @@ -2760,8 +2758,7 @@ static void gimp_context_dynamics_dirty (GimpDynamics *dynamics, GimpContext *context) { - g_set_str (&context->dynamics_name, - gimp_object_get_name (dynamics)); + g_set_str (&context->dynamics_name, gimp_object_get_name (dynamics)); g_signal_emit (context, gimp_context_signals[PROP_NAME_CHANGED], 0, GIMP_CONTEXT_PROP_DYNAMICS); @@ -2873,8 +2870,7 @@ static void gimp_context_mybrush_dirty (GimpMybrush *brush, GimpContext *context) { - g_set_str (&context->mybrush_name, - gimp_object_get_name (brush)); + g_set_str (&context->mybrush_name, gimp_object_get_name (brush)); g_signal_emit (context, gimp_context_signals[PROP_NAME_CHANGED], 0, GIMP_CONTEXT_PROP_MYBRUSH); @@ -2986,8 +2982,7 @@ static void gimp_context_pattern_dirty (GimpPattern *pattern, GimpContext *context) { - g_set_str (&context->pattern_name, - gimp_object_get_name (pattern)); + g_set_str (&context->pattern_name, gimp_object_get_name (pattern)); g_signal_emit (context, gimp_context_signals[PROP_NAME_CHANGED], 0, GIMP_CONTEXT_PROP_PATTERN); @@ -3099,8 +3094,7 @@ static void gimp_context_gradient_dirty (GimpGradient *gradient, GimpContext *context) { - g_set_str (&context->gradient_name, - gimp_object_get_name (gradient)); + g_set_str (&context->gradient_name, gimp_object_get_name (gradient)); g_signal_emit (context, gimp_context_signals[PROP_NAME_CHANGED], 0, GIMP_CONTEXT_PROP_GRADIENT); @@ -3212,8 +3206,7 @@ static void gimp_context_palette_dirty (GimpPalette *palette, GimpContext *context) { - g_set_str (&context->palette_name, - gimp_object_get_name (palette)); + g_set_str (&context->palette_name, gimp_object_get_name (palette)); g_signal_emit (context, gimp_context_signals[PROP_NAME_CHANGED], 0, GIMP_CONTEXT_PROP_PALETTE); @@ -3475,8 +3468,7 @@ static void gimp_context_tool_preset_dirty (GimpToolPreset *tool_preset, GimpContext *context) { - g_set_str (&context->tool_preset_name, - gimp_object_get_name (tool_preset)); + g_set_str (&context->tool_preset_name, gimp_object_get_name (tool_preset)); g_signal_emit (context, gimp_context_signals[PROP_NAME_CHANGED], 0, GIMP_CONTEXT_PROP_TOOL_PRESET); @@ -3583,8 +3575,7 @@ static void gimp_context_buffer_dirty (GimpBuffer *buffer, GimpContext *context) { - g_set_str (&context->buffer_name, - gimp_object_get_name (buffer)); + g_set_str (&context->buffer_name, gimp_object_get_name (buffer)); g_signal_emit (context, gimp_context_signals[PROP_NAME_CHANGED], 0, GIMP_CONTEXT_PROP_BUFFER); @@ -3699,8 +3690,7 @@ static void gimp_context_imagefile_dirty (GimpImagefile *imagefile, GimpContext *context) { - g_set_str (&context->imagefile_name, - gimp_object_get_name (imagefile)); + g_set_str (&context->imagefile_name, gimp_object_get_name (imagefile)); g_signal_emit (context, gimp_context_signals[PROP_NAME_CHANGED], 0, GIMP_CONTEXT_PROP_IMAGEFILE); @@ -3815,8 +3805,7 @@ static void gimp_context_template_dirty (GimpTemplate *template, GimpContext *context) { - g_set_str (&context->template_name, - gimp_object_get_name (template)); + g_set_str (&context->template_name, gimp_object_get_name (template)); g_signal_emit (context, gimp_context_signals[PROP_NAME_CHANGED], 0, GIMP_CONTEXT_PROP_TEMPLATE); diff --git a/app/core/gimptemplate.c b/app/core/gimptemplate.c index 993b76fe48..68f579b7af 100644 --- a/app/core/gimptemplate.c +++ b/app/core/gimptemplate.c @@ -342,14 +342,10 @@ gimp_template_set_property (GObject *object, g_object_notify (object, "precision"); break; case PROP_COLOR_PROFILE: - if (private->color_profile) - g_object_unref (private->color_profile); - private->color_profile = g_value_dup_object (value); + g_set_object (&private->color_profile, g_value_get_object (value)); break; case PROP_SIMULATION_PROFILE: - if (private->simulation_profile) - g_object_unref (private->simulation_profile); - private->simulation_profile = g_value_dup_object (value); + g_set_object (&private->simulation_profile, g_value_get_object (value)); break; case PROP_SIMULATION_INTENT: private->simulation_intent = g_value_get_enum (value); @@ -361,14 +357,10 @@ gimp_template_set_property (GObject *object, private->fill_type = g_value_get_enum (value); break; case PROP_COMMENT: - if (private->comment) - g_free (private->comment); - private->comment = g_value_dup_string (value); + g_set_str (&private->comment, g_value_get_string (value)); break; case PROP_FILENAME: - if (private->filename) - g_free (private->filename); - private->filename = g_value_dup_string (value); + g_set_str (&private->filename, g_value_get_string (value)); break; case PROP_COLOR_MANAGED: diff --git a/app/display/gimpcanvastext.c b/app/display/gimpcanvastext.c index 4946830adb..949bd0a4e8 100644 --- a/app/display/gimpcanvastext.c +++ b/app/display/gimpcanvastext.c @@ -139,7 +139,7 @@ gimp_canvas_text_set_property (GObject *object, private->font_size = g_value_get_double (value); break; case PROP_TEXT: - private->text = (gchar *) g_value_dup_string (value); + private->text = g_value_dup_string (value); break; default: diff --git a/app/display/gimpdisplayshell.c b/app/display/gimpdisplayshell.c index 7ffb5a5964..96bbe37ebb 100644 --- a/app/display/gimpdisplayshell.c +++ b/app/display/gimpdisplayshell.c @@ -947,12 +947,10 @@ gimp_display_shell_set_property (GObject *object, gimp_display_shell_set_unit (shell, g_value_get_object (value)); break; case PROP_TITLE: - g_free (shell->title); - shell->title = g_value_dup_string (value); + g_set_str (&shell->title, g_value_get_string (value)); break; case PROP_STATUS: - g_free (shell->status); - shell->status = g_value_dup_string (value); + g_set_str (&shell->status, g_value_get_string (value)); break; case PROP_SHOW_ALL: gimp_display_shell_set_show_all (shell, g_value_get_boolean (value)); diff --git a/app/display/gimptoolline.c b/app/display/gimptoolline.c index 3228ccdb19..a14bfc626e 100644 --- a/app/display/gimptoolline.c +++ b/app/display/gimptoolline.c @@ -498,8 +498,7 @@ gimp_tool_line_set_property (GObject *object, break; case PROP_STATUS_TITLE: - g_free (private->status_title); - private->status_title = g_value_dup_string (value); + g_set_str (&private->status_title, g_value_get_string (value)); if (! private->status_title) private->status_title = g_strdup (_("Line: ")); break; diff --git a/app/display/gimptoolrectangle.c b/app/display/gimptoolrectangle.c index ee53477e56..e4db0c5b4e 100644 --- a/app/display/gimptoolrectangle.c +++ b/app/display/gimptoolrectangle.c @@ -878,8 +878,7 @@ gimp_tool_rectangle_set_property (GObject *object, break; case PROP_STATUS_TITLE: - g_free (private->status_title); - private->status_title = g_value_dup_string (value); + g_set_str (&private->status_title, g_value_get_string (value)); if (! private->status_title) private->status_title = g_strdup (_("Rectangle: ")); break; diff --git a/app/paint/gimppaintcore.c b/app/paint/gimppaintcore.c index ea50f221e8..408b9f3302 100644 --- a/app/paint/gimppaintcore.c +++ b/app/paint/gimppaintcore.c @@ -198,8 +198,7 @@ gimp_paint_core_set_property (GObject *object, switch (property_id) { case PROP_UNDO_DESC: - g_free (core->undo_desc); - core->undo_desc = g_value_dup_string (value); + g_set_str (&core->undo_desc, g_value_get_string (value)); break; default: diff --git a/app/text/gimptext.c b/app/text/gimptext.c index e821a4933b..250b6e0106 100644 --- a/app/text/gimptext.c +++ b/app/text/gimptext.c @@ -573,8 +573,7 @@ gimp_text_set_property (GObject *object, switch (property_id) { case PROP_TEXT: - g_free (text->text); - text->text = g_value_dup_string (value); + g_set_str (&text->text, g_value_get_string (value)); if (text->text && text->markup) { g_clear_pointer (&text->markup, g_free); @@ -582,8 +581,7 @@ gimp_text_set_property (GObject *object, } break; case PROP_MARKUP: - g_free (text->markup); - text->markup = g_value_dup_string (value); + g_set_str (&text->markup, g_value_get_string (value)); if (text->markup && text->text) { g_clear_pointer (&text->text, g_free); @@ -597,7 +595,7 @@ gimp_text_set_property (GObject *object, if (font != text->font && font != NULL) g_set_object (&text->font, font); /* this is defensive to avoid some crashes */ - else if (font == NULL) + else if (font == NULL) g_set_object (&text->font, GIMP_FONT (gimp_font_get_standard ())); } break; @@ -617,8 +615,7 @@ gimp_text_set_property (GObject *object, text->kerning = g_value_get_boolean (value); break; case PROP_LANGUAGE: - g_free (text->language); - text->language = g_value_dup_string (value); + g_set_str (&text->language, g_value_get_string (value)); break; case PROP_BASE_DIR: text->base_dir = g_value_get_enum (value); diff --git a/app/tools/gimpbucketfilloptions.c b/app/tools/gimpbucketfilloptions.c index ca5d84f7a9..3753aa96ce 100644 --- a/app/tools/gimpbucketfilloptions.c +++ b/app/tools/gimpbucketfilloptions.c @@ -365,8 +365,7 @@ gimp_bucket_fill_options_set_property (GObject *object, options->line_art_stroke = g_value_get_boolean (value); break; case PROP_LINE_ART_STROKE_TOOL: - g_clear_pointer (&options->line_art_stroke_tool, g_free); - options->line_art_stroke_tool = g_value_dup_string (value); + g_set_str (&options->line_art_stroke_tool, g_value_get_string (value)); if (options->stroke_options) { diff --git a/app/tools/gimptextoptions.c b/app/tools/gimptextoptions.c index 43f6d9a685..d0c25717f9 100644 --- a/app/tools/gimptextoptions.c +++ b/app/tools/gimptextoptions.c @@ -524,8 +524,7 @@ gimp_text_options_set_property (GObject *object, options->base_dir = g_value_get_enum (value); break; case PROP_LANGUAGE: - g_free (options->language); - options->language = g_value_dup_string (value); + g_set_str (&options->language, g_value_get_string (value)); break; case PROP_JUSTIFICATION: options->justify = g_value_get_enum (value); diff --git a/app/widgets/gimpdockwindow.c b/app/widgets/gimpdockwindow.c index 34adc7ee25..b7573195a9 100644 --- a/app/widgets/gimpdockwindow.c +++ b/app/widgets/gimpdockwindow.c @@ -547,7 +547,6 @@ gimp_dock_window_set_property (GObject *object, break; case PROP_UI_MANAGER_NAME: - g_free (dock_window->p->ui_manager_name); dock_window->p->ui_manager_name = g_value_dup_string (value); break; diff --git a/app/widgets/gimpsettingsbox.c b/app/widgets/gimpsettingsbox.c index f0d845fc82..d1adb8e161 100644 --- a/app/widgets/gimpsettingsbox.c +++ b/app/widgets/gimpsettingsbox.c @@ -409,9 +409,7 @@ gimp_settings_box_set_property (GObject *object, break; case PROP_CONFIG: - if (private->config) - g_object_unref (private->config); - private->config = g_value_dup_object (value); + g_set_object (&private->config, g_value_get_object (value)); break; case PROP_CONTAINER: @@ -421,39 +419,30 @@ gimp_settings_box_set_property (GObject *object, if (private->file_dialog) gtk_dialog_response (GTK_DIALOG (private->file_dialog), GTK_RESPONSE_DELETE_EVENT); - if (private->container) - g_object_unref (private->container); - private->container = g_value_dup_object (value); + g_set_object (&private->container, g_value_get_object (value)); if (private->combo) gimp_container_view_set_container (GIMP_CONTAINER_VIEW (private->combo), private->container); break; case PROP_HELP_ID: - g_free (private->help_id); - private->help_id = g_value_dup_string (value); + g_set_str (&private->help_id, g_value_get_string (value)); break; case PROP_IMPORT_TITLE: - g_free (private->import_title); - private->import_title = g_value_dup_string (value); + g_set_str (&private->import_title, g_value_get_string (value)); break; case PROP_EXPORT_TITLE: - g_free (private->export_title); - private->export_title = g_value_dup_string (value); + g_set_str (&private->export_title, g_value_dup_string (value)); break; case PROP_DEFAULT_FOLDER: - if (private->default_folder) - g_object_unref (private->default_folder); - private->default_folder = g_value_dup_object (value); + g_set_object (&private->default_folder, g_value_get_object (value)); break; case PROP_LAST_FILE: - if (private->last_file) - g_object_unref (private->last_file); - private->last_file = g_value_dup_object (value); + g_set_object (&private->last_file, g_value_get_object (value)); break; default: diff --git a/app/widgets/gimpstringaction.c b/app/widgets/gimpstringaction.c index 9604c197c4..492e278457 100644 --- a/app/widgets/gimpstringaction.c +++ b/app/widgets/gimpstringaction.c @@ -110,6 +110,7 @@ gimp_string_action_get_property (GObject *object, case PROP_VALUE: g_value_set_string (value, action->value); break; + default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -127,9 +128,9 @@ gimp_string_action_set_property (GObject *object, switch (prop_id) { case PROP_VALUE: - g_free (action->value); - action->value = g_value_dup_string (value); + g_set_str (&action->value, g_value_get_string (value)); break; + default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; diff --git a/libgimp/gimpprocedure.c b/libgimp/gimpprocedure.c index db7bb88432..16ef1c4e4a 100644 --- a/libgimp/gimpprocedure.c +++ b/libgimp/gimpprocedure.c @@ -283,7 +283,6 @@ gimp_procedure_set_property (GObject *object, break; case PROP_NAME: - g_free (priv->name); priv->name = g_value_dup_string (value); break; diff --git a/libgimpthumb/gimpthumbnail.c b/libgimpthumb/gimpthumbnail.c index 407c972a64..5f46ebc3c4 100644 --- a/libgimpthumb/gimpthumbnail.c +++ b/libgimpthumb/gimpthumbnail.c @@ -312,8 +312,7 @@ gimp_thumbnail_set_property (GObject *object, thumbnail->image_filesize = g_value_get_int64 (value); break; case PROP_IMAGE_MIMETYPE: - g_free (thumbnail->image_mimetype); - thumbnail->image_mimetype = g_value_dup_string (value); + g_set_str (&thumbnail->image_mimetype, g_value_get_string (value)); break; case PROP_IMAGE_WIDTH: thumbnail->image_width = g_value_get_int (value); @@ -322,8 +321,7 @@ gimp_thumbnail_set_property (GObject *object, thumbnail->image_height = g_value_get_int (value); break; case PROP_IMAGE_TYPE: - g_free (thumbnail->image_type); - thumbnail->image_type = g_value_dup_string (value); + g_set_str (&thumbnail->image_type, g_value_get_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 79e541decb..9906314713 100644 --- a/libgimpwidgets/gimpcellrenderertoggle.c +++ b/libgimpwidgets/gimpcellrenderertoggle.c @@ -217,9 +217,7 @@ gimp_cell_renderer_toggle_set_property (GObject *object, switch (param_id) { case PROP_ICON_NAME: - if (toggle->icon_name) - g_free (toggle->icon_name); - toggle->icon_name = g_value_dup_string (value); + g_set_str (&toggle->icon_name, g_value_get_string (value)); break; case PROP_ICON_SIZE: diff --git a/libgimpwidgets/gimpcontroller.c b/libgimpwidgets/gimpcontroller.c index df76176b4b..de47a734b3 100644 --- a/libgimpwidgets/gimpcontroller.c +++ b/libgimpwidgets/gimpcontroller.c @@ -164,15 +164,12 @@ gimp_controller_set_property (GObject *object, switch (property_id) { case PROP_NAME: - if (priv->name) - g_free (priv->name); - priv->name = g_value_dup_string (value); + g_set_str (&priv->name, g_value_get_string (value)); break; case PROP_STATE: - if (priv->state) - g_free (priv->state); - priv->state = g_value_dup_string (value); + g_set_str (&priv->state, g_value_get_string (value)); break; + default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); break; @@ -196,6 +193,7 @@ 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 da6004f123..cde655269f 100644 --- a/libgimpwidgets/gimpdialog.c +++ b/libgimpwidgets/gimpdialog.c @@ -248,8 +248,7 @@ gimp_dialog_set_property (GObject *object, break; case PROP_HELP_ID: - g_free (private->help_id); - private->help_id = g_value_dup_string (value); + g_set_str (&private->help_id, g_value_get_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 c0f3ec2d4a..c4b7f80c7c 100644 --- a/libgimpwidgets/gimplabelstringwidget.c +++ b/libgimpwidgets/gimplabelstringwidget.c @@ -179,11 +179,10 @@ gimp_label_string_widget_set_property (GObject *object, switch (property_id) { case PROP_VALUE: - if (g_strcmp0 (widget->value, g_value_get_string (value)) != 0) + if (g_set_str (&widget->value, g_value_get_string (value))) { - g_free (widget->value); - widget->value = g_value_dup_string (value); - g_signal_emit (object, gimp_label_string_widget_signals[VALUE_CHANGED], 0); + 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 58d4f99eca..72750d6604 100644 --- a/libgimpwidgets/gimpunitstore.c +++ b/libgimpwidgets/gimpunitstore.c @@ -244,23 +244,25 @@ 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_free (private->short_format); - private->short_format = g_value_dup_string (value); + g_set_str (&private->short_format, g_value_get_string (value)); if (! private->short_format) private->short_format = g_strdup ("%a"); break; + case PROP_LONG_FORMAT: - g_free (private->long_format); - private->long_format = g_value_dup_string (value); + g_set_str (&private->long_format, g_value_get_string (value)); if (! private->long_format) private->long_format = g_strdup ("%a"); break;