Re: [evolution-patches] Patch for #327958

[Irene Huang <Irene Huang Sun COM>]

Sorry for my mistake :( 
Here's the supposed attachment. 

On Sun, 2006-01-22 at 15:05, Harish Krishnaswamy wrote:
> hi Irene,
> 
>   You forgot the patch. It is not on the bugzilla either :-)
> 
> You might also consider attaching further patches on b.g.o - Lots of
> people have started doing this lately in search of Bugzilla karma.
> 
> It would be easier for me to fetch patches for specific bugs to be
> ported to other branches. The majority is already going to be there,
> I might as well as encourage the rest to join the party.
> 
> Thanks,
> Harish
> 
> 
> 
> 
> 
> On Sun, 2006-01-22 at 13:16 +0800, Irene Huang wrote:
> > Hi, Harish
> > 
> > 	Here's the patch for bug #327958. 
> > 
> > 	Please review. 
> > 
> > Thanks
> > 
> > --Irene
> > 
> > 
> > _______________________________________________
> > Evolution-patches mailing list
> > Evolution-patches gnome org
> > http://mail.gnome.org/mailman/listinfo/evolution-patches
> 

Index: calendar/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.2950
diff -u -r1.2950 ChangeLog
--- calendar/ChangeLog	20 Jan 2006 14:40:07 -0000	1.2950
+++ calendar/ChangeLog	21 Jan 2006 14:00:37 -0000
@@ -1,3 +1,11 @@
+2006-01-21  Irene Huang <Irene Huang sun com>
+
+	Fixes #327958
+
+	* gui/e-calendar-view.c: (e_calendar_view_get_tooltips):
+	Check if ptr==NULL, for special occassion with SunOne 
+	accouts.
+
 2006-01-20  Andre Klapper <a9016009 gmx de>
 	* gui/dialogs/task-page.c (field_changed_cb):
 	Removed wrong parameter to be able compile again.
Index: calendar/gui/e-calendar-view.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-calendar-view.c,v
retrieving revision 1.113
diff -u -r1.113 e-calendar-view.c
--- calendar/gui/e-calendar-view.c	16 Jan 2006 12:59:43 -0000	1.113
+++ calendar/gui/e-calendar-view.c	21 Jan 2006 14:00:38 -0000
@@ -2038,9 +2038,16 @@
 		char *ptr ; 
 		GtkWidget *hbox = gtk_hbox_new (FALSE, 0);
 		ptr = strchr(organiser.value, ':');
-		ptr++;
-		/* To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>" */
-		tmp = g_strdup_printf (_("Organizer: %s <%s>"), organiser.cn, ptr);
+		
+		if (ptr) {
+			ptr++;
+			/* To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>" */
+			tmp = g_strdup_printf (_("Organizer: %s <%s>"), organiser.cn, ptr);
+		}
+		else 
+			/* With SunOne accouts, there may be no ':' in organiser.value*/
+			tmp = g_strdup_printf (_("Organizer: %s"), organiser.cn);
+
 		label = gtk_label_new (tmp);
 		gtk_box_pack_start ((GtkBox *)hbox, label, FALSE, FALSE, 0);
 		ebox = gtk_event_box_new ();