Merge branch 'master.msvc' into 'master'

demos: Fix builds against Visual Studio headers

See merge request GNOME/gtk!2130
This commit is contained in:
Timm Bäder 2020-06-22 12:02:26 +00:00
commit 9f1208b595
2 changed files with 5 additions and 5 deletions

View File

@ -323,16 +323,16 @@ gtk_clock_init (GtkClock *self)
static GtkClock *
gtk_clock_new (const char *location,
GTimeZone *_timezone)
GTimeZone *_tz)
{
GtkClock *result;
result = g_object_new (GTK_TYPE_CLOCK,
"location", location,
"timezone", _timezone,
"timezone", _tz,
NULL);
g_clear_pointer (&_timezone, g_time_zone_unref);
g_clear_pointer (&_tz, g_time_zone_unref);
return result;
}

View File

@ -77,13 +77,13 @@ gtk_weather_info_new (GDateTime *timestamp,
static GDateTime *
parse_timestamp (const char *string,
GTimeZone *_timezone)
GTimeZone *_tz)
{
char *with_seconds;
GDateTime *result;
with_seconds = g_strconcat (string, ":00", NULL);
result = g_date_time_new_from_iso8601 (with_seconds, _timezone);
result = g_date_time_new_from_iso8601 (with_seconds, _tz);
g_free (with_seconds);
return result;