[evolution-patches] Re: patch for 43558

[Suresh Chandrasekharan <suresh chandrasekharan sun com>]

Hi,
	Pl. review the new attached patch.
Thanks,
Suresh

On 一, 2003-07-28 at 18:16, Suresh Chandrasekharan wrote:
> Hi ,
> Pl. evaluate and apply the evolution patch for "43558
> Appointment Editor always gives time validation error for apptmnts for
> non-UTF-8 non ASCII locales."
> 
> This can be applied to both the head the evolution-1-4-branch.
> 
> Thanks,
> Suresh

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/ChangeLog,v
retrieving revision 1.228.2.1
diff -u -r1.228.2.1 ChangeLog
--- ChangeLog	9 Jul 2003 19:49:43 -0000	1.228.2.1
+++ ChangeLog	29 Jul 2003 16:55:54 -0000
@@ -1,3 +1,9 @@
+2003-07-28  Suresh Chandrasekharan  <suresh chandrasekharan sun com>
+	
+	* e-dateedit.c (e_date_edit_check_time_changed): Fixes #43558 
+	Appointment Editor always gives time validation error for apptmnts in 
+	non UTF-8/non ASCII locales.
+
 2003-07-09  Federico Mena Quintero  <federico ximian com>
 
 	* e-url-entry.c (destroy): Chain to the parent handler.  Fixes #45236.
Index: e-dateedit.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-dateedit.c,v
retrieving revision 1.34
diff -u -r1.34 e-dateedit.c
--- e-dateedit.c	30 May 2003 17:32:31 -0000	1.34
+++ e-dateedit.c	29 Jul 2003 16:55:54 -0000
@@ -57,6 +57,7 @@
 #include <gtk/gtkvbox.h>
 #include <libgnome/gnome-i18n.h>
 #include <gal/util/e-util.h>
+#include <gal/widgets/e-unicode.h>
 #include "e-util/e-time-utils.h"
 #include "e-calendar.h"
 
@@ -1723,6 +1724,7 @@
 {
 	EDateEditPrivate *priv;
 	const gchar *time_text;
+	gchar *locale_str;
 	struct tm tmp_tm;
 	gboolean none = FALSE, valid = TRUE, time_changed;
 
@@ -1732,10 +1734,13 @@
 	tmp_tm.tm_min = 0;
 
 	time_text = gtk_entry_get_text (GTK_ENTRY (GTK_COMBO (priv->time_combo)->entry));
+	locale_str = e_utf8_to_locale_string (time_text);
 	if (field_set_to_none (time_text))
 		none = TRUE;
-	else if (!e_date_edit_parse_time (dedit, time_text, &tmp_tm))
+	else if (!e_date_edit_parse_time (dedit, locale_str, &tmp_tm))
 		valid = FALSE;
+
+	g_free (locale_str);
 
 	time_changed = e_date_edit_set_time_internal (dedit, valid, none,
 						      tmp_tm.tm_hour,