[gnome-calendar/gbsneto/timeline: 4/18] views: Remove ECalDataModel code
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-calendar/gbsneto/timeline: 4/18] views: Remove ECalDataModel code
- Date: Wed, 1 Apr 2020 21:09:50 +0000 (UTC)
commit 03359026e8a16f05270716e40bc2226ff050ff7a
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Thu Mar 26 23:23:46 2020 -0300
views: Remove ECalDataModel code
src/views/gcal-month-view.c | 150 --------------------------------------
src/views/gcal-week-view.c | 98 -------------------------
src/views/gcal-year-view.c | 174 +-------------------------------------------
3 files changed, 1 insertion(+), 421 deletions(-)
---
diff --git a/src/views/gcal-month-view.c b/src/views/gcal-month-view.c
index e7df1169..ca2d286a 100644
--- a/src/views/gcal-month-view.c
+++ b/src/views/gcal-month-view.c
@@ -131,8 +131,6 @@ static void gcal_view_interface_init (GcalViewInterf
static void gtk_buildable_interface_init (GtkBuildableIface *iface);
-static void e_data_model_subscriber_interface_init (ECalDataModelSubscriberInterface *iface);
-
static void on_event_activated_cb (GcalEventWidget *widget,
GcalMonthView *self);
@@ -149,8 +147,6 @@ static void gcal_timeline_subscriber_interface_init (GcalTimelineSu
G_DEFINE_TYPE_WITH_CODE (GcalMonthView, gcal_month_view, GTK_TYPE_CONTAINER,
G_IMPLEMENT_INTERFACE (GCAL_TYPE_VIEW, gcal_view_interface_init)
- G_IMPLEMENT_INTERFACE (E_TYPE_CAL_DATA_MODEL_SUBSCRIBER,
- e_data_model_subscriber_interface_init)
G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE,
gtk_buildable_interface_init)
G_IMPLEMENT_INTERFACE (GCAL_TYPE_TIMELINE_SUBSCRIBER,
@@ -1411,152 +1407,6 @@ gcal_timeline_subscriber_interface_init (GcalTimelineSubscriberInterface *iface)
}
-/*
- * ECalDataModelSubscriber interface
- */
-
-static void
-gcal_month_view_component_added (ECalDataModelSubscriber *subscriber,
- ECalClient *client,
- ECalComponent *comp)
-{
- g_autoptr (GcalEvent) event = NULL;
- GcalMonthView *self;
- GcalCalendar *calendar;
- GError *error;
-
- GCAL_ENTRY;
-
- error = NULL;
- self = GCAL_MONTH_VIEW (subscriber);
- calendar = gcal_manager_get_calendar_from_source (gcal_context_get_manager (self->context),
- e_client_get_source (E_CLIENT (client)));
- event = gcal_event_new (calendar, comp, &error);
-
- if (error)
- {
- g_warning ("Error creating event: %s", error->message);
- g_clear_error (&error);
- GCAL_RETURN ();
- }
-
- gcal_month_view_add_event (GCAL_TIMELINE_SUBSCRIBER (self), event);
-
- GCAL_EXIT;
-}
-
-static void
-gcal_month_view_component_modified (ECalDataModelSubscriber *subscriber,
- ECalClient *client,
- ECalComponent *comp)
-{
- g_autoptr (GcalEvent) event = NULL;
- GcalMonthView *self;
- GcalCalendar *calendar;
- GtkWidget *new_widget;
- GError *error;
- GList *l;
-
- GCAL_ENTRY;
-
- error = NULL;
- self = GCAL_MONTH_VIEW (subscriber);
- calendar = gcal_manager_get_calendar_from_source (gcal_context_get_manager (self->context),
- e_client_get_source (E_CLIENT (client)));
- event = gcal_event_new (calendar, comp, &error);
-
- if (error)
- {
- g_warning ("Error creating event: %s", error->message);
- g_clear_error (&error);
- GCAL_RETURN ();
- }
-
- new_widget = gcal_event_widget_new (self->context, event);
-
- l = g_hash_table_lookup (self->children, gcal_event_get_uid (event));
-
- if (l)
- {
- gtk_widget_destroy (l->data);
-
- gtk_widget_show (new_widget);
- gtk_container_add (GTK_CONTAINER (subscriber), new_widget);
- }
- else
- {
- g_warning ("%s: Widget with uuid: %s not found in view: %s",
- G_STRFUNC, gcal_event_get_uid (event),
- gtk_widget_get_name (GTK_WIDGET (subscriber)));
- gtk_widget_destroy (new_widget);
- }
-
- self->pending_event_allocation = TRUE;
-
- GCAL_EXIT;
-}
-
-static void
-gcal_month_view_component_removed (ECalDataModelSubscriber *subscriber,
- ECalClient *client,
- const gchar *uid,
- const gchar *rid)
-{
- GcalMonthView *self;
- g_autofree gchar *uuid = NULL;
- const gchar *sid;
- GList *l;
-
- GCAL_ENTRY;
-
- self = GCAL_MONTH_VIEW (subscriber);
- sid = e_source_get_uid (e_client_get_source (E_CLIENT (client)));
-
- if (rid != NULL)
- uuid = g_strdup_printf ("%s:%s:%s", sid, uid, rid);
- else
- uuid = g_strdup_printf ("%s:%s", sid, uid);
-
- l = g_hash_table_lookup (self->children, uuid);
-
- if (!l)
- {
- g_warning ("%s: Widget with uuid: %s not found in view: %s",
- G_STRFUNC,
- uuid,
- gtk_widget_get_name (GTK_WIDGET (subscriber)));
- GCAL_RETURN ();
- }
-
- gtk_widget_destroy (l->data);
-
- self->pending_event_allocation = TRUE;
-
- GCAL_EXIT;
-}
-
-static void
-gcal_month_view_freeze (ECalDataModelSubscriber *subscriber)
-{
-}
-
-static void
-gcal_month_view_thaw (ECalDataModelSubscriber *subscriber)
-{
-}
-
-
-static void
-e_data_model_subscriber_interface_init (ECalDataModelSubscriberInterface *iface)
-{
- iface->component_added = gcal_month_view_component_added;
- iface->component_modified = gcal_month_view_component_modified;
- iface->component_removed = gcal_month_view_component_removed;
- iface->freeze = gcal_month_view_freeze;
- iface->thaw = gcal_month_view_thaw;
-}
-
-
/*
* GtkContainer overrides
*/
diff --git a/src/views/gcal-week-view.c b/src/views/gcal-week-view.c
index f66ff835..7d3cc3b2 100644
--- a/src/views/gcal-week-view.c
+++ b/src/views/gcal-week-view.c
@@ -62,8 +62,6 @@ static void schedule_position_scroll (GcalWeekView
static void gcal_view_interface_init (GcalViewInterface *iface);
-static void gcal_data_model_subscriber_interface_init (ECalDataModelSubscriberInterface *iface);
-
static void gcal_timeline_subscriber_interface_init (GcalTimelineSubscriberInterface *iface);
enum
@@ -77,8 +75,6 @@ enum
G_DEFINE_TYPE_WITH_CODE (GcalWeekView, gcal_week_view, GTK_TYPE_BOX,
G_IMPLEMENT_INTERFACE (GCAL_TYPE_VIEW, gcal_view_interface_init)
- G_IMPLEMENT_INTERFACE (E_TYPE_CAL_DATA_MODEL_SUBSCRIBER,
- gcal_data_model_subscriber_interface_init)
G_IMPLEMENT_INTERFACE (GCAL_TYPE_TIMELINE_SUBSCRIBER,
gcal_timeline_subscriber_interface_init));
@@ -420,90 +416,6 @@ gcal_timeline_subscriber_interface_init (GcalTimelineSubscriberInterface *iface)
iface->remove_event = gcal_week_view_remove_event;
}
-
-/* ECalDataModelSubscriber implementation */
-static void
-gcal_week_view_component_added (ECalDataModelSubscriber *subscriber,
- ECalClient *client,
- ECalComponent *comp)
-{
- GcalWeekView *self = GCAL_WEEK_VIEW (subscriber);
- g_autoptr (GcalEvent) event = NULL;
- GcalCalendar *calendar;
-
- GCAL_ENTRY;
-
- calendar = gcal_manager_get_calendar_from_source (gcal_context_get_manager (self->context),
- e_client_get_source (E_CLIENT (client)));
- event = gcal_event_new (calendar, comp, NULL);
-
- gcal_week_view_add_event (GCAL_TIMELINE_SUBSCRIBER (subscriber), event);
-
- GCAL_EXIT;
-}
-
-static void
-gcal_week_view_component_modified (ECalDataModelSubscriber *subscriber,
- ECalClient *client,
- ECalComponent *comp)
-{
- GcalWeekView *self = GCAL_WEEK_VIEW (subscriber);
- GcalWeekHeader *header;
- gchar *uuid;
-
- GCAL_ENTRY;
-
- header = GCAL_WEEK_HEADER (self->header);
-
- uuid = get_uuid_from_component (e_client_get_source (E_CLIENT (client)), comp);
-
- gcal_week_header_remove_event (header, uuid);
- gcal_week_grid_remove_event (GCAL_WEEK_GRID (self->week_grid), uuid);
-
- gcal_week_view_component_added (subscriber, client, comp);
-
- g_free (uuid);
-
- GCAL_EXIT;
-}
-
-static void
-gcal_week_view_component_removed (ECalDataModelSubscriber *subscriber,
- ECalClient *client,
- const gchar *uid,
- const gchar *rid)
-{
- GcalWeekView *self = GCAL_WEEK_VIEW (subscriber);
- ESource *source;
- gchar *uuid;
-
- GCAL_ENTRY;
-
- source = e_client_get_source (E_CLIENT (client));
-
- if (rid != NULL)
- uuid = g_strdup_printf ("%s:%s:%s", e_source_get_uid (source), uid, rid);
- else
- uuid = g_strdup_printf ("%s:%s", e_source_get_uid (source), uid);
-
- gcal_week_header_remove_event (GCAL_WEEK_HEADER (self->header), uuid);
- gcal_week_grid_remove_event (GCAL_WEEK_GRID (self->week_grid), uuid);
-
- g_free (uuid);
-
- GCAL_EXIT;
-}
-
-static void
-gcal_week_view_freeze (ECalDataModelSubscriber *subscriber)
-{
-}
-
-static void
-gcal_week_view_thaw (ECalDataModelSubscriber *subscriber)
-{
-}
-
static gboolean
gcal_week_view_draw_hours (GcalWeekView *self,
cairo_t *cr,
@@ -613,16 +525,6 @@ gcal_week_view_draw_hours (GcalWeekView *self,
return FALSE;
}
-static void
-gcal_data_model_subscriber_interface_init (ECalDataModelSubscriberInterface *iface)
-{
- iface->component_added = gcal_week_view_component_added;
- iface->component_modified = gcal_week_view_component_modified;
- iface->component_removed = gcal_week_view_component_removed;
- iface->freeze = gcal_week_view_freeze;
- iface->thaw = gcal_week_view_thaw;
-}
-
static void
gcal_week_view_finalize (GObject *object)
{
diff --git a/src/views/gcal-year-view.c b/src/views/gcal-year-view.c
index 4e861495..bf87f7bc 100644
--- a/src/views/gcal-year-view.c
+++ b/src/views/gcal-year-view.c
@@ -127,7 +127,7 @@ enum {
};
static void gcal_view_interface_init (GcalViewInterface *iface);
-static void gcal_data_model_subscriber_interface_init (ECalDataModelSubscriberInterface *iface);
+
static void update_weather (GcalYearView *self);
static void gcal_timeline_subscriber_interface_init (GcalTimelineSubscriberInterface *iface);
@@ -135,8 +135,6 @@ static void gcal_timeline_subscriber_interface_init (GcalTimelineSu
G_DEFINE_TYPE_WITH_CODE (GcalYearView, gcal_year_view, GTK_TYPE_BOX,
G_IMPLEMENT_INTERFACE (GCAL_TYPE_VIEW, gcal_view_interface_init)
- G_IMPLEMENT_INTERFACE (E_TYPE_CAL_DATA_MODEL_SUBSCRIBER,
- gcal_data_model_subscriber_interface_init)
G_IMPLEMENT_INTERFACE (GCAL_TYPE_TIMELINE_SUBSCRIBER,
gcal_timeline_subscriber_interface_init));
@@ -2034,167 +2032,6 @@ gcal_year_view_direction_changed (GtkWidget *widget,
year_view->k = 1;
}
-static void
-gcal_year_view_component_added (ECalDataModelSubscriber *subscriber,
- ECalClient *client,
- ECalComponent *comp)
-{
- g_autoptr (GcalEvent) event = NULL;
- GcalCalendar *calendar;
- GcalYearView *self;
- GDateTime *event_start, *event_end;
- GError *error;
- guint i, start_month, end_month;
-
- GCAL_ENTRY;
-
- error = NULL;
- self = GCAL_YEAR_VIEW (subscriber);
- calendar = gcal_manager_get_calendar_from_source (gcal_context_get_manager (self->context),
- e_client_get_source (E_CLIENT (client)));
- event = gcal_event_new (calendar, comp, &error);
-
- if (error)
- {
- g_warning ("Error creating event: %s", error->message);
- g_clear_error (&error);
- GCAL_RETURN ();
- }
-
- g_debug ("Caching event '%s' in Year view", gcal_event_get_uid (event));
-
- event_start = gcal_event_get_date_start (event);
- event_end = gcal_event_get_date_end (event);
-
- /* Calculate the start & end months */
- start_month = g_date_time_get_month (event_start) - 1;
- end_month = g_date_time_get_month (event_end) - 1;
-
- if (g_date_time_get_year (event_start) < g_date_time_get_year (self->date))
- start_month = 0;
-
- if (g_date_time_get_year (event_end) > g_date_time_get_year (self->date))
- end_month = 11;
-
- /* Add the event to the cache */
- for (i = start_month; i <= end_month; i++)
- g_ptr_array_add (self->events[i], g_object_ref (event));
-
- update_sidebar (self);
-
- gtk_widget_queue_draw (GTK_WIDGET (self->navigator));
-
- GCAL_EXIT;
-}
-
-static void
-gcal_year_view_component_removed (ECalDataModelSubscriber *subscriber,
- ECalClient *client,
- const gchar *uid,
- const gchar *rid)
-{
- GcalYearView *year_view;
- GList *children, *l;
- ESource *source;
- g_autofree gchar *uuid = NULL;
- guint i;
- gint number_of_children;
-
- GCAL_ENTRY;
-
- year_view = GCAL_YEAR_VIEW (subscriber);
- source = e_client_get_source (E_CLIENT (client));
- if (rid != NULL)
- uuid = g_strdup_printf ("%s:%s:%s", e_source_get_uid (source), uid, rid);
- else
- uuid = g_strdup_printf ("%s:%s", e_source_get_uid (source), uid);
-
- children = gtk_container_get_children (GTK_CONTAINER (year_view->events_sidebar));
- number_of_children = g_list_length (children);
-
- for (l = children; l != NULL; l = g_list_next (l))
- {
- GcalEventWidget *child_widget;
- GcalEvent *event;
-
- child_widget = GCAL_EVENT_WIDGET (gtk_bin_get_child (GTK_BIN (l->data)));
- event = gcal_event_widget_get_event (child_widget);
-
- if (g_strcmp0 (uuid, gcal_event_get_uid (event)) == 0)
- {
- gtk_widget_destroy (GTK_WIDGET (l->data));
- number_of_children--;
- }
- }
-
- /*
- * No children left visible, all the events were removed and now we have to show the
- * 'No Events' placeholder.
- */
- if (number_of_children == 0)
- {
- update_no_events_page (year_view);
- gtk_stack_set_visible_child_name (GTK_STACK (year_view->navigator_stack), "no-events");
- }
-
- /* Also remove from the cached list of events */
- for (i = 0; i < 12; i++)
- {
- GPtrArray *events;
- guint j;
-
- events = year_view->events[i];
-
- for (j = 0; j < events->len; j++)
- {
- GcalEvent *event;
-
- event = g_ptr_array_index (events, j);
-
- if (!g_str_equal (gcal_event_get_uid (event), uuid))
- continue;
-
- g_debug ("Removing event '%s' from Year view's cache", uuid);
- g_ptr_array_remove (events, event);
- }
- }
-
- gtk_widget_queue_draw (GTK_WIDGET (year_view->navigator));
-
- g_list_free (children);
-
- GCAL_EXIT;
-}
-
-static void
-gcal_year_view_component_changed (ECalDataModelSubscriber *subscriber,
- ECalClient *client,
- ECalComponent *comp)
-{
- ECalComponentId *id;
-
- GCAL_ENTRY;
-
- id = e_cal_component_get_id (comp);
-
- gcal_year_view_component_removed (subscriber, client, e_cal_component_id_get_uid (id),
e_cal_component_id_get_rid (id));
- gcal_year_view_component_added (subscriber, client, comp);
-
- g_clear_pointer (&id, e_cal_component_id_free);
-
- GCAL_EXIT;
-}
-
-static void
-gcal_year_view_freeze (ECalDataModelSubscriber *subscriber)
-{
- ;
-}
-
-static void
-gcal_year_view_thaw (ECalDataModelSubscriber *subscriber)
-{
-}
static void
gcal_year_view_class_init (GcalYearViewClass *klass)
@@ -2289,15 +2126,6 @@ gcal_year_view_init (GcalYearView *self)
GDK_ACTION_MOVE);
}
-static void
-gcal_data_model_subscriber_interface_init (ECalDataModelSubscriberInterface *iface)
-{
- iface->component_added = gcal_year_view_component_added;
- iface->component_modified = gcal_year_view_component_changed;
- iface->component_removed = gcal_year_view_component_removed;
- iface->freeze = gcal_year_view_freeze;
- iface->thaw = gcal_year_view_thaw;
-}
static void
update_weather (GcalYearView *self)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
