[goffice] Fix some magic date handling. [#686575]

[Andreas J. Guelzow <guelzow src gnome org>]

commit 465a3e558c97495da7ba653105b8e6ddc1d1c2b0
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Fri Nov 9 00:36:16 2012 -0700

    Fix some magic date handling. [#686575]
    
    2012-11-09 Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* goffice/utils/go-format.c (go_format_parse): use 32 bits for the locale

 ChangeLog                 |    4 ++++
 NEWS                      |    1 +
 goffice/utils/go-format.c |    6 +++---
 3 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index d60edca..3ec25ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-09 Andreas J. Guelzow <aguelzow pyrshep ca>
+
+	* goffice/utils/go-format.c (go_format_parse): use 32 bits for the locale
+
 2012-11-08  Jean Brefort  <jean brefort normalesup org>
 
 	* goffice/graph/gog-axis-color-map.c (color_map_load_from_uri): cosmetic
diff --git a/NEWS b/NEWS
index a224df7..7955fdd 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@ goffice 0.9.7:
 
 Andreas:
 	* Handle some more unusual formats in ODF export. [#683801]
+	* Fix some magic date handling. [#686575]
 
 Chris Leonard:
 	* Updated locales. [#682749]
diff --git a/goffice/utils/go-format.c b/goffice/utils/go-format.c
index 9b45b6f..b4e3106 100644
--- a/goffice/utils/go-format.c
+++ b/goffice/utils/go-format.c
@@ -2333,7 +2333,7 @@ go_format_parse (const char *str)
 		if (!state.have_cond)
 			condition->implicit = TRUE;
 
-		magic_fmt_str = go_format_magic_fmt_str (state.locale.locale & 0xffff);
+		magic_fmt_str = go_format_magic_fmt_str (state.locale.locale  & 0xffffffff);
 		if (magic_fmt_str) {
 			is_magic = TRUE;
 			/* Make the upcoming switch do nothing.  */
@@ -7281,7 +7281,7 @@ go_format_get_details (GOFormat const *fmt,
 #ifdef DEFINE_COMMON
 
 /* making GOFormatCurrency a boxed type for introspection. ref and unref don't
- * do anything because we always return a staic object */
+ * do anything because we always return a static object */
 static GOFormatCurrency *
 go_format_currency_ref (GOFormatCurrency * currency)
 {
@@ -7289,7 +7289,7 @@ go_format_currency_ref (GOFormatCurrency * currency)
 }
 
 static void
-go_format_currency_unref (GOFormatCurrency * currency)
+go_format_currency_unref (G_GNUC_UNUSED GOFormatCurrency * currency)
 {
 }