[libgsf] Don't use deprecated symbols.



commit c7da195534d84dae9435590fa9af990a3786e5f8
Author: Jean Brefort <jean brefort normalesup org>
Date:   Tue Feb 5 11:13:20 2013 +0100

    Don't use deprecated symbols.

 ChangeLog               |    6 ++++++
 doc/gsf-sections.txt    |    3 +++
 gsf/gsf-opendoc-utils.c |    4 ++++
 tools/gsf.c             |    4 ++--
 4 files changed, 15 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 840d24a..3f2e5fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-02-05  Jean Brefort  <jean brefort normalesup org>
+
+	* doc/gsf-sections.txt: fix gtk-doc warnings.
+	* gsf/gsf-opendoc-utils.c: ditto.
+	* tools/gsf.c (get_meta_data): don't use deprecated symbols.
+
 2013-01-26  Morten Welinder  <terra gnome org>
 
 	* gsf/gsf-outfile-msole.c (ole_write_bat, ole_write_const): Bunch
diff --git a/doc/gsf-sections.txt b/doc/gsf-sections.txt
index ba82889..09ed393 100644
--- a/doc/gsf-sections.txt
+++ b/doc/gsf-sections.txt
@@ -790,6 +790,9 @@ gsf_doc_prop_swap_val
 gsf_property_settings_collect
 gsf_property_settings_collect_valist
 gsf_property_settings_free
+
+<SUBSECTION Private>
+GSF_DEPRECATED_FOR
 </SECTION>
 
 <SECTION>
diff --git a/gsf/gsf-opendoc-utils.c b/gsf/gsf-opendoc-utils.c
index 86580d8..7bb022d 100644
--- a/gsf/gsf-opendoc-utils.c
+++ b/gsf/gsf-opendoc-utils.c
@@ -46,6 +46,7 @@ typedef struct {
 
 /**
  * gsf_odf_get_version_string:
+ *
  * Gives the ODF version used by libgsf when writing Open Document files.
  *
  * Since: 1.14.24
@@ -60,6 +61,7 @@ gsf_odf_get_version_string (void)
 
 /**
  * get_gsf_odf_version_string: (skip)
+ *
  * Gives the ODF version used by libgsf when writing Open Document files.
  *
  * Deprecated: 1.14.24, use gsf_odf_get_version_string
@@ -74,6 +76,7 @@ get_gsf_odf_version_string (void)
 
 /**
  * gsf_odf_get_version:
+ *
  * Gives the ODF version used by libgsf when writing Open Document files.
  *
  * Since: 1.14.24
@@ -88,6 +91,7 @@ gsf_odf_get_version (void)
 
 /**
  * get_gsf_odf_version: (skip)
+ *
  * Gives the ODF version used by libgsf when writing Open Document files.
  *
  * Deprecated: 1.14.24, use gsf_odf_get_version
diff --git a/tools/gsf.c b/tools/gsf.c
index 605ccd7..4c5d309 100644
--- a/tools/gsf.c
+++ b/tools/gsf.c
@@ -247,7 +247,7 @@ get_meta_data (GsfInfile *infile, const char *filename)
 
 		in = gsf_infile_child_by_name (infile, "\05SummaryInformation");
 		if (NULL != in) {
-			err = gsf_msole_metadata_read (in, meta_data);
+			err = gsf_doc_meta_data_read_from_msole (meta_data, in);
 			if (err != NULL) {
 				g_warning ("'%s' error: %s", filename, err->message);
 				g_error_free (err);
@@ -258,7 +258,7 @@ get_meta_data (GsfInfile *infile, const char *filename)
 
 		in = gsf_infile_child_by_name (infile, "\05DocumentSummaryInformation");
 		if (NULL != in) {
-			err = gsf_msole_metadata_read (in, meta_data);
+			err = gsf_doc_meta_data_read_from_msole (meta_data, in);
 			if (err != NULL) {
 				g_warning ("'%s' error: %s", filename, err->message);
 				g_error_free (err);



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