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

utils: Cleanup first weekday function

Browse Source
This commit is contained in:
Georges Basile Stavracas Neto
2018-01-28 09:59:08 -02:00
parent 3873b3b5bb
commit 30ba757c40
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gcal-utils.c
+12 -8
View File
@@ -407,16 +407,14 @@ gint
get_first_weekday (void) get_first_weekday (void)
{ {
int week_start; int week_start;
#ifdef HAVE__NL_TIME_FIRST_WEEKDAY
union { unsigned int word; char *string; } langinfo;
int week_1stday = 0;
int first_weekday = 1;
guint week_origin;
#else
char *gtk_week_start;
#endif
#ifdef HAVE__NL_TIME_FIRST_WEEKDAY #ifdef HAVE__NL_TIME_FIRST_WEEKDAY
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); langinfo.string = nl_langinfo (_NL_TIME_FIRST_WEEKDAY);
first_weekday = langinfo.string[0]; first_weekday = langinfo.string[0];
langinfo.string = nl_langinfo (_NL_TIME_WEEK_1STDAY); langinfo.string = nl_langinfo (_NL_TIME_WEEK_1STDAY);
@@ -429,7 +427,12 @@ get_first_weekday (void)
g_warning ("Unknown value of _NL_TIME_WEEK_1STDAY.\n"); g_warning ("Unknown value of _NL_TIME_WEEK_1STDAY.\n");
week_start = (week_1stday + first_weekday - 1) % 7; week_start = (week_1stday + first_weekday - 1) % 7;
#else #else
gchar *gtk_week_start;
/* Use a define to hide the string from xgettext */ /* Use a define to hide the string from xgettext */
# define GTK_WEEK_START "calendar:week_start:0" # define GTK_WEEK_START "calendar:week_start:0"
gtk_week_start = dgettext ("gtk30", GTK_WEEK_START); gtk_week_start = dgettext ("gtk30", GTK_WEEK_START);
@@ -445,6 +448,7 @@ get_first_weekday (void)
"did so wrongly.\n"); "did so wrongly.\n");
week_start = 0; week_start = 0;
} }
#endif #endif
return week_start; return week_start;