From 1c61950527e07b6f0343f0c1a9ecf7d043b7873e Mon Sep 17 00:00:00 2001 From: Damon Chaplin Date: Wed, 24 Oct 2001 21:02:43 +0000 Subject: when iterating over the subcomponents, use 'subcomp' rather than 2001-10-24 Damon Chaplin * pcs/cal-backend-file.c (cal_backend_file_update_objects): when iterating over the subcomponents, use 'subcomp' rather than 'icalcomp'. That meant it wasn't working at all well when an entire VCALENDAR was passed in. * cal-util/cal-component.c: handle DURATION property used instead of DTEND or DUE. In cal_component_get_dtend/due we will return DTSTART + DURATION if necessary. In set_dtend/due we remove any DURATION property. Fixes bug #11262. * gui/e-meeting-model.c (build_etable): * gui/e-calendar-table.c (e_calendar_table_init): use U_ for the ECellCombo popdown strings, as it expects UTF-8 strings. svn path=/trunk/; revision=13992 --- calendar/gui/e-calendar-table.c | 49 +++++++++++++++++++++-------------------- calendar/gui/e-meeting-model.c | 35 +++++++++++++++-------------- 2 files changed, 43 insertions(+), 41 deletions(-) (limited to 'calendar/gui') diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c index 9002811f09..46516db8a8 100644 --- a/calendar/gui/e-calendar-table.c +++ b/calendar/gui/e-calendar-table.c @@ -41,6 +41,7 @@ #include #include #include +#include #include "e-calendar-table.h" #include "e-cell-date-edit-text.h" #include "calendar-config.h" @@ -382,9 +383,9 @@ e_calendar_table_init (ECalendarTable *cal_table) gtk_object_unref (GTK_OBJECT (cell)); strings = NULL; - strings = g_list_append (strings, _("Public")); - strings = g_list_append (strings, _("Private")); - strings = g_list_append (strings, _("Confidential")); + strings = g_list_append (strings, (char*) U_("Public")); + strings = g_list_append (strings, (char*) U_("Private")); + strings = g_list_append (strings, (char*) U_("Confidential")); e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell), strings); @@ -404,10 +405,10 @@ e_calendar_table_init (ECalendarTable *cal_table) gtk_object_unref (GTK_OBJECT (cell)); strings = NULL; - strings = g_list_append (strings, _("High")); - strings = g_list_append (strings, _("Normal")); - strings = g_list_append (strings, _("Low")); - strings = g_list_append (strings, _("Undefined")); + strings = g_list_append (strings, (char*) U_("High")); + strings = g_list_append (strings, (char*) U_("Normal")); + strings = g_list_append (strings, (char*) U_("Low")); + strings = g_list_append (strings, (char*) U_("Undefined")); e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell), strings); @@ -426,17 +427,17 @@ e_calendar_table_init (ECalendarTable *cal_table) gtk_object_unref (GTK_OBJECT (cell)); strings = NULL; - strings = g_list_append (strings, _("0%")); - strings = g_list_append (strings, _("10%")); - strings = g_list_append (strings, _("20%")); - strings = g_list_append (strings, _("30%")); - strings = g_list_append (strings, _("40%")); - strings = g_list_append (strings, _("50%")); - strings = g_list_append (strings, _("60%")); - strings = g_list_append (strings, _("70%")); - strings = g_list_append (strings, _("80%")); - strings = g_list_append (strings, _("90%")); - strings = g_list_append (strings, _("100%")); + strings = g_list_append (strings, (char*) U_("0%")); + strings = g_list_append (strings, (char*) U_("10%")); + strings = g_list_append (strings, (char*) U_("20%")); + strings = g_list_append (strings, (char*) U_("30%")); + strings = g_list_append (strings, (char*) U_("40%")); + strings = g_list_append (strings, (char*) U_("50%")); + strings = g_list_append (strings, (char*) U_("60%")); + strings = g_list_append (strings, (char*) U_("70%")); + strings = g_list_append (strings, (char*) U_("80%")); + strings = g_list_append (strings, (char*) U_("90%")); + strings = g_list_append (strings, (char*) U_("100%")); e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell), strings); @@ -456,8 +457,8 @@ e_calendar_table_init (ECalendarTable *cal_table) gtk_object_unref (GTK_OBJECT (cell)); strings = NULL; - strings = g_list_append (strings, _("Free")); - strings = g_list_append (strings, _("Busy")); + strings = g_list_append (strings, (char*) U_("Free")); + strings = g_list_append (strings, (char*) U_("Busy")); e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell), strings); @@ -477,10 +478,10 @@ e_calendar_table_init (ECalendarTable *cal_table) gtk_object_unref (GTK_OBJECT (cell)); strings = NULL; - strings = g_list_append (strings, _("Not Started")); - strings = g_list_append (strings, _("In Progress")); - strings = g_list_append (strings, _("Completed")); - strings = g_list_append (strings, _("Cancelled")); + strings = g_list_append (strings, (char*) U_("Not Started")); + strings = g_list_append (strings, (char*) U_("In Progress")); + strings = g_list_append (strings, (char*) U_("Completed")); + strings = g_list_append (strings, (char*) U_("Cancelled")); e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell), strings); diff --git a/calendar/gui/e-meeting-model.c b/calendar/gui/e-meeting-model.c index 24e8913431..d0d877e133 100644 --- a/calendar/gui/e-meeting-model.c +++ b/calendar/gui/e-meeting-model.c @@ -43,6 +43,7 @@ #include #include #include +#include #include #include #include @@ -684,11 +685,11 @@ build_etable (ETableModel *model, const gchar *spec_file, const gchar *state_fil gtk_object_unref (GTK_OBJECT (cell)); strings = NULL; - strings = g_list_append (strings, _("Individual")); - strings = g_list_append (strings, _("Group")); - strings = g_list_append (strings, _("Resource")); - strings = g_list_append (strings, _("Room")); - strings = g_list_append (strings, _("Unknown")); + strings = g_list_append (strings, (char*) U_("Individual")); + strings = g_list_append (strings, (char*) U_("Group")); + strings = g_list_append (strings, (char*) U_("Resource")); + strings = g_list_append (strings, (char*) U_("Room")); + strings = g_list_append (strings, (char*) U_("Unknown")); e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell), strings); e_table_extras_add_cell (extras, "typeedit", popup_cell); @@ -700,11 +701,11 @@ build_etable (ETableModel *model, const gchar *spec_file, const gchar *state_fil gtk_object_unref (GTK_OBJECT (cell)); strings = NULL; - strings = g_list_append (strings, _("Chair")); - strings = g_list_append (strings, _("Required Participant")); - strings = g_list_append (strings, _("Optional Participant")); - strings = g_list_append (strings, _("Non-Participant")); - strings = g_list_append (strings, _("Unknown")); + strings = g_list_append (strings, (char*) U_("Chair")); + strings = g_list_append (strings, (char*) U_("Required Participant")); + strings = g_list_append (strings, (char*) U_("Optional Participant")); + strings = g_list_append (strings, (char*) U_("Non-Participant")); + strings = g_list_append (strings, (char*) U_("Unknown")); e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell), strings); e_table_extras_add_cell (extras, "roleedit", popup_cell); @@ -716,8 +717,8 @@ build_etable (ETableModel *model, const gchar *spec_file, const gchar *state_fil gtk_object_unref (GTK_OBJECT (cell)); strings = NULL; - strings = g_list_append (strings, _("Yes")); - strings = g_list_append (strings, _("No")); + strings = g_list_append (strings, (char*) U_("Yes")); + strings = g_list_append (strings, (char*) U_("No")); e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell), strings); e_table_extras_add_cell (extras, "rsvpedit", popup_cell); @@ -729,11 +730,11 @@ build_etable (ETableModel *model, const gchar *spec_file, const gchar *state_fil gtk_object_unref (GTK_OBJECT (cell)); strings = NULL; - strings = g_list_append (strings, _("Needs Action")); - strings = g_list_append (strings, _("Accepted")); - strings = g_list_append (strings, _("Declined")); - strings = g_list_append (strings, _("Tentative")); - strings = g_list_append (strings, _("Delegated")); + strings = g_list_append (strings, (char*) U_("Needs Action")); + strings = g_list_append (strings, (char*) U_("Accepted")); + strings = g_list_append (strings, (char*) U_("Declined")); + strings = g_list_append (strings, (char*) U_("Tentative")); + strings = g_list_append (strings, (char*) U_("Delegated")); e_cell_combo_set_popdown_strings (E_CELL_COMBO (popup_cell), strings); e_table_extras_add_cell (extras, "statusedit", popup_cell); -- cgit v1.2.3