Use weather service from GcalContext
All those properties were a waste compared to storing it into the context.
This commit is contained in:
+10
-22
@@ -122,8 +122,6 @@ struct _GcalMonthView
|
||||
icaltimetype *date;
|
||||
GcalContext *context;
|
||||
|
||||
GcalWeatherService *weather_service;
|
||||
|
||||
gboolean pending_event_allocation;
|
||||
};
|
||||
|
||||
@@ -158,7 +156,6 @@ enum
|
||||
PROP_0,
|
||||
PROP_DATE,
|
||||
PROP_CONTEXT,
|
||||
PROP_WEATHER_SERVICE,
|
||||
N_PROPS
|
||||
};
|
||||
|
||||
@@ -872,16 +869,15 @@ static GcalWeatherInfo*
|
||||
get_weather_info_for_cell (GcalMonthView *self,
|
||||
guint cell)
|
||||
{
|
||||
GcalWeatherService *weather_service;
|
||||
GcalMonthCell *first_cell;
|
||||
GPtrArray *weather_infos;
|
||||
GDateTime *first_dt;
|
||||
GDate first;
|
||||
guint i;
|
||||
|
||||
if (!self->weather_service)
|
||||
return NULL;
|
||||
|
||||
weather_infos = gcal_weather_service_get_weather_infos (self->weather_service);
|
||||
weather_service = gcal_context_get_weather_service (self->context);
|
||||
weather_infos = gcal_weather_service_get_weather_infos (weather_service);
|
||||
|
||||
first_cell = GCAL_MONTH_CELL (self->month_cell[0][0]);
|
||||
first_dt = gcal_month_cell_get_date (first_cell);
|
||||
@@ -2100,15 +2096,14 @@ gcal_month_view_set_property (GObject *object,
|
||||
self,
|
||||
G_CONNECT_SWAPPED);
|
||||
|
||||
g_object_notify (object, "context");
|
||||
break;
|
||||
g_signal_connect_object (gcal_context_get_weather_service (self->context),
|
||||
"weather-changed",
|
||||
G_CALLBACK (on_weather_service_weather_changed_cb),
|
||||
self,
|
||||
0);
|
||||
update_weather (self, TRUE);
|
||||
|
||||
case PROP_WEATHER_SERVICE:
|
||||
gcal_view_set_weather_service_impl_helper (&self->weather_service,
|
||||
g_value_get_object (value),
|
||||
(GcalWeatherUpdateFunc) update_weather,
|
||||
G_CALLBACK (on_weather_service_weather_changed_cb),
|
||||
GTK_WIDGET (self));
|
||||
g_object_notify (object, "context");
|
||||
break;
|
||||
|
||||
default:
|
||||
@@ -2135,10 +2130,6 @@ gcal_month_view_get_property (GObject *object,
|
||||
g_value_set_object (value, self->context);
|
||||
break;
|
||||
|
||||
case PROP_WEATHER_SERVICE:
|
||||
g_value_set_boxed (value, self->weather_service);
|
||||
break;
|
||||
|
||||
default:
|
||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
|
||||
break;
|
||||
@@ -2157,7 +2148,6 @@ gcal_month_view_finalize (GObject *object)
|
||||
g_clear_pointer (&self->multi_cell_children, g_list_free);
|
||||
|
||||
g_clear_object (&self->context);
|
||||
g_clear_object (&self->weather_service);
|
||||
|
||||
if (self->update_grid_id > 0)
|
||||
{
|
||||
@@ -2201,7 +2191,6 @@ gcal_month_view_class_init (GcalMonthViewClass *klass)
|
||||
|
||||
g_object_class_override_property (object_class, PROP_DATE, "active-date");
|
||||
g_object_class_override_property (object_class, PROP_CONTEXT, "context");
|
||||
g_object_class_override_property (object_class, PROP_WEATHER_SERVICE, "weather-service");
|
||||
|
||||
gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/calendar/month-view.ui");
|
||||
|
||||
@@ -2229,7 +2218,6 @@ gcal_month_view_init (GcalMonthView *self)
|
||||
|
||||
gtk_widget_set_has_window (GTK_WIDGET (self), FALSE);
|
||||
|
||||
self->weather_service = NULL;
|
||||
self->children = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify) g_list_free);
|
||||
self->single_cell_children = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, (GDestroyNotify) g_list_free);
|
||||
self->overflow_cells = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, (GDestroyNotify) g_list_free);
|
||||
|
||||
@@ -55,18 +55,6 @@ gcal_view_default_init (GcalViewInterface *iface)
|
||||
GCAL_TYPE_CONTEXT,
|
||||
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
|
||||
|
||||
/**
|
||||
* GcalView::weather-service:
|
||||
*
|
||||
* The #GcalWeatherService of the view.
|
||||
*/
|
||||
g_object_interface_install_property (iface,
|
||||
g_param_spec_object ("weather-service",
|
||||
"The weather service",
|
||||
"The weather service of the view",
|
||||
GCAL_TYPE_WEATHER_SERVICE,
|
||||
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
|
||||
|
||||
/**
|
||||
* GcalView::create-event:
|
||||
*
|
||||
@@ -149,82 +137,6 @@ gcal_view_get_context (GcalView *self)
|
||||
return context;
|
||||
}
|
||||
|
||||
/**
|
||||
* gcal_view_get_weather_service:
|
||||
* @self: The #GcalView instance.
|
||||
* @service: (nullable): The weather service to query.
|
||||
*
|
||||
* Sets the service to query for weather reports.
|
||||
*/
|
||||
GcalWeatherService*
|
||||
gcal_view_get_weather_service (GcalView *self)
|
||||
{
|
||||
GcalWeatherService *service; /* unowned */
|
||||
|
||||
g_return_val_if_fail (GCAL_IS_VIEW (self), NULL);
|
||||
|
||||
g_object_get (self, "weather-service", &service, NULL);
|
||||
g_object_unref (service);
|
||||
|
||||
return service;
|
||||
}
|
||||
|
||||
/**
|
||||
* gcal_view_set_weather_service:
|
||||
* @self: The #GcalView instance.
|
||||
*
|
||||
* Returns: (transfer none): The internal weather service object.
|
||||
*/
|
||||
void
|
||||
gcal_view_set_weather_service (GcalView *self,
|
||||
GcalWeatherService *service)
|
||||
{
|
||||
g_return_if_fail (GCAL_IS_VIEW (self));
|
||||
g_return_if_fail (service == NULL || GCAL_IS_WEATHER_SERVICE (service));
|
||||
|
||||
g_object_set (self, "weather-service", service, NULL);
|
||||
}
|
||||
|
||||
/**
|
||||
* gcal_view_set_weather_service_impl_helper:
|
||||
* @old_service: The views weather service field.
|
||||
* @new_service: (nullable): The new weather service to use.
|
||||
* @update_func: The function to call after updating weather.
|
||||
* @weather_changed_cb: The views "weather-changed" handler
|
||||
* @data: The data to pass to @update_func and @weather_changed_cb
|
||||
*
|
||||
* Internal implementation helper for
|
||||
* gcal_view_set_weather_service().
|
||||
*/
|
||||
void
|
||||
gcal_view_set_weather_service_impl_helper (GcalWeatherService **old_service,
|
||||
GcalWeatherService *new_service,
|
||||
GcalWeatherUpdateFunc update_func,
|
||||
GCallback weather_changed_cb,
|
||||
GtkWidget *data)
|
||||
{
|
||||
g_return_if_fail (old_service != NULL);
|
||||
g_return_if_fail (*old_service == NULL || GCAL_IS_WEATHER_SERVICE (*old_service));
|
||||
g_return_if_fail (new_service == NULL || GCAL_IS_WEATHER_SERVICE (new_service));
|
||||
g_return_if_fail (update_func != NULL);
|
||||
g_return_if_fail (weather_changed_cb != NULL);
|
||||
g_return_if_fail (GTK_IS_WIDGET (data));
|
||||
|
||||
if (*old_service != new_service)
|
||||
{
|
||||
if (*old_service)
|
||||
g_signal_handlers_disconnect_by_func (*old_service, weather_changed_cb, data);
|
||||
|
||||
g_set_object (old_service, new_service);
|
||||
|
||||
if (*old_service)
|
||||
g_signal_connect_object (*old_service, "weather-changed", weather_changed_cb, data, 0);
|
||||
|
||||
update_func (data);
|
||||
g_object_notify (G_OBJECT (data), "weather-service");
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* gcal_view_get_date:
|
||||
* @view: a #GcalView
|
||||
|
||||
@@ -21,7 +21,6 @@
|
||||
|
||||
#include "gcal-context.h"
|
||||
#include "gcal-event-widget.h"
|
||||
#include "gcal-weather-service.h"
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
@@ -29,8 +28,6 @@ G_BEGIN_DECLS
|
||||
|
||||
G_DECLARE_INTERFACE (GcalView, gcal_view, GCAL, VIEW, GtkWidget)
|
||||
|
||||
typedef void (*GcalWeatherUpdateFunc) (GtkWidget *widget);
|
||||
|
||||
struct _GcalViewInterface
|
||||
{
|
||||
GTypeInterface parent;
|
||||
@@ -66,17 +63,6 @@ icaltimetype* gcal_view_get_date (GcalView
|
||||
|
||||
GcalContext* gcal_view_get_context (GcalView *self);
|
||||
|
||||
GcalWeatherService* gcal_view_get_weather_service (GcalView *view);
|
||||
|
||||
void gcal_view_set_weather_service (GcalView *view,
|
||||
GcalWeatherService *service);
|
||||
|
||||
void gcal_view_set_weather_service_impl_helper (GcalWeatherService **old_service,
|
||||
GcalWeatherService *new_service,
|
||||
GcalWeatherUpdateFunc update_func,
|
||||
GCallback weather_changed_cb,
|
||||
GtkWidget *data);
|
||||
|
||||
void gcal_view_clear_marks (GcalView *view);
|
||||
|
||||
GList* gcal_view_get_children_by_uuid (GcalView *view,
|
||||
|
||||
+84
-212
@@ -108,13 +108,6 @@ typedef enum
|
||||
DOWN
|
||||
} MoveDirection;
|
||||
|
||||
enum
|
||||
{
|
||||
PROP_0,
|
||||
PROP_WEATHER_SERVICE,
|
||||
NUM_PROPS
|
||||
};
|
||||
|
||||
enum
|
||||
{
|
||||
EVENT_ACTIVATED,
|
||||
@@ -145,6 +138,77 @@ wid_clear (WeatherInfoDay *wid)
|
||||
g_clear_object (&wid->icon_buf);
|
||||
}
|
||||
|
||||
static gint
|
||||
add_weather_infos (GcalWeekHeader *self,
|
||||
GPtrArray *weather_infos)
|
||||
{
|
||||
g_autoptr (GDateTime) week_start_dt = NULL;
|
||||
GDate week_start;
|
||||
gint consumed = 0;
|
||||
guint i;
|
||||
|
||||
if (!self->active_date)
|
||||
return 0;
|
||||
|
||||
week_start_dt = get_start_of_week (self->active_date);
|
||||
g_date_set_dmy (&week_start,
|
||||
g_date_time_get_day_of_month (week_start_dt),
|
||||
g_date_time_get_month (week_start_dt),
|
||||
g_date_time_get_year (week_start_dt));
|
||||
|
||||
for (i = 0; weather_infos && i < weather_infos->len; i++)
|
||||
{
|
||||
GcalWeatherInfo *gwi; /* unowned */
|
||||
GDate gwi_date;
|
||||
gint day_diff;
|
||||
|
||||
gwi = g_ptr_array_index (weather_infos, i);
|
||||
|
||||
gcal_weather_info_get_date (gwi, &gwi_date);
|
||||
|
||||
day_diff = g_date_days_between (&week_start, &gwi_date);
|
||||
if (day_diff >= 0 && day_diff < G_N_ELEMENTS (self->weather_infos))
|
||||
{
|
||||
wid_clear (&self->weather_infos[day_diff]);
|
||||
self->weather_infos[day_diff].winfo = g_object_ref (gwi);
|
||||
consumed++;
|
||||
}
|
||||
}
|
||||
|
||||
if (consumed > 0)
|
||||
gtk_widget_queue_draw (GTK_WIDGET (self));
|
||||
|
||||
return consumed;
|
||||
}
|
||||
|
||||
static void
|
||||
clear_weather_infos (GcalWeekHeader *self)
|
||||
{
|
||||
g_return_if_fail (GCAL_IS_WEEK_HEADER (self));
|
||||
|
||||
for (gint i = 0; i < G_N_ELEMENTS (self->weather_infos); i++)
|
||||
wid_clear (&self->weather_infos[i]);
|
||||
|
||||
gtk_widget_queue_draw (GTK_WIDGET (self));
|
||||
}
|
||||
|
||||
static void
|
||||
update_weather_infos (GcalWeekHeader *self)
|
||||
{
|
||||
GPtrArray* weather_infos;
|
||||
|
||||
g_return_if_fail (GCAL_IS_WEEK_HEADER (self));
|
||||
|
||||
clear_weather_infos (self);
|
||||
|
||||
if (!self->weather_service)
|
||||
return;
|
||||
|
||||
weather_infos = gcal_weather_service_get_weather_infos (self->weather_service);
|
||||
add_weather_infos (self, weather_infos);
|
||||
}
|
||||
|
||||
|
||||
/* Event activation methods */
|
||||
static void
|
||||
on_event_widget_activated (GcalEventWidget *widget,
|
||||
@@ -287,11 +351,11 @@ static void
|
||||
on_weather_update (GcalWeatherService *weather_service,
|
||||
GcalWeekHeader *self)
|
||||
{
|
||||
g_return_if_fail (GCAL_IS_WEATHER_SERVICE (weather_service));
|
||||
g_return_if_fail (GCAL_IS_WEEK_HEADER (self));
|
||||
g_return_if_fail (self->weather_service == weather_service);
|
||||
g_assert (GCAL_IS_WEATHER_SERVICE (weather_service));
|
||||
g_assert (GCAL_IS_WEEK_HEADER (self));
|
||||
g_assert (self->weather_service == weather_service);
|
||||
|
||||
gcal_week_header_update_weather_infos (self);
|
||||
update_weather_infos (self);
|
||||
}
|
||||
|
||||
static GcalEvent*
|
||||
@@ -1104,46 +1168,6 @@ gcal_week_header_finalize (GObject *object)
|
||||
wid_clear (&self->weather_infos[i]);
|
||||
}
|
||||
|
||||
static void
|
||||
gcal_week_header_get_property (GObject *object,
|
||||
guint property_id,
|
||||
GValue *value,
|
||||
GParamSpec *pspec)
|
||||
{
|
||||
GcalWeekHeader *self = GCAL_WEEK_HEADER (object);
|
||||
|
||||
switch (property_id)
|
||||
{
|
||||
case PROP_WEATHER_SERVICE:
|
||||
g_value_set_boxed (value, self->weather_service);
|
||||
break;
|
||||
|
||||
default:
|
||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
gcal_week_header_set_property (GObject *object,
|
||||
guint property_id,
|
||||
const GValue *value,
|
||||
GParamSpec *pspec)
|
||||
{
|
||||
GcalWeekHeader *self = GCAL_WEEK_HEADER (object);
|
||||
|
||||
switch (property_id)
|
||||
{
|
||||
case PROP_WEATHER_SERVICE:
|
||||
gcal_week_header_set_weather_service (self, GCAL_WEATHER_SERVICE (g_value_get_object (value)));
|
||||
break;
|
||||
|
||||
default:
|
||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
gcal_week_header_size_allocate (GtkWidget *widget,
|
||||
GtkAllocation *alloc)
|
||||
@@ -1615,8 +1639,6 @@ gcal_week_header_class_init (GcalWeekHeaderClass *kclass)
|
||||
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (kclass);
|
||||
|
||||
object_class->finalize = gcal_week_header_finalize;
|
||||
object_class->get_property = gcal_week_header_get_property;
|
||||
object_class->set_property = gcal_week_header_set_property;
|
||||
|
||||
widget_class->draw = gcal_week_header_draw;
|
||||
widget_class->size_allocate = gcal_week_header_size_allocate;
|
||||
@@ -1624,19 +1646,6 @@ gcal_week_header_class_init (GcalWeekHeaderClass *kclass)
|
||||
widget_class->drag_leave = gcal_week_header_drag_leave;
|
||||
widget_class->drag_drop = gcal_week_header_drag_drop;
|
||||
|
||||
/**
|
||||
* GcalWeekHeader::weather-service:
|
||||
*
|
||||
* The #GcalWeatherService of the view.
|
||||
*/
|
||||
g_object_class_install_property (G_OBJECT_CLASS (kclass),
|
||||
PROP_WEATHER_SERVICE,
|
||||
g_param_spec_object ("weather-service",
|
||||
"The weather service",
|
||||
"The weather service of the view",
|
||||
GCAL_TYPE_WEATHER_SERVICE,
|
||||
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
|
||||
|
||||
signals[EVENT_ACTIVATED] = g_signal_new ("event-activated",
|
||||
GCAL_TYPE_WEEK_HEADER,
|
||||
G_SIGNAL_RUN_FIRST,
|
||||
@@ -1690,127 +1699,6 @@ G_GNUC_END_IGNORE_DEPRECATIONS
|
||||
GDK_ACTION_MOVE);
|
||||
}
|
||||
|
||||
/* Private API */
|
||||
|
||||
/* gcal_week_header_add_weather_infos:
|
||||
* @self: (not nullable): The #GcalWeekHeader instance.
|
||||
* @winfo: List of #GcalWeatherInfos to add to @self.
|
||||
*
|
||||
* Adds weather information to this header. @self
|
||||
* only adds weather information that can be
|
||||
* displayed with current settings.
|
||||
*
|
||||
* Return: Number of consumed weather information
|
||||
* objects.
|
||||
*/
|
||||
static gint
|
||||
gcal_week_header_add_weather_infos (GcalWeekHeader *self,
|
||||
GPtrArray *weather_infos)
|
||||
{
|
||||
g_autoptr (GDateTime) week_start_dt = NULL;
|
||||
GDate week_start;
|
||||
gint consumed = 0;
|
||||
guint i;
|
||||
|
||||
if (!self->active_date)
|
||||
return 0;
|
||||
|
||||
week_start_dt = get_start_of_week (self->active_date);
|
||||
g_date_set_dmy (&week_start,
|
||||
g_date_time_get_day_of_month (week_start_dt),
|
||||
g_date_time_get_month (week_start_dt),
|
||||
g_date_time_get_year (week_start_dt));
|
||||
|
||||
for (i = 0; weather_infos && i < weather_infos->len; i++)
|
||||
{
|
||||
GcalWeatherInfo *gwi; /* unowned */
|
||||
GDate gwi_date;
|
||||
gint day_diff;
|
||||
|
||||
gwi = g_ptr_array_index (weather_infos, i);
|
||||
|
||||
gcal_weather_info_get_date (gwi, &gwi_date);
|
||||
|
||||
day_diff = g_date_days_between (&week_start, &gwi_date);
|
||||
if (day_diff >= 0 && day_diff < G_N_ELEMENTS (self->weather_infos))
|
||||
{
|
||||
wid_clear (&self->weather_infos[day_diff]);
|
||||
self->weather_infos[day_diff].winfo = g_object_ref (gwi);
|
||||
consumed++;
|
||||
}
|
||||
}
|
||||
|
||||
if (consumed > 0)
|
||||
gtk_widget_queue_draw (GTK_WIDGET (self));
|
||||
|
||||
return consumed;
|
||||
}
|
||||
|
||||
/* gcal_week_header_clear_weather_infos:
|
||||
* @self: The #GcalWeekHeader instance.
|
||||
*
|
||||
* Removes all registered weather information objects from
|
||||
* this widget.
|
||||
*/
|
||||
static void
|
||||
gcal_week_header_clear_weather_infos (GcalWeekHeader *self)
|
||||
{
|
||||
g_return_if_fail (GCAL_IS_WEEK_HEADER (self));
|
||||
|
||||
for (gint i = 0; i < G_N_ELEMENTS (self->weather_infos); i++)
|
||||
wid_clear (&self->weather_infos[i]);
|
||||
|
||||
gtk_widget_queue_draw (GTK_WIDGET (self));
|
||||
}
|
||||
|
||||
|
||||
/* Public API */
|
||||
|
||||
/**
|
||||
* gcal_week_header_set_weather_service:
|
||||
* @self: The #GcalWeekHeader instance.
|
||||
* @service: (nullable): The weather service to query.
|
||||
*
|
||||
* Note that #GcalWeekHeader does not hold a strong reference
|
||||
* to its weather service.
|
||||
*/
|
||||
void
|
||||
gcal_week_header_set_weather_service (GcalWeekHeader *self,
|
||||
GcalWeatherService *service)
|
||||
{
|
||||
g_return_if_fail (GCAL_IS_WEEK_HEADER (self));
|
||||
g_return_if_fail (service == NULL || GCAL_IS_WEATHER_SERVICE (service));
|
||||
|
||||
gcal_view_set_weather_service_impl_helper (&self->weather_service,
|
||||
service,
|
||||
(GcalWeatherUpdateFunc) gcal_week_header_update_weather_infos,
|
||||
(GCallback) on_weather_update,
|
||||
GTK_WIDGET (self));
|
||||
}
|
||||
|
||||
/**
|
||||
* gcal_week_header_update_weather_infos:
|
||||
* @self: The #GcalWeekHeader instance.
|
||||
*
|
||||
* Retrieves latest weather information from registered
|
||||
* weather service and displays it.
|
||||
*/
|
||||
void
|
||||
gcal_week_header_update_weather_infos (GcalWeekHeader *self)
|
||||
{
|
||||
GPtrArray* weather_infos;
|
||||
|
||||
g_return_if_fail (GCAL_IS_WEEK_HEADER (self));
|
||||
|
||||
gcal_week_header_clear_weather_infos (self);
|
||||
|
||||
if (!self->weather_service)
|
||||
return;
|
||||
|
||||
weather_infos = gcal_weather_service_get_weather_infos (self->weather_service);
|
||||
gcal_week_header_add_weather_infos (self, weather_infos);
|
||||
}
|
||||
|
||||
void
|
||||
gcal_week_header_set_context (GcalWeekHeader *self,
|
||||
GcalContext *context)
|
||||
@@ -1824,6 +1712,14 @@ gcal_week_header_set_context (GcalWeekHeader *self,
|
||||
G_CALLBACK (gtk_widget_queue_draw),
|
||||
self,
|
||||
G_CONNECT_SWAPPED);
|
||||
|
||||
g_signal_connect_object (gcal_context_get_weather_service (self->context),
|
||||
"weather-changed",
|
||||
G_CALLBACK (on_weather_update),
|
||||
self,
|
||||
0);
|
||||
|
||||
update_weather_infos (self);
|
||||
}
|
||||
|
||||
void
|
||||
@@ -2034,32 +1930,8 @@ gcal_week_header_set_date (GcalWeekHeader *self,
|
||||
if (old_date)
|
||||
update_unchanged_events (self, self->active_date);
|
||||
|
||||
gcal_week_header_update_weather_infos (self);
|
||||
update_weather_infos (self);
|
||||
|
||||
g_clear_pointer (&old_date, g_free);
|
||||
}
|
||||
|
||||
/**
|
||||
* gcal_week_header_get_weather_infos:
|
||||
* @self: The #GcalWeekHeader instance.
|
||||
*
|
||||
* Returns a list of shown weather informations.
|
||||
*
|
||||
* @Returns: (transfer container):
|
||||
* A GSList. The callee is responsible for freeing it.
|
||||
* Elements are owned by the widget. Do not modify.
|
||||
*/
|
||||
GSList*
|
||||
gcal_week_header_get_shown_weather_infos (GcalWeekHeader *self)
|
||||
{
|
||||
g_return_val_if_fail (GCAL_IS_WEEK_HEADER (self), NULL);
|
||||
GSList* lst = NULL; /* owned[unowned] */
|
||||
|
||||
for (int i = 0; i < G_N_ELEMENTS (self->weather_infos); i++)
|
||||
{
|
||||
if (self->weather_infos[i].winfo != NULL)
|
||||
lst = g_slist_prepend (lst, self->weather_infos[i].winfo);
|
||||
}
|
||||
|
||||
return lst;
|
||||
}
|
||||
|
||||
@@ -52,13 +52,6 @@ void gcal_week_header_clear_marks (GcalWeekHeader
|
||||
void gcal_week_header_set_date (GcalWeekHeader *self,
|
||||
icaltimetype *date);
|
||||
|
||||
void gcal_week_header_set_weather_service (GcalWeekHeader *self,
|
||||
GcalWeatherService *service);
|
||||
|
||||
void gcal_week_header_update_weather_infos (GcalWeekHeader *self);
|
||||
|
||||
GSList* gcal_week_header_get_shown_weather_infos (GcalWeekHeader *self);
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
#endif /* GCAL_WEEK_HEADER_H */
|
||||
|
||||
@@ -26,7 +26,6 @@
|
||||
#include "gcal-week-header.h"
|
||||
#include "gcal-week-grid.h"
|
||||
#include "gcal-week-view.h"
|
||||
#include "gcal-weather-service.h"
|
||||
|
||||
#include <glib/gi18n.h>
|
||||
|
||||
@@ -54,7 +53,6 @@ struct _GcalWeekView
|
||||
/* property */
|
||||
icaltimetype *date;
|
||||
GcalContext *context;
|
||||
GcalWeatherService *weather_service; /* owned */
|
||||
|
||||
guint scroll_grid_timeout_id;
|
||||
|
||||
@@ -73,7 +71,6 @@ enum
|
||||
PROP_DATE,
|
||||
PROP_CONTEXT,
|
||||
PROP_TIME_FORMAT,
|
||||
PROP_WEATHER_SERVICE,
|
||||
NUM_PROPS
|
||||
};
|
||||
|
||||
@@ -507,7 +504,6 @@ gcal_week_view_finalize (GObject *object)
|
||||
g_clear_pointer (&self->date, g_free);
|
||||
|
||||
g_clear_object (&self->context);
|
||||
g_clear_object (&self->weather_service);
|
||||
|
||||
/* Chain up to parent's finalize() method. */
|
||||
G_OBJECT_CLASS (gcal_week_view_parent_class)->finalize (object);
|
||||
@@ -540,11 +536,6 @@ gcal_week_view_set_property (GObject *object,
|
||||
gtk_widget_queue_draw (self->hours_bar);
|
||||
break;
|
||||
|
||||
case PROP_WEATHER_SERVICE:
|
||||
if (g_set_object (&self->weather_service, g_value_get_object (value)))
|
||||
g_object_notify (object, "weather-service");
|
||||
break;
|
||||
|
||||
default:
|
||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
|
||||
break;
|
||||
@@ -576,10 +567,6 @@ gcal_week_view_get_property (GObject *object,
|
||||
g_value_set_enum (value, self->time_format);
|
||||
break;
|
||||
|
||||
case PROP_WEATHER_SERVICE:
|
||||
g_value_set_object (value, self->weather_service);
|
||||
break;
|
||||
|
||||
default:
|
||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
|
||||
break;
|
||||
@@ -601,7 +588,6 @@ gcal_week_view_class_init (GcalWeekViewClass *klass)
|
||||
|
||||
g_object_class_override_property (object_class, PROP_DATE, "active-date");
|
||||
g_object_class_override_property (object_class, PROP_CONTEXT, "context");
|
||||
g_object_class_override_property (object_class, PROP_WEATHER_SERVICE, "weather-service");
|
||||
|
||||
g_object_class_install_property (object_class,
|
||||
PROP_TIME_FORMAT,
|
||||
@@ -631,9 +617,5 @@ gcal_week_view_init (GcalWeekView *self)
|
||||
gtk_widget_init_template (GTK_WIDGET (self));
|
||||
|
||||
update_hours_sidebar_size (self);
|
||||
|
||||
self->weather_service = NULL;
|
||||
|
||||
g_object_bind_property (self, "weather-service", self->header, "weather-service", G_BINDING_DEFAULT);
|
||||
}
|
||||
|
||||
|
||||
+12
-20
@@ -68,7 +68,6 @@ struct _GcalYearView
|
||||
|
||||
/* manager singleton */
|
||||
GcalContext *context;
|
||||
GcalWeatherService *weather_service; /* owned, nullable */
|
||||
|
||||
/* range shown on the sidebar */
|
||||
icaltimetype *start_selected_date;
|
||||
@@ -122,7 +121,6 @@ enum {
|
||||
PROP_0,
|
||||
PROP_DATE,
|
||||
PROP_CONTEXT,
|
||||
PROP_WEATHER_SERVICE,
|
||||
PROP_SHOW_WEEK_NUMBERS,
|
||||
LAST_PROP
|
||||
};
|
||||
@@ -1614,7 +1612,6 @@ gcal_year_view_finalize (GObject *object)
|
||||
g_clear_pointer (&year_view->date, g_free);
|
||||
|
||||
g_clear_object (&year_view->calendar_settings);
|
||||
g_clear_object (&year_view->weather_service);
|
||||
|
||||
for (i = 0; i < 12; i++)
|
||||
g_clear_pointer (&year_view->events[i], g_ptr_array_unref);
|
||||
@@ -1640,10 +1637,6 @@ gcal_year_view_get_property (GObject *object,
|
||||
g_value_set_object (value, self->context);
|
||||
break;
|
||||
|
||||
case PROP_WEATHER_SERVICE:
|
||||
g_value_set_object (value, self->weather_service);
|
||||
break;
|
||||
|
||||
case PROP_SHOW_WEEK_NUMBERS:
|
||||
g_value_set_boolean (value, self->show_week_numbers);
|
||||
break;
|
||||
@@ -1676,15 +1669,14 @@ gcal_year_view_set_property (GObject *object,
|
||||
self,
|
||||
G_CONNECT_SWAPPED);
|
||||
|
||||
g_object_notify (object, "context");
|
||||
break;
|
||||
g_signal_connect_object (gcal_context_get_weather_service (self->context),
|
||||
"weather-changed",
|
||||
G_CALLBACK (weather_changed),
|
||||
self,
|
||||
0);
|
||||
update_weather (self);
|
||||
|
||||
case PROP_WEATHER_SERVICE:
|
||||
gcal_view_set_weather_service_impl_helper (&self->weather_service,
|
||||
g_value_get_object (value),
|
||||
(GcalWeatherUpdateFunc) update_weather,
|
||||
(GCallback) weather_changed,
|
||||
GTK_WIDGET (self));
|
||||
g_object_notify (object, "context");
|
||||
break;
|
||||
|
||||
case PROP_SHOW_WEEK_NUMBERS:
|
||||
@@ -1978,7 +1970,6 @@ gcal_year_view_class_init (GcalYearViewClass *klass)
|
||||
|
||||
g_object_class_override_property (object_class, PROP_DATE, "active-date");
|
||||
g_object_class_override_property (object_class, PROP_CONTEXT, "context");
|
||||
g_object_class_override_property (object_class, PROP_WEATHER_SERVICE, "weather-service");
|
||||
|
||||
g_object_class_install_property (object_class,
|
||||
PROP_SHOW_WEEK_NUMBERS,
|
||||
@@ -2021,8 +2012,6 @@ gcal_year_view_init (GcalYearView *self)
|
||||
{
|
||||
guint i;
|
||||
|
||||
self->weather_service = NULL;
|
||||
|
||||
for (i = 0; i < 12; i++)
|
||||
self->events[i] = g_ptr_array_new_with_free_func (g_object_unref);
|
||||
|
||||
@@ -2076,11 +2065,14 @@ gcal_data_model_subscriber_interface_init (ECalDataModelSubscriberInterface *ifa
|
||||
static void
|
||||
update_weather (GcalYearView *self)
|
||||
{
|
||||
GcalWeatherService *weather_service;
|
||||
gboolean updated = FALSE;
|
||||
|
||||
g_return_if_fail (GCAL_IS_YEAR_VIEW (self));
|
||||
|
||||
if (self->weather_service && self->date)
|
||||
weather_service = gcal_context_get_weather_service (self->context);
|
||||
|
||||
if (self->date)
|
||||
{
|
||||
GPtrArray *weather_infos;
|
||||
GDate date;
|
||||
@@ -2088,7 +2080,7 @@ update_weather (GcalYearView *self)
|
||||
|
||||
g_date_set_dmy (&date, self->date->day, self->date->month, self->date->year);
|
||||
|
||||
weather_infos = gcal_weather_service_get_weather_infos (self->weather_service);
|
||||
weather_infos = gcal_weather_service_get_weather_infos (weather_service);
|
||||
|
||||
for (i = 0; weather_infos && i < weather_infos->len; i++)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user