aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog20
-rw-r--r--calendar/gui/apps_evolution_calendar.schemas.in.in12
2 files changed, 32 insertions, 0 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 31ed0b961b..973136dba8 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,22 @@
+2006-07-10 Chenthill Palanisamy <pchenthill@novell.com>
+
+ Fixes #332911
+ * gui/apps_evolution_calendar.schemas.in.in:
+ * gui/calendar-config-keys.h:
+ * gui/calendar-config.c: (set_standard_offsets),
+ (calendar_config_get_icaltimezone),
+ (calendar_config_add_notification_timezone),
+ (calendar_config_get_daylight_saving),
+ (calendar_config_set_daylight_saving),
+ (calendar_config_add_notification_daylight_saving):
+ * gui/calendar-config.h:
+ * gui/dialogs/cal-prefs-dialog.c: (timezone_changed),
+ (daylight_saving_changed), (setup_changes), (show_config),
+ (calendar_prefs_dialog_construct):
+ * gui/dialogs/cal-prefs-dialog.glade:
+ * gui/dialogs/cal-prefs-dialog.h: Added the support
+ for optional daylight savings time with timezones.
+
2006-07-08 Ushveen Kaur <kushveen@novell.com>
Fixes #332230.
@@ -19,6 +38,7 @@
(alarm_to_malarm_widgets); (populate_widgets_from_alarm):
Handle mail alarm.
+>>>>>>> 1.3068
2006-06-30 Johnny Jacob <jjohnny@novell.com>
* gui/cal-search-bar.c: (get_current_category),
(get_category_sexp), (notify_e_cal_view_contains),
diff --git a/calendar/gui/apps_evolution_calendar.schemas.in.in b/calendar/gui/apps_evolution_calendar.schemas.in.in
index 0286abbf26..4bdac3a82f 100644
--- a/calendar/gui/apps_evolution_calendar.schemas.in.in
+++ b/calendar/gui/apps_evolution_calendar.schemas.in.in
@@ -16,6 +16,18 @@
</schema>
<schema>
+ <key>/schemas/apps/evolution/calendar/display/use_daylight_saving</key>
+ <applyto>/apps/evolution/calendar/display/use_daylight_saving</applyto>
+ <owner>evolution-calendar</owner>
+ <type>bool</type>
+ <default>false</default>
+ <locale name="C">
+ <short>daylight savings time</short>
+ <long>Whether to use daylight savings time while displaying events.</long>
+ </locale>
+ </schema>
+
+ <schema>
<key>/schemas/apps/evolution/calendar/display/use_24hour_format</key>
<applyto>/apps/evolution/calendar/display/use_24hour_format</applyto>
<owner>evolution-calendar</owner>