GNOME.org
 

[gnumeric] Replaced some deprecated functions calls.

commit 3ab3f84f3bffb9ba51afdb227ade7cbb017d67f5
Author: Jean Brefort <jean brefort normalesup org>
Date:   Fri Aug 3 15:50:15 2012 +0200

    Replaced some deprecated functions calls.

 ChangeLog                            |    9 +++++++++
 plugins/openoffice/ChangeLog         |    5 +++++
 plugins/openoffice/openoffice-read.c |   12 ++++++------
 src/dialogs/ChangeLog                |    8 ++++++++
 src/dialogs/dialog-doc-metadata.c    |    2 +-
 src/dialogs/dialog-password.c        |    6 +++---
 src/dialogs/dialog-so-styled.c       |    2 +-
 src/gui-util.c                       |    2 +-
 src/gutils.c                         |    2 +-
 src/mathfunc.c                       |    2 +-
 src/tools/ChangeLog                  |    4 ++++
 src/tools/tabulate.c                 |    2 +-
 src/xml-sax-read.c                   |    2 +-
 src/xml-sax-write.c                  |    4 ++--
 14 files changed, 44 insertions(+), 18 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index b365352..8998187 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-08-03  Jean Brefort  <jean brefort normalesup org>
+
+	* src/gui-util.c (gnumeric_message_dialog_new): replaced deprecated
+	functions calls.
+	* src/gutils.c (gnm_insert_meta_date): ditto.
+	* src/mathfunc.c (pnorm): ditto.
+	* src/xml-sax-read.c (xml_sax_document_meta): ditto.
+	* src/xml-sax-write.c (xml_write_meta_data): ditto.
+
 2012-08-02  Andreas J. Guelzow <aguelzow pyrshep ca>
 
 	* src/sheet-filter.c (gnm_filter_condition_new_bucket): add argument
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index 49fefc3..f55d219 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-03  Jean Brefort  <jean brefort normalesup org>
+
+	* openoffice-read.c (od_draw_object), (openoffice_file_open): replace
+	deprecated functions calls.
+
 2012-08-02  Andreas J. Guelzow <aguelzow pyrshep ca>
 
 	* openoffice-read.c (oo_filter_cond): adjust call of
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index 98ecc03..ef5fa94 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -7627,7 +7627,7 @@ od_draw_object (GsfXMLIn *xin, xmlChar const **attrs)
 	if (content != NULL) {
 		GsfXMLInDoc *doc =
 			gsf_xml_in_doc_new (get_styles_dtd (),
-					    get_gsf_ooo_ns ());
+					    gsf_odf_get_ns ());
 		odf_clear_conventions (state); /* contain references to xin */
 		gsf_xml_in_doc_parse (doc, content, state);
 		gsf_xml_in_doc_free (doc);
@@ -7638,7 +7638,7 @@ od_draw_object (GsfXMLIn *xin, xmlChar const **attrs)
 	content = gsf_infile_child_by_vname (state->zip, name, "content.xml", NULL);
 	if (content != NULL) {
 		GsfXMLInDoc *doc =
-			gsf_xml_in_doc_new (get_dtd (), get_gsf_ooo_ns ());
+			gsf_xml_in_doc_new (get_dtd (), gsf_odf_get_ns ());
 		odf_clear_conventions (state); /* contain references to xin */
 		gsf_xml_in_doc_parse (doc, content, state);
 		gsf_xml_in_doc_free (doc);
@@ -11409,7 +11409,7 @@ openoffice_file_open (G_GNUC_UNUSED GOFileOpener const *fo, GOIOContext *io_cont
 		GsfInput *meta_file = gsf_infile_child_by_name (zip, "meta.xml");
 		if (NULL != meta_file) {
 			meta_data = gsf_doc_meta_data_new ();
-			err = gsf_opendoc_metadata_read (meta_file, meta_data);
+			err = gsf_doc_meta_data_read_from_odf (meta_data, meta_file);
 			if (NULL != err) {
 				go_io_warning (io_context,
 					_("Invalid metadata '%s'"), err->message);
@@ -11424,7 +11424,7 @@ openoffice_file_open (G_GNUC_UNUSED GOFileOpener const *fo, GOIOContext *io_cont
 
 	if (NULL != styles) {
 		GsfXMLInDoc *doc = gsf_xml_in_doc_new (styles_dtd,
-						       get_gsf_ooo_ns ());
+						       gsf_odf_get_ns ());
 		gsf_xml_in_doc_parse (doc, styles, &state);
 		gsf_xml_in_doc_free (doc);
 		odf_clear_conventions (&state); /* contain references to xin */
@@ -11434,7 +11434,7 @@ openoffice_file_open (G_GNUC_UNUSED GOFileOpener const *fo, GOIOContext *io_cont
 	doc  = gsf_xml_in_doc_new ((state.ver == OOO_VER_1)
 				   ? ooo1_content_dtd
 				   : opendoc_content_dtd,
-				   get_gsf_ooo_ns ());
+				   gsf_odf_get_ns ());
 	if (gsf_xml_in_doc_parse (doc, contents, &state)) {
 		GsfInput *settings;
 		char const *filesaver;
@@ -11473,7 +11473,7 @@ openoffice_file_open (G_GNUC_UNUSED GOFileOpener const *fo, GOIOContext *io_cont
 		settings = gsf_infile_child_by_name (zip, "settings.xml");
 		if (settings != NULL) {
 			GsfXMLInDoc *sdoc = gsf_xml_in_doc_new
-				(opendoc_settings_dtd, get_gsf_ooo_ns ());
+				(opendoc_settings_dtd, gsf_odf_get_ns ());
 			gsf_xml_in_doc_parse (sdoc, settings, &state);
 			gsf_xml_in_doc_free (sdoc);
 			odf_clear_conventions (&state); /* contain references to xin */
diff --git a/src/dialogs/ChangeLog b/src/dialogs/ChangeLog
index ba2fb36..7d955e0 100644
--- a/src/dialogs/ChangeLog
+++ b/src/dialogs/ChangeLog
@@ -1,3 +1,11 @@
+2012-08-03  Jean Brefort  <jean brefort normalesup org>
+
+	* dialog-doc-metadata.c
+	(dialog_doc_metadata_transform_str_to_timestamp): replace deprecated
+	functions calls.
+	* dialog-password.c (dialog_get_password): ditto.
+	* dialog-so-styled.c (dialog_so_styled): ditto.
+
 2012-08-02  Andreas J. Guelzow <aguelzow pyrshep ca>
 
 	* autofilter-top10.ui: add radio buttons
diff --git a/src/dialogs/dialog-doc-metadata.c b/src/dialogs/dialog-doc-metadata.c
index 2a5d1c5..12d74f1 100644
--- a/src/dialogs/dialog-doc-metadata.c
+++ b/src/dialogs/dialog-doc-metadata.c
@@ -323,7 +323,7 @@ dialog_doc_metadata_transform_str_to_timestamp (const GValue *string_value,
 
 	gt = gsf_timestamp_new ();
 	gsf_timestamp_set_time (gt, s);
-	gsf_value_set_timestamp (timestamp_value, gt);
+	gsf_timestamp_to_value (gt, timestamp_value);
 }
 
 static void
diff --git a/src/dialogs/dialog-password.c b/src/dialogs/dialog-password.c
index 03bb22e..391e6e8 100644
--- a/src/dialogs/dialog-password.c
+++ b/src/dialogs/dialog-password.c
@@ -41,17 +41,17 @@ dialog_get_password (GtkWindow *parent, const char *filename)
 					 GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
 					 NULL);
 	gtk_window_set_resizable (GTK_WINDOW (d), FALSE);
-	hb = gtk_hbox_new (FALSE, 0);
+	hb = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 	gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (d))), hb,
 			    TRUE, TRUE, 8);
 	image = gtk_image_new_from_stock ("Gnumeric_Protection_Yes_Dialog",
 					  GTK_ICON_SIZE_DIALOG);
 	gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0);
 	gtk_box_pack_start (GTK_BOX (hb), image, FALSE, FALSE, 0);
-	vb = gtk_vbox_new (FALSE, 8);
+	vb = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
 	gtk_box_pack_start (GTK_BOX (hb), vb, TRUE, TRUE, 6);
 	gtk_box_pack_start (GTK_BOX (vb), label, TRUE, TRUE, 0);
-	pwb = gtk_hbox_new (FALSE, 8);
+	pwb = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
 	/* Strange width so that width of primary/secondary text will win. */
 	entry = g_object_new (GTK_TYPE_ENTRY,
 			      "visibility", FALSE,
diff --git a/src/dialogs/dialog-so-styled.c b/src/dialogs/dialog-so-styled.c
index 17f885b..806439c 100644
--- a/src/dialogs/dialog-so-styled.c
+++ b/src/dialogs/dialog-so-styled.c
@@ -143,7 +143,7 @@ dialog_so_styled (WBCGtk *wbcg,
 	dialog = gtk_dialog_new_with_buttons (title,
 		wbcg_toplevel (state->wbcg),
 		GTK_DIALOG_DESTROY_WITH_PARENT,
-		NULL);
+		NULL, NULL);
 
 	help = gtk_dialog_add_button (GTK_DIALOG (dialog),
 		GTK_STOCK_HELP,		GTK_RESPONSE_HELP);
diff --git a/src/gui-util.c b/src/gui-util.c
index 6d1aa0f..fec4b6a 100644
--- a/src/gui-util.c
+++ b/src/gui-util.c
@@ -1040,7 +1040,7 @@ gnumeric_message_dialog_new (GtkWindow * parent,
 	const gchar *stock_id = NULL;
 	GtkStockItem item;
 
-	dialog = gtk_dialog_new_with_buttons ("", parent, flags, NULL);
+	dialog = gtk_dialog_new_with_buttons ("", parent, flags, NULL, NULL);
 
 	if (dialog) {
 		image = gtk_image_new ();
diff --git a/src/gutils.c b/src/gutils.c
index 968922d..13063bb 100644
--- a/src/gutils.c
+++ b/src/gutils.c
@@ -613,7 +613,7 @@ gnm_insert_meta_date (GODoc *doc, char const *name)
 
 	gsf_timestamp_set_time (ts, tm.tv_sec);
 	g_value_init (value, GSF_TIMESTAMP_TYPE);
-	gsf_value_set_timestamp (value, ts);
+	gsf_timestamp_to_value (ts, value);
 	gsf_timestamp_free (ts);
 
 	gsf_doc_meta_data_insert (go_doc_get_meta_data (doc),
diff --git a/src/mathfunc.c b/src/mathfunc.c
index c6beb7a..b09d0e3 100644
--- a/src/mathfunc.c
+++ b/src/mathfunc.c
@@ -356,7 +356,7 @@ gnm_float dnorm(gnm_float x, gnm_float mu, gnm_float sigma, gboolean give_log)
 
 gnm_float pnorm(gnm_float x, gnm_float mu, gnm_float sigma, gboolean lower_tail, gboolean log_p)
 {
-    gnm_float p, cp;
+    gnm_float p, cp = 0.;
 
     /* Note: The structure of these checks has been carefully thought through.
      * For example, if x == mu and sigma == 0, we get the correct answer 1.
diff --git a/src/tools/ChangeLog b/src/tools/ChangeLog
index fa85e9f..fbecd05 100644
--- a/src/tools/ChangeLog
+++ b/src/tools/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-03  Jean Brefort  <jean brefort normalesup org>
+
+	* tabulate.c: add missing header.
+
 2012-08-01  Jean Brefort  <jean brefort normalesup org>
 
 	* gnm-solver.c: Rename style_color_new_i8.
diff --git a/src/tools/tabulate.c b/src/tools/tabulate.c
index 9663d98..0fc148d 100644
--- a/src/tools/tabulate.c
+++ b/src/tools/tabulate.c
@@ -44,7 +44,7 @@
 #include "sheet-style.h"
 #include "style-color.h"
 #include "mathfunc.h"
-
+#include "application.h"
 
 static GnmValue *
 tabulation_eval (G_GNUC_UNUSED Workbook *wb, int dims, gnm_float const *x,
diff --git a/src/xml-sax-read.c b/src/xml-sax-read.c
index 100404c..20eea6b 100644
--- a/src/xml-sax-read.c
+++ b/src/xml-sax-read.c
@@ -489,7 +489,7 @@ xml_sax_document_meta (GsfXMLIn *xin, G_GNUC_UNUSED xmlChar const **attrs)
 {
 	XMLSaxParseState *state = (XMLSaxParseState *)xin->user_state;
 
-	gsf_opendoc_metadata_subtree (xin, go_doc_get_meta_data (GO_DOC (state->wb)));
+	gsf_doc_meta_data_odf_subtree (go_doc_get_meta_data (GO_DOC (state->wb)), xin);
 }
 
 
diff --git a/src/xml-sax-write.c b/src/xml-sax-write.c
index 3babac4..5615633 100644
--- a/src/xml-sax-write.c
+++ b/src/xml-sax-write.c
@@ -178,8 +178,8 @@ xml_write_attributes (GnmOutputXML *state)
 static void
 xml_write_meta_data (GnmOutputXML *state)
 {
-	gsf_opendoc_metadata_write (state->output,
-		go_doc_get_meta_data (GO_DOC (state->wb)));
+	gsf_doc_meta_data_write_to_odf (go_doc_get_meta_data (GO_DOC (state->wb)),
+	                            state->output);
 }
 
 /* DEPRECATED in 1.7.11 */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]