CVS: plugins/vcalendar/src vcalendar.c,1.2.2.32,1.2.2.33

Update of /cvsroot/sylpheed-claws/plugins/vcalendar/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2021/src

Modified Files:
      Tag: gtk2
	vcalendar.c 
Log Message:
2006-04-28 [colin] 1.78

	* src/vcalendar.c
		Charset fix
	*po/pl.po
		Fix update-po



Index: vcalendar.c
===================================================================
RCS file: /cvsroot/sylpheed-claws/plugins/vcalendar/src/vcalendar.c,v
retrieving revision 1.2.2.32
retrieving revision 1.2.2.33
diff -u -r1.2.2.32 -r1.2.2.33
--- vcalendar.c	20 Apr 2006 16:48:26 -0000	1.2.2.32
+++ vcalendar.c	27 Apr 2006 06:22:07 -0000	1.2.2.33
@@ -696,13 +696,22 @@
 	iprop = vcalviewer_get_property(vcalviewer, ICAL_ORGANIZER_PROPERTY);
 	if (iprop) {
 		tmp = get_email_from_organizer_property(iprop);
-		if (!g_utf8_validate(tmp, -1, NULL))
+		if (tmp && !g_utf8_validate(tmp, -1, NULL))
 			org = conv_codeset_strdup(tmp, charset, CS_UTF_8);
-		else
+		else if (tmp)
 			org = g_strdup(tmp);
+		else
+			org = NULL;
 		g_free(tmp);
 		icalproperty_free(iprop);
-		orgname = get_name_from_organizer_property(iprop);
+		tmp = get_name_from_organizer_property(iprop);
+		if (tmp && !g_utf8_validate(tmp, -1, NULL))
+			orgname = conv_codeset_strdup(tmp, charset, CS_UTF_8);
+		else if (tmp)
+			orgname = g_strdup(tmp);
+		else
+			orgname = NULL;
+		g_free(tmp);
 	} 
 	
 	iprop = vcalviewer_get_property(vcalviewer, ICAL_SUMMARY_PROPERTY);



-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642