Federated_Computer/federated-calendar
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

date-chooser: don't reimplement get_first_weekday

Browse Source 
Function calendar_get_week_start do the same things with the same code as
function get_first_weekday, so it is better to remove calendar_get_week_start
and switch all the use of calendar_get_week_start to get_first_weekday.

This also fixes build problems on non-glibc systems because get_first_weekday
provides fallback for non-glibc systems.

https://bugzilla.gnome.org/show_bug.cgi?id=769140
This commit is contained in:
Ting-Wei Lan
2016-07-27 01:56:41 -03:00
committed by Georges Basile Stavracas Neto
parent e3d29c989e
commit f8a3c7731c
1 changed files with 1 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gcal-date-chooser.c
+1 -24
View File
@@ -327,29 +327,6 @@ calendar_update_selected_day (GcalDateChooser *self)
}
}
static gint
calendar_get_week_start (void)
{
union { unsigned int word; char *string; } langinfo;
gint week_1stday = 0;
gint first_weekday = 1;
guint week_origin;
langinfo.string = nl_langinfo (_NL_TIME_FIRST_WEEKDAY);
first_weekday = langinfo.string[0];
langinfo.string = nl_langinfo (_NL_TIME_WEEK_1STDAY);
week_origin = langinfo.word;
if (week_origin == 19971130) /* Sunday */
week_1stday = 0;
else if (week_origin == 19971201) /* Monday */
week_1stday = 1;
else
g_warning ("Unknown value of _NL_TIME_WEEK_1STDAY.");
return (week_1stday + first_weekday - 1) % 7;
}
static void
day_selected_cb (GcalDateChooserDay *d,
GcalDateChooser *self)
@@ -577,7 +554,7 @@ gcal_date_chooser_init (GcalDateChooser *self)
self->date = g_date_time_new_now_local ();
g_date_time_get_ymd (self->date, &self->this_year, NULL, NULL);
self->week_start = calendar_get_week_start ();
self->week_start = get_first_weekday ();
gtk_widget_init_template (GTK_WIDGET (self));