[gnumeric] Fix more warnings.



commit a554304fc7fb5731a2ee4c8e0815a4fa6b3f9271
Author: Jean Brefort <jean brefort normalesup org>
Date:   Fri Aug 3 16:12:41 2012 +0200

    Fix more warnings.

 plugins/excel/ChangeLog               |    5 +++++
 plugins/excel/boot.c                  |    6 +++---
 plugins/openoffice/ChangeLog          |    5 +++++
 plugins/openoffice/openoffice-write.c |    8 ++++----
 src/dialogs/ChangeLog                 |    4 ++++
 src/dialogs/dialog-solver.c           |    2 +-
 6 files changed, 22 insertions(+), 8 deletions(-)
---
diff --git a/plugins/excel/ChangeLog b/plugins/excel/ChangeLog
index f787dfc..4e469a6 100644
--- a/plugins/excel/ChangeLog
+++ b/plugins/excel/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-03  Jean Brefort  <jean brefort normalesup org>
+
+	* boot.c (excel_read_metadata), (excel_save): replace deprecated functions
+	calls.
+
 2012-08-02  Andreas J. Guelzow <aguelzow pyrshep ca>
 
 	* ms-excel-read.c (excel_read_AUTOFILTER): adjust call to
diff --git a/plugins/excel/boot.c b/plugins/excel/boot.c
index c46b708..a1af734 100644
--- a/plugins/excel/boot.c
+++ b/plugins/excel/boot.c
@@ -129,7 +129,7 @@ excel_read_metadata (GsfDocMetaData *meta_data, GsfInfile *ole, char const *name
 	GsfInput *stream = gsf_infile_child_by_name (ole, name);
 
 	if (stream != NULL) {
-		GError *err = gsf_msole_metadata_read (stream, meta_data);
+		GError *err = gsf_doc_meta_data_read_from_msole (meta_data, stream);
 		if (err != NULL) {
 			go_io_warning (context, "%s", err->message);
 			g_error_free (err);
@@ -285,13 +285,13 @@ excel_save (GOIOContext *context, WorkbookView const *wbv, GsfOutput *output,
 	if (meta_data != NULL) {
 		content = gsf_outfile_new_child (outfile,
 			"\05DocumentSummaryInformation", FALSE);
-		gsf_msole_metadata_write (content, meta_data, TRUE);
+		gsf_doc_meta_data_write_to_msole (meta_data, content, TRUE);
 		gsf_output_close (content);
 		g_object_unref (G_OBJECT (content));
 
 		content = gsf_outfile_new_child (outfile,
 			"\05SummaryInformation", FALSE);
-		gsf_msole_metadata_write (content, meta_data, FALSE);
+		gsf_doc_meta_data_write_to_msole (meta_data, content, FALSE);
 		gsf_output_close (content);
 		g_object_unref (G_OBJECT (content));
 	}
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index f55d219..57fa74d 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,5 +1,10 @@
 2012-08-03  Jean Brefort  <jean brefort normalesup org>
 
+	* openoffice-write.c (odf_write_meta), (odf_write_meta_graph),
+	(openoffice_file_save_real): replace more deprecated functions calls.
+
+2012-08-03  Jean Brefort  <jean brefort normalesup org>
+
 	* openoffice-read.c (od_draw_object), (openoffice_file_open): replace
 	deprecated functions calls.
 
diff --git a/plugins/openoffice/openoffice-write.c b/plugins/openoffice/openoffice-write.c
index 2862879..f0d07a3 100644
--- a/plugins/openoffice/openoffice-write.c
+++ b/plugins/openoffice/openoffice-write.c
@@ -5406,7 +5406,7 @@ odf_write_meta (GnmOOExport *state, GsfOutput *child)
 	g_value_set_string (val, PACKAGE_NAME "/" VERSION);
 
 	gsf_doc_meta_data_insert  (meta, g_strdup (GSF_META_NAME_GENERATOR), val);
-	gsf_opendoc_metadata_write (xml, meta);
+	gsf_doc_meta_data_write_to_odf (meta, xml);
 	gsf_doc_meta_data_remove (meta,GSF_META_NAME_GENERATOR);
 	if (prop != NULL)
 		gsf_doc_meta_data_store (meta, prop);
@@ -5424,7 +5424,7 @@ odf_write_meta_graph (G_GNUC_UNUSED GnmOOExport *state, GsfOutput *child)
 	g_value_set_string (val, PACKAGE_NAME "/" VERSION);
 
 	gsf_doc_meta_data_insert  (meta, g_strdup (GSF_META_NAME_GENERATOR), val);
-	gsf_opendoc_metadata_write (xml, meta);
+	gsf_doc_meta_data_write_to_odf (meta, xml);
 
 	g_object_unref (meta);
 	g_object_unref (xml);
@@ -8048,8 +8048,8 @@ openoffice_file_save_real (G_GNUC_UNUSED  GOFileSaver const *fs, GOIOContext *io
 	state.outfile = gsf_outfile_zip_new (output, &err);
 
 	state.with_extension = with_extension;
-	state.odf_version = get_gsf_odf_version ();
-	state.odf_version_string = g_strdup (get_gsf_odf_version_string ());
+	state.odf_version = gsf_odf_get_version ();
+	state.odf_version_string = g_strdup (gsf_odf_get_version_string ());
 	state.ioc = ioc;
 	state.wbv = wbv;
 	state.wb  = wb_view_get_workbook (wbv);
diff --git a/src/dialogs/ChangeLog b/src/dialogs/ChangeLog
index 7d955e0..c991afa 100644
--- a/src/dialogs/ChangeLog
+++ b/src/dialogs/ChangeLog
@@ -1,5 +1,9 @@
 2012-08-03  Jean Brefort  <jean brefort normalesup org>
 
+	* dialog-solver.c (run_solver): fix warning.
+
+2012-08-03  Jean Brefort  <jean brefort normalesup org>
+
 	* dialog-doc-metadata.c
 	(dialog_doc_metadata_transform_str_to_timestamp): replace deprecated
 	functions calls.
diff --git a/src/dialogs/dialog-solver.c b/src/dialogs/dialog-solver.c
index f742808..3605706 100644
--- a/src/dialogs/dialog-solver.c
+++ b/src/dialogs/dialog-solver.c
@@ -678,7 +678,7 @@ run_solver (SolverState *state, GnmSolverParameters *param)
 	dialog = (GtkDialog *)gtk_dialog_new_with_buttons
 		(_("Running Solver"),
 		 wbcg_toplevel (state->wbcg), 0,
-		 NULL);
+		 NULL, NULL);
 	state->run.stop_button =
 		go_gtk_dialog_add_button (dialog,
 					  _("Stop"),



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