[gimp/soc-2009-dynamics] Fixes
- From: Alexia Death <alexiade src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gimp/soc-2009-dynamics] Fixes
- Date: Sat, 10 Oct 2009 17:46:26 +0000 (UTC)
commit 430a796904fb68ee7a67a60bc4bbf9a4df2ba713
Author: Alexia Death <alexiadeath gmail com>
Date: Sat Oct 10 20:22:31 2009 +0300
Fixes
app/core/gimpdynamics-load.c | 22 +++++++++-------------
app/core/gimpdynamics-save.c | 19 +++++++------------
app/widgets/gimpdynamicsfactoryview.h | 2 +-
3 files changed, 17 insertions(+), 26 deletions(-)
---
diff --git a/app/core/gimpdynamics-load.c b/app/core/gimpdynamics-load.c
index 83175bd..1e787cf 100644
--- a/app/core/gimpdynamics-load.c
+++ b/app/core/gimpdynamics-load.c
@@ -40,25 +40,21 @@ GList *
gimp_dynamics_load (const gchar *filename,
GError **error)
{
- FILE *file;
+
+ GimpDynamics *dynamics = g_object_new(GIMP_TYPE_DYNAMICS,
+ "name", "Default",
+ NULL);
g_return_val_if_fail (filename != NULL, NULL);
g_return_val_if_fail (g_path_is_absolute (filename), NULL);
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
- file = g_fopen (filename, "rb");
+ gimp_config_deserialize_file (dynamics,
+ filename, NULL, NULL);
- if (! file)
- {
- g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_OPEN,
+/* g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_OPEN,
_("Could not open '%s' for reading: %s"),
- gimp_filename_to_utf8 (filename), g_strerror (errno));
- return NULL;
- }
-
- /* load dynamics */
-
- fclose (file);
+ gimp_filename_to_utf8 (filename), g_strerror (errno));*/
- return NULL;
+ return g_list_prepend (NULL, dynamics);
}
diff --git a/app/core/gimpdynamics-save.c b/app/core/gimpdynamics-save.c
index e466d08..e0d9008 100644
--- a/app/core/gimpdynamics-save.c
+++ b/app/core/gimpdynamics-save.c
@@ -28,7 +28,9 @@
#include "gimpdynamics.h"
#include "gimpdynamics-save.h"
+#include "gimpdynamics-load.h"
+#include "config/gimpconfig-file.h"
#include "gimp-intl.h"
@@ -38,26 +40,19 @@ gimp_dynamics_save (GimpData *data,
{
GimpDynamics *dynamics;
FILE *file;
+ GError *myerror = NULL;
g_return_val_if_fail (GIMP_IS_DYNAMICS (data), FALSE);
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
dynamics = GIMP_DYNAMICS (data);
- file = g_fopen (data->filename, "wb");
-
- if (! file)
+ if(!gimp_config_serialize_to_file(dynamics, g_strconcat(data->filename, GIMP_DYNAMICS_FILE_EXTENSION, NULL), "GIMP dynamics save file", "", &myerror))
{
- g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_OPEN,
- _("Could not open '%s' for writing: %s"),
- gimp_filename_to_utf8 (data->filename),
- g_strerror (errno));
- return FALSE;
+ g_message ("%s", myerror->message);
+ g_error_free (myerror);
}
- /* FIXME: write dynamics */
-
- fclose (file);
- return TRUE;
+ return TRUE;
}
diff --git a/app/widgets/gimpdynamicsfactoryview.h b/app/widgets/gimpdynamicsfactoryview.h
index fc9259e..872e97d 100644
--- a/app/widgets/gimpdynamicsfactoryview.h
+++ b/app/widgets/gimpdynamicsfactoryview.h
@@ -32,7 +32,7 @@
#define GIMP_DYNAMICS_FACTORY_VIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_DYNAMICS_FACTORY_VIEW, GimpDynamicsFactoryViewClass))
-
+typedef struct _GimpDynamicsFactoryViewClass GimpDynamicsFactoryViewClass;
struct _GimpDynamicsFactoryView
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]