diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2013-03-07 09:27:31 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2013-03-17 20:49:12 +0800 |
commit | 3b205698762afcd86ac79595960253d84aff5487 (patch) | |
tree | f0f1ae05b5bd7fbd0008dbd8dbdd10908ebc1c6c /modules/calendar/e-cal-shell-settings.c | |
parent | 5a7097278a6f6eb2a984d9e0c742342135971c35 (diff) | |
download | gsoc2013-evolution-3b205698762afcd86ac79595960253d84aff5487.tar.gz gsoc2013-evolution-3b205698762afcd86ac79595960253d84aff5487.tar.zst gsoc2013-evolution-3b205698762afcd86ac79595960253d84aff5487.zip |
Convert all "week-start-day" properties to GDateWeekday.
Diffstat (limited to 'modules/calendar/e-cal-shell-settings.c')
-rw-r--r-- | modules/calendar/e-cal-shell-settings.c | 63 |
1 files changed, 7 insertions, 56 deletions
diff --git a/modules/calendar/e-cal-shell-settings.c b/modules/calendar/e-cal-shell-settings.c index 7f6527b531..d3288401f5 100644 --- a/modules/calendar/e-cal-shell-settings.c +++ b/modules/calendar/e-cal-shell-settings.c @@ -147,31 +147,7 @@ transform_weekdays_settings_to_evolution (GBinding *binding, } /* Evolution numbering */ - switch (weekday) { - case G_DATE_MONDAY: - g_value_set_int (target_value, 0); - break; - case G_DATE_TUESDAY: - g_value_set_int (target_value, 1); - break; - case G_DATE_WEDNESDAY: - g_value_set_int (target_value, 2); - break; - case G_DATE_THURSDAY: - g_value_set_int (target_value, 3); - break; - case G_DATE_FRIDAY: - g_value_set_int (target_value, 4); - break; - case G_DATE_SATURDAY: - g_value_set_int (target_value, 5); - break; - case G_DATE_SUNDAY: - g_value_set_int (target_value, 6); - break; - default: - return FALSE; - } + g_value_set_enum (target_value, weekday); return TRUE; } @@ -192,34 +168,10 @@ transform_weekdays_evolution_to_settings (GBinding *binding, /* This is purposefully verbose for better readability. */ - /* setting numbering */ - switch (g_value_get_int (source_value)) { - case 0: - weekday = G_DATE_MONDAY; - break; - case 1: - weekday = G_DATE_TUESDAY; - break; - case 2: - weekday = G_DATE_WEDNESDAY; - break; - case 3: - weekday = G_DATE_THURSDAY; - break; - case 4: - weekday = G_DATE_FRIDAY; - break; - case 5: - weekday = G_DATE_SATURDAY; - break; - case 6: - weekday = G_DATE_SUNDAY; - break; - default: - return FALSE; - } - /* Evolution numbering */ + weekday = g_value_get_enum (source_value); + + /* setting numbering */ switch (weekday) { case G_DATE_MONDAY: g_value_set_int (target_value, 1); @@ -802,13 +754,12 @@ e_cal_shell_backend_init_settings (EShell *shell) (GDestroyNotify) g_object_unref); e_shell_settings_install_property ( - g_param_spec_int ( + g_param_spec_enum ( "cal-week-start-day", NULL, NULL, - 0, /* Monday */ - 6, /* Sunday */ - 0, + E_TYPE_DATE_WEEKDAY, + G_DATE_MONDAY, G_PARAM_READWRITE)); g_object_bind_property_full ( |