Mercurial > hg > forks > geeqie
diff src/preferences.c @ 2746:8bab8ac8ade0
Local time - UTC offset and daylight saving correction
Use GPS lat/long to provide local time corrected for UTC offset and DST
correction.
The corrected time is available in formatted.localtime
The selected timezone is available in formatted.timezone
author | Colin Clark <colin.clark@cclark.uk> |
---|---|
date | Wed, 25 Apr 2018 11:46:38 +0100 |
parents | 808983eb036e |
children | 0eac8ea9b1be |
line wrap: on
line diff
--- a/src/preferences.c Thu Apr 12 11:34:52 2018 +0100 +++ b/src/preferences.c Wed Apr 25 11:46:38 2018 +0100 @@ -46,6 +46,7 @@ #include "ui_tabcomp.h" #include "ui_utildlg.h" #include "window.h" +#include "zonedetect.h" #include <math.h> @@ -2739,26 +2740,24 @@ gchar *comment; gint i_authors = 0; gchar *path; + GString *copyright; + gchar *zd_path; + ZoneDetect *cd; FILE *fp = NULL; #define LINE_LENGTH 1000 gchar line[LINE_LENGTH]; -#if !GTK_CHECK_VERSION(3,0,0) - GString *copyright; - copyright = g_string_new(NULL); - path = g_build_filename(GQ_HELPDIR, "COPYING", NULL); - fp = fopen(path, "r"); - if (fp) + copyright = g_string_append(copyright, "This program comes with absolutely no warranty.\nGNU General Public License, version 2 or later.\nSee https://www.gnu.org/licenses/old-licenses/gpl-2.0.html\n\n"); + + zd_path = g_build_filename(GQ_BIN_DIR, TIMEZONE_DATABASE, NULL); + cd = ZDOpenDatabase(zd_path); + if (cd) { - while(fgets(line, LINE_LENGTH, fp)) - { - copyright = g_string_append(copyright, line); - } - fclose(fp); + copyright = g_string_append(copyright, ZDGetNotice(cd)); } - g_free(path); -#endif + ZDCloseDatabase(cd); + g_free(zd_path); authors[0] = NULL; path = g_build_filename(GQ_HELPDIR, "AUTHORS", NULL); @@ -2794,16 +2793,12 @@ "comments", comment, "authors", authors, "translator-credits", _("translator-credits"), -#if GTK_CHECK_VERSION(3,0,0) - "license-type", GTK_LICENSE_GPL_2_0, -#else - "license", copyright->str, -#endif + "wrap-license", TRUE, + "license", copyright->str, NULL); -#if !GTK_CHECK_VERSION(3,0,0) g_string_free(copyright, TRUE); -#endif + gint n = 0; while(n < i_authors) {