[libgsf] Fix error messages on win32.



commit bb4acd2f135486b3fa5cab704fb2bd00a0de51c0
Author: Morten Welinder <terra gnome org>
Date:   Sun May 22 18:23:19 2011 -0400

    Fix error messages on win32.

 ChangeLog                    |    6 ++++++
 NEWS                         |    3 +++
 gsf-win32/gsf-input-win32.c  |    2 +-
 gsf-win32/gsf-output-win32.c |    2 +-
 4 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 1d66451..5b77ea7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-21  Morten Welinder  <terra gnome org>
+
+	* gsf-win32/gsf-output-win32.c (gsf_output_istream_set_error): Use
+	proper format string.
+	* gsf-win32/gsf-input-win32.c (hresult_to_gerror): Ditto.
+
 2011-05-20  Morten Welinder <terra gnome org>
 
 	* configure.in: Post-release bump.
diff --git a/NEWS b/NEWS
index 8a58600..d7f1c69 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
 libgsf 1.14.22
 
+Morten:
+	* Fix error messages on win32.
+
 --------------------------------------------------------------------------
 libgsf 1.14.21
 
diff --git a/gsf-win32/gsf-input-win32.c b/gsf-win32/gsf-input-win32.c
index 2e1b5fa..0611634 100644
--- a/gsf-win32/gsf-input-win32.c
+++ b/gsf-win32/gsf-input-win32.c
@@ -79,7 +79,7 @@ hresult_to_gerror (HRESULT hr, GError ** err)
 		msg = gsf_win32_hresult_to_utf8 (hr);
 
 		if (msg) {
-			*err = g_error_new (gsf_input_error_id (), 0, msg);
+			*err = g_error_new (gsf_input_error_id (), 0, "%s", msg);
 			g_free (msg);
 		}
 	}
diff --git a/gsf-win32/gsf-output-win32.c b/gsf-win32/gsf-output-win32.c
index eaa2efd..50d1afc 100644
--- a/gsf-win32/gsf-output-win32.c
+++ b/gsf-win32/gsf-output-win32.c
@@ -55,7 +55,7 @@ gsf_output_istream_set_error (GsfOutput * output, HRESULT hr)
 
 		msg = gsf_win32_hresult_to_utf8 (hr);
 		if (msg) {
-			gsf_output_set_error (output, 0, msg);
+			gsf_output_set_error (output, 0, "%s", msg);
 			g_free (msg);
 		} /* "else" case should never happen */
 



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