diff options
| -rw-r--r-- | calendar/ChangeLog | 8 | ||||
| -rw-r--r-- | calendar/gui/e-calendar-view.c | 13 |
2 files changed, 18 insertions, 3 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 863e9acc37..f8be8aee01 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,11 @@ +2006-01-23 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-16 Chenthill Palanisamy <pchenthill@novell.com> Fixes #326478 diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c index 2eabbe5901..cb162c6996 100644 --- a/calendar/gui/e-calendar-view.c +++ b/calendar/gui/e-calendar-view.c @@ -2038,9 +2038,16 @@ e_calendar_view_get_tooltips (ECalendarViewEventData *data) 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 (); |