Merge branch 'gweather-api-fix' into 'master'
Adapt to the libgweather API changes See merge request GNOME/gnome-calendar!15
This commit is contained in:
+1
-1
@@ -176,7 +176,7 @@ glib_dep = dependency('glib-2.0', version: '>= 2.43.4')
|
|||||||
gtk_dep = dependency('gtk+-3.0', version: '>= 3.22.20')
|
gtk_dep = dependency('gtk+-3.0', version: '>= 3.22.20')
|
||||||
gio_dep = dependency('gio-2.0', version: '>= 2.43.4')
|
gio_dep = dependency('gio-2.0', version: '>= 2.43.4')
|
||||||
goa_dep = dependency('goa-1.0', version: '>= 3.2.0')
|
goa_dep = dependency('goa-1.0', version: '>= 3.2.0')
|
||||||
gweather_dep = dependency('gweather-3.0', version: '>= 3.24.0')
|
gweather_dep = dependency('gweather-3.0', version: '>= 3.27.2')
|
||||||
geoclue_dep = dependency('libgeoclue-2.0', version: '>=2.4')
|
geoclue_dep = dependency('libgeoclue-2.0', version: '>=2.4')
|
||||||
geocode_dep = dependency('geocode-glib-1.0', version: '>=3.23')
|
geocode_dep = dependency('geocode-glib-1.0', version: '>=3.23')
|
||||||
m_dep = cc.find_library('m')
|
m_dep = cc.find_library('m')
|
||||||
|
|||||||
@@ -513,7 +513,7 @@ update_location (GcalWeatherService *self,
|
|||||||
g_debug ("Got new weather service location: '%s'",
|
g_debug ("Got new weather service location: '%s'",
|
||||||
(location == NULL)? "<null>" : gweather_location_get_name (location));
|
(location == NULL)? "<null>" : gweather_location_get_name (location));
|
||||||
|
|
||||||
self->gweather_info = gweather_info_new (location, GWEATHER_FORECAST_ZONE | GWEATHER_FORECAST_LIST);
|
self->gweather_info = gweather_info_new (location);
|
||||||
|
|
||||||
/* NOTE: We do not get detailed infos for GWEATHER_PROVIDER_ALL.
|
/* NOTE: We do not get detailed infos for GWEATHER_PROVIDER_ALL.
|
||||||
* This combination works fine, though. We should open a bug / investigate
|
* This combination works fine, though. We should open a bug / investigate
|
||||||
|
|||||||
Reference in New Issue
Block a user