[gimp/soc-2009-dynamics] Fixing some more props errors in context
- From: Alexia Death <alexiade src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gimp/soc-2009-dynamics] Fixing some more props errors in context
- Date: Thu, 20 Aug 2009 00:25:38 +0000 (UTC)
commit 460bf0ecdde18747e346ad07a6533e670531453d
Author: Alexia Death <alexiadeath gmail com>
Date: Thu Aug 20 03:20:17 2009 +0300
Fixing some more props errors in context
app/core/core-enums.h | 2 +-
app/core/gimp.c | 9 ++++-----
app/core/gimpcontext.c | 10 +++++-----
3 files changed, 10 insertions(+), 11 deletions(-)
---
diff --git a/app/core/core-enums.h b/app/core/core-enums.h
index 5969638..d15d16e 100644
--- a/app/core/core-enums.h
+++ b/app/core/core-enums.h
@@ -610,7 +610,7 @@ typedef enum /*< pdb-skip, skip >*/
GIMP_CONTEXT_PROP_TEMPLATE = 17,
GIMP_CONTEXT_PROP_DYNAMICS = 18,
- GIMP_CONTEXT_LAST_PROP = GIMP_CONTEXT_PROP_TEMPLATE
+ GIMP_CONTEXT_LAST_PROP = GIMP_CONTEXT_PROP_DYNAMICS
} GimpContextPropType;
diff --git a/app/core/gimp.c b/app/core/gimp.c
index 590301a..56451d2 100644
--- a/app/core/gimp.c
+++ b/app/core/gimp.c
@@ -240,7 +240,7 @@ gimp_init (Gimp *gimp)
gimp->fonts = NULL;
gimp->brush_factory = NULL;
- gimp->dynamics_factory = NULL;
+ gimp->dynamics_factory = NULL;
gimp->pattern_factory = NULL;
gimp->gradient_factory = NULL;
gimp->palette_factory = NULL;
@@ -279,7 +279,7 @@ gimp_dispose (GObject *object)
if (gimp->brush_factory)
gimp_data_factory_data_free (gimp->brush_factory);
-
+
if (gimp->dynamics_factory)
gimp_data_factory_data_free (gimp->dynamics_factory);
@@ -542,10 +542,9 @@ gimp_real_initialize (Gimp *gimp,
static const GimpDataFactoryLoaderEntry dynamics_loader_entries[] =
{
- { gimp_pattern_load, GIMP_PATTERN_FILE_EXTENSION, FALSE },
- { gimp_pattern_load_pixbuf, NULL, FALSE }
+ { gimp_dynamics_load, GIMP_DYNAMICS_FILE_EXTENSION, FALSE }
};
-
+
static const GimpDataFactoryLoaderEntry pattern_loader_entries[] =
{
{ gimp_pattern_load, GIMP_PATTERN_FILE_EXTENSION, FALSE },
diff --git a/app/core/gimpcontext.c b/app/core/gimpcontext.c
index 0696c8d..e7ae061 100644
--- a/app/core/gimpcontext.c
+++ b/app/core/gimpcontext.c
@@ -172,7 +172,7 @@ static void gimp_context_dynamics_list_thaw (GimpContainer *container,
GimpContext *context);
static void gimp_context_real_set_dynamics (GimpContext *context,
GimpDynamicsOptions *dynamics);
-
+
/* pattern */
static void gimp_context_pattern_dirty (GimpPattern *pattern,
GimpContext *context);
@@ -281,7 +281,6 @@ enum
OPACITY_CHANGED,
PAINT_MODE_CHANGED,
BRUSH_CHANGED,
- DYNAMICS_CHANGED,
PATTERN_CHANGED,
GRADIENT_CHANGED,
PALETTE_CHANGED,
@@ -289,6 +288,7 @@ enum
BUFFER_CHANGED,
IMAGEFILE_CHANGED,
TEMPLATE_CHANGED,
+ DYNAMICS_CHANGED,
LAST_SIGNAL
};
@@ -305,14 +305,14 @@ static const gchar * const gimp_context_prop_names[] =
"opacity",
"paint-mode",
"brush",
- "dynamics",
"pattern",
"gradient",
"palette",
"font",
"buffer",
"imagefile",
- "template"
+ "template",
+ "dynamics"
};
static GType gimp_context_prop_types[] =
@@ -638,7 +638,7 @@ gimp_context_class_init (GimpContextClass *klass)
NULL,
GIMP_TYPE_BRUSH,
GIMP_PARAM_STATIC_STRINGS);
-
+
GIMP_CONFIG_INSTALL_PROP_OBJECT (object_class, GIMP_CONTEXT_PROP_DYNAMICS,
gimp_context_prop_names[GIMP_CONTEXT_PROP_DYNAMICS],
NULL,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]