[gnome-calendar] event: Simplify color handling
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-calendar] event: Simplify color handling
- Date: Sat, 4 May 2019 15:08:12 +0000 (UTC)
commit 245df513d7cadbafb3bd1f0a209e6d0a76dafa65
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Sat May 4 11:14:47 2019 -0300
event: Simplify color handling
We can use GcalCalendar::color property directly now.
src/core/gcal-event.c | 39 +++++----------------------------------
1 file changed, 5 insertions(+), 34 deletions(-)
---
diff --git a/src/core/gcal-event.c b/src/core/gcal-event.c
index 32c7495f..24108d76 100644
--- a/src/core/gcal-event.c
+++ b/src/core/gcal-event.c
@@ -241,22 +241,6 @@ build_component_from_datetime (GcalEvent *self,
return comp_dt;
}
-static gboolean
-string_to_color (GBinding *binding,
- const GValue *from_value,
- GValue *to_value,
- gpointer user_data)
-{
- GdkRGBA color;
-
- if (!gdk_rgba_parse (&color, g_value_get_string (from_value)))
- gdk_rgba_parse (&color, "#ffffff"); /* calendar default colour */
-
- g_value_set_boxed (to_value, &color);
-
- return TRUE;
-}
-
static void
gcal_event_update_uid_internal (GcalEvent *self)
{
@@ -1313,24 +1297,11 @@ gcal_event_set_calendar (GcalEvent *self,
if (calendar)
{
- ESourceSelectable *extension;
- const GdkRGBA *color;
- ESource *source;
-
- color = gcal_calendar_get_color (calendar);
- gcal_event_set_color (self, (GdkRGBA*) color);
-
- source = gcal_calendar_get_source (calendar);
- extension = e_source_get_extension (source, E_SOURCE_EXTENSION_CALENDAR);
-
- /* Bind the source's color with this event's color */
- self->color_binding = g_object_bind_property_full (extension, "color",
- self, "color",
- G_BINDING_DEFAULT,
- string_to_color,
- NULL,
- self,
- NULL);
+ self->color_binding = g_object_bind_property (calendar,
+ "color",
+ self,
+ "color",
+ G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE);
}
g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_CALENDAR]);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]