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

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

Modified Files:
      Tag: gtk2
	vcalendar.c 
Log Message:
fix 941

Index: vcalendar.c
===================================================================
RCS file: /cvsroot/sylpheed-claws/plugins/vcalendar/src/vcalendar.c,v
retrieving revision 1.2.2.31
retrieving revision 1.2.2.32
diff -u -r1.2.2.31 -r1.2.2.32
--- vcalendar.c	16 Mar 2006 18:25:15 -0000	1.2.2.31
+++ vcalendar.c	20 Apr 2006 16:48:26 -0000	1.2.2.32
@@ -523,7 +523,8 @@
 	}
 	g_free(label);
 
-	if (event->orgname && strlen(event->orgname)) {
+	if (event->orgname && strlen(event->orgname)
+	&&  event->organizer && strlen(event->organizer)) {
 		gchar *addr = g_strconcat(event->orgname, " <", event->organizer, ">", NULL);
 		GTK_LABEL_SET_TEXT_TRIMMED(GTK_LABEL(vcalviewer->who), addr);
 		g_free(addr);
@@ -822,24 +823,29 @@
 	if (iprop) {
 		gchar *org, *orgname;
 		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);
 		tmp = get_name_from_organizer_property(iprop);
-		printf(" %s !\n", tmp);
 		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);
-		if (orgname) {
+		if (orgname && org) {
 			gchar *addr = g_strconcat(orgname, " <", org, ">", NULL);
 			GTK_LABEL_SET_TEXT_TRIMMED(GTK_LABEL(vcalviewer->who), addr);
 			g_free(addr);
-		} else {
+		} else if (org) {
 			GTK_LABEL_SET_TEXT_TRIMMED(GTK_LABEL(vcalviewer->who), org);
+		} else {
+			GTK_LABEL_SET_TEXT_TRIMMED(GTK_LABEL(vcalviewer->who), "-");
 		}
 		icalproperty_free(iprop);
 		g_free(org);



-------------------------------------------------------
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