[gimp] app: remove GimpFilterOptions' "settings" property



commit d45fd4041dec1a49f73c003162e85934d8d91303
Author: Michael Natterer <mitch gimp org>
Date:   Thu Jun 8 22:28:50 2017 +0200

    app: remove GimpFilterOptions' "settings" property
    
    it was never used, only set, and these days we remember dialog
    defaults differently anyway.

 app/tools/gimpfilteroptions.c       |   36 +----------------------------------
 app/tools/gimpfilteroptions.h       |    2 -
 app/tools/gimpfiltertool-settings.c |    8 -------
 3 files changed, 1 insertions(+), 45 deletions(-)
---
diff --git a/app/tools/gimpfilteroptions.c b/app/tools/gimpfilteroptions.c
index b0bca5b..183f402 100644
--- a/app/tools/gimpfilteroptions.c
+++ b/app/tools/gimpfilteroptions.c
@@ -38,12 +38,10 @@ enum
   PROP_PREVIEW_POSITION,
   PROP_REGION,
   PROP_COLOR_MANAGED,
-  PROP_GAMMA_HACK,
-  PROP_SETTINGS
+  PROP_GAMMA_HACK
 };
 
 
-static void   gimp_filter_options_finalize     (GObject      *object);
 static void   gimp_filter_options_set_property (GObject      *object,
                                                 guint         property_id,
                                                 const GValue *value,
@@ -65,7 +63,6 @@ gimp_filter_options_class_init (GimpFilterOptionsClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  object_class->finalize     = gimp_filter_options_finalize;
   object_class->set_property = gimp_filter_options_set_property;
   object_class->get_property = gimp_filter_options_get_property;
 
@@ -122,12 +119,6 @@ gimp_filter_options_class_init (GimpFilterOptionsClass *klass)
                                                          FALSE,
                                                          GIMP_PARAM_READWRITE |
                                                          G_PARAM_CONSTRUCT));
-
-  g_object_class_install_property (object_class, PROP_SETTINGS,
-                                   g_param_spec_object ("settings",
-                                                        NULL, NULL,
-                                                        G_TYPE_FILE,
-                                                        GIMP_PARAM_READWRITE));
 }
 
 static void
@@ -136,21 +127,6 @@ gimp_filter_options_init (GimpFilterOptions *options)
 }
 
 static void
-gimp_filter_options_finalize (GObject *object)
-{
-  GimpFilterOptions *options = GIMP_FILTER_OPTIONS (object);
-
-  if (options->settings)
-    {
-      g_object_unref (options->settings);
-      options->settings = NULL;
-    }
-
-  G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
-
-static void
 gimp_filter_options_set_property (GObject      *object,
                                   guint         property_id,
                                   const GValue *value,
@@ -188,12 +164,6 @@ gimp_filter_options_set_property (GObject      *object,
       options->gamma_hack = g_value_get_boolean (value);
       break;
 
-    case PROP_SETTINGS:
-      if (options->settings)
-        g_object_unref (options->settings);
-      options->settings = g_value_dup_object (value);
-      break;
-
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
       break;
@@ -238,10 +208,6 @@ gimp_filter_options_get_property (GObject    *object,
       g_value_set_boolean (value, options->gamma_hack);
       break;
 
-    case PROP_SETTINGS:
-      g_value_set_object (value, options->settings);
-      break;
-
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
       break;
diff --git a/app/tools/gimpfilteroptions.h b/app/tools/gimpfilteroptions.h
index e28f420..2e41129 100644
--- a/app/tools/gimpfilteroptions.h
+++ b/app/tools/gimpfilteroptions.h
@@ -43,8 +43,6 @@ struct _GimpFilterOptions
   GimpFilterRegion    region;
   gboolean            color_managed;
   gboolean            gamma_hack;
-
-  GFile              *settings;
 };
 
 struct _GimpFilterOptionsClass
diff --git a/app/tools/gimpfiltertool-settings.c b/app/tools/gimpfiltertool-settings.c
index 364da11..dce021f 100644
--- a/app/tools/gimpfiltertool-settings.c
+++ b/app/tools/gimpfiltertool-settings.c
@@ -185,10 +185,6 @@ gimp_filter_tool_settings_import (GimpSettingsBox *box,
 
   g_object_unref (input);
 
-  g_object_set (GIMP_TOOL_GET_OPTIONS (filter_tool),
-                "settings", file,
-                NULL);
-
   return TRUE;
 }
 
@@ -240,9 +236,5 @@ gimp_filter_tool_settings_export (GimpSettingsBox *box,
                 _("Settings saved to '%s'"),
                 gimp_file_get_utf8_name (file));
 
-  g_object_set (GIMP_TOOL_GET_OPTIONS (filter_tool),
-                "settings", file,
-                NULL);
-
   return TRUE;
 }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]