[goffice] Don't deprecate gog_style_new() for compatibility.



commit 8467c3bfe2bd654ff86c12e0c3ac61a8c3539451
Author: Jean Brefort <jean brefort normalesup org>
Date:   Thu Feb 14 20:54:21 2013 +0100

    Don't deprecate gog_style_new() for compatibility.

 ChangeLog                         |    7 +++++++
 goffice/graph/gog-object-xml.c    |    3 +--
 goffice/graph/gog-styled-object.c |    2 +-
 goffice/graph/gog-styled-object.h |    3 ---
 4 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 2f9b5fa..53743af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,13 @@
 
 2013-02-14  Jean Brefort  <jean brefort normalesup org>
 
+       * goffice/graph/gog-object-xml.c (gog_object_write_property_sax): back to
+       GogStyle to preserve compatibility.
+       * goffice/graph/gog-styled-object.c (gog_styled_object_class_init): ditto.
+       * goffice/graph/gog-styled-object.h: don't deprecate gog_style_new().
+
+2013-02-14  Jean Brefort  <jean brefort normalesup org>
+
        * configure.ac: bump Gtk+ requirement to 3.2.0.
 
 2013-02-14  Jean Brefort  <jean brefort normalesup org>
diff --git a/goffice/graph/gog-object-xml.c b/goffice/graph/gog-object-xml.c
index 8e40229..78665b2 100644
--- a/goffice/graph/gog-object-xml.c
+++ b/goffice/graph/gog-object-xml.c
@@ -123,8 +123,7 @@ gog_object_write_property_sax (GogObject const *obj, GParamSpec *pspec, GsfXMLOu
                if (val_obj != NULL) {
                        if (GO_IS_PERSIST (val_obj)) {
                                gsf_xml_out_start_element (output, "property");
-                               gsf_xml_out_add_cstr_unchecked (output, "name",
-                                                               GO_IS_STYLE (val_obj)? "GogStyle": 
pspec->name);
+                               gsf_xml_out_add_cstr_unchecked (output, "name", pspec->name);
                                go_persist_sax_save (GO_PERSIST (val_obj), output);
                                gsf_xml_out_end_element (output); /* </property> */
                        } else
diff --git a/goffice/graph/gog-styled-object.c b/goffice/graph/gog-styled-object.c
index e96742a..3685c93 100644
--- a/goffice/graph/gog-styled-object.c
+++ b/goffice/graph/gog-styled-object.c
@@ -221,7 +221,7 @@ gog_styled_object_class_init (GogObjectClass *gog_klass)
                g_param_spec_object ("style",
                        _("Style"),
                        _("A pointer to the GOStyle object"),
-                       GO_TYPE_STYLE,
+                       gog_object_get_type (),
                        GSF_PARAM_STATIC | G_PARAM_READWRITE | GO_PARAM_PERSISTENT));
 }
 
diff --git a/goffice/graph/gog-styled-object.h b/goffice/graph/gog-styled-object.h
index 2081c68..046aa8e 100644
--- a/goffice/graph/gog-styled-object.h
+++ b/goffice/graph/gog-styled-object.h
@@ -50,10 +50,7 @@ typedef struct {
 #define GOG_STYLED_OBJECT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GOG_TYPE_STYLED_OBJECT, 
GogStyledObjectClass))
 
 GType     gog_styled_object_get_type (void);
-#ifndef GOFFICE_DISABLE_DEPRECATED
-GOFFICE_DEPRECATED_FOR(go_style_new)
 GOStyle         *gog_style_new (void);
-#endif
 
 G_END_DECLS
 


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