Federated_Computer/federated-calendar
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: fix merge leftovers

Browse Source
This commit is contained in:
Erick Pérez Castellanos
2015-05-25 12:43:49 -04:00
parent 0c47cda20c
commit d5cc7efcd0
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gcal-source-dialog.c
+2 -2
View File
@@ -619,7 +619,7 @@ make_row_from_source (GcalSourceDialog *dialog,
row = g_object_ref (gtk_builder_get_object (builder, "row")); row = g_object_ref (gtk_builder_get_object (builder, "row"));
/* source color icon */ /* 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); pixbuf = get_circle_pixbuf_from_color (&color, 24);
icon = GTK_WIDGET (gtk_builder_get_object (builder, "icon")); icon = GTK_WIDGET (gtk_builder_get_object (builder, "icon"));
gtk_image_set_from_pixbuf (GTK_IMAGE (icon), pixbuf); 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); g_signal_handlers_block_by_func (priv->name_entry, name_entry_text_changed, user_data);
/* color button */ /* 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); gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (priv->calendar_color_button), &color);
/* entry */ /* entry */
src/gcal-window.c
+1 -1
View File
@@ -844,7 +844,7 @@ make_row_from_source (GcalWindow *window,
gtk_container_set_border_width (GTK_CONTAINER (box), 6); gtk_container_set_border_width (GTK_CONTAINER (box), 6);
/* source color icon */ /* 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); pixbuf = gcal_get_pixbuf_from_color (&color, 16);
icon = gtk_image_new_from_pixbuf (pixbuf); icon = gtk_image_new_from_pixbuf (pixbuf);