[gimp] app: Fix tool preset editor init



commit 5e1c9d228c233c3013d0c300dece9cee7d8ccd23
Author: Alexia Death <alexiadeath gmail com>
Date:   Sat Apr 24 18:51:42 2010 +0300

    app: Fix tool preset editor init

 app/core/gimptoolpreset.c          |    2 +
 app/widgets/gimptoolpreseteditor.c |   41 ++++++++++++++++-------------------
 2 files changed, 21 insertions(+), 22 deletions(-)
---
diff --git a/app/core/gimptoolpreset.c b/app/core/gimptoolpreset.c
index 2e5e5c8..7dca4ad 100644
--- a/app/core/gimptoolpreset.c
+++ b/app/core/gimptoolpreset.c
@@ -180,6 +180,8 @@ gimp_tool_preset_constructor (GType                  type,
 
   preset = GIMP_TOOL_PRESET (object);
 
+  g_assert (GIMP_IS_GIMP (preset->gimp));
+
   return object;
 }
 
diff --git a/app/widgets/gimptoolpreseteditor.c b/app/widgets/gimptoolpreseteditor.c
index cbfcdb5..25dfb41 100644
--- a/app/widgets/gimptoolpreseteditor.c
+++ b/app/widgets/gimptoolpreseteditor.c
@@ -78,12 +78,27 @@ gimp_tool_preset_editor_class_init (GimpToolPresetEditorClass *klass)
 static void
 gimp_tool_preset_editor_init (GimpToolPresetEditor *editor)
 {
-  GimpDataEditor *data_editor = GIMP_DATA_EDITOR (editor);
-  GimpToolPreset *preset;
-  GtkWidget      *button;
+
+}
+
+static GObject *
+gimp_tool_preset_editor_constructor (GType                  type,
+                                     guint                  n_params,
+                                     GObjectConstructParam *params)
+{
+  GObject              *object;
+  GimpToolPresetEditor *editor;
+  GimpDataEditor       *data_editor;
+  GimpToolPreset       *preset;
+  GtkWidget            *button;
+
+  object = G_OBJECT_CLASS (parent_class)->constructor (type, n_params, params);
+
+  editor      = GIMP_TOOL_PRESET_EDITOR (object);
+  data_editor = GIMP_DATA_EDITOR (editor);
 
   preset = editor->tool_preset_model = g_object_new (GIMP_TYPE_TOOL_PRESET,
-                                                     //"gimp", data_editor->context->gimp,
+                                                     "gimp", data_editor->context->gimp,
                                                      NULL);
 
   g_signal_connect (preset, "notify",
@@ -125,24 +140,6 @@ gimp_tool_preset_editor_init (GimpToolPresetEditor *editor)
                       FALSE, FALSE, 0);
   gtk_widget_show (button);
 
-}
-
-static GObject *
-gimp_tool_preset_editor_constructor (GType                  type,
-                                     guint                  n_params,
-                                     GObjectConstructParam *params)
-{
-  GObject              *object;
-  GimpToolPresetEditor *editor;
-  GimpDataEditor       *data_editor;
-
-  object = G_OBJECT_CLASS (parent_class)->constructor (type, n_params, params);
-
-  editor      = GIMP_TOOL_PRESET_EDITOR (object);
-  data_editor = GIMP_DATA_EDITOR (editor);
-
-  gimp_docked_set_show_button_bar (GIMP_DOCKED (object), FALSE);
-
   return object;
 }
 



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