[gnome-calendar] build: fix merge leftovers
- From: Erick Pérez Castellanos <erickpc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-calendar] build: fix merge leftovers
- Date: Mon, 25 May 2015 17:05:07 +0000 (UTC)
commit d5cc7efcd086824a217073ba8fbf4c3e680f46d8
Author: Erick Pérez Castellanos <erick red gmail com>
Date: Mon May 25 12:43:49 2015 -0400
build: fix merge leftovers
src/gcal-source-dialog.c | 4 ++--
src/gcal-window.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/src/gcal-source-dialog.c b/src/gcal-source-dialog.c
index d060fba..a76fce3 100644
--- a/src/gcal-source-dialog.c
+++ b/src/gcal-source-dialog.c
@@ -619,7 +619,7 @@ make_row_from_source (GcalSourceDialog *dialog,
row = g_object_ref (gtk_builder_get_object (builder, "row"));
/* source color icon */
- gdk_rgba_parse (&color, get_color_name_from_source (source));
+ get_color_name_from_source (source, &color);
pixbuf = get_circle_pixbuf_from_color (&color, 24);
icon = GTK_WIDGET (gtk_builder_get_object (builder, "icon"));
gtk_image_set_from_pixbuf (GTK_IMAGE (icon), pixbuf);
@@ -915,7 +915,7 @@ stack_visible_child_name_changed (GObject *object,
g_signal_handlers_block_by_func (priv->name_entry, name_entry_text_changed, user_data);
/* color button */
- gdk_rgba_parse (&color, get_color_name_from_source (priv->source));
+ get_color_name_from_source (priv->source, &color);
gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (priv->calendar_color_button), &color);
/* entry */
diff --git a/src/gcal-window.c b/src/gcal-window.c
index 97e6075..eab36b7 100644
--- a/src/gcal-window.c
+++ b/src/gcal-window.c
@@ -844,7 +844,7 @@ make_row_from_source (GcalWindow *window,
gtk_container_set_border_width (GTK_CONTAINER (box), 6);
/* source color icon */
- gdk_rgba_parse (&color, get_color_name_from_source (source));
+ get_color_name_from_source (source, &color);
pixbuf = gcal_get_pixbuf_from_color (&color, 16);
icon = gtk_image_new_from_pixbuf (pixbuf);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]