From e3e04c94352282f43d26513f4720b7c8ad96ad2a Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 27 Apr 2006 12:18:34 +0000 Subject: Fix crash: Should use a GdkColor struct as such here, not a pointer. 2006-04-27 Tor Lillqvist * gui/e-day-view-main-item.c (e_day_view_main_item_draw_long_events_in_vbars): Fix crash: Should use a GdkColor struct as such here, not a pointer. * gui/dialogs/event-editor.c (event_editor_init): Construct pathname to query-free-busy.png at run-time. Fixes Win32 build broken by the fix for #321832 below. svn path=/trunk/; revision=31917 --- calendar/gui/e-day-view-main-item.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'calendar/gui/e-day-view-main-item.c') diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c index 27f7c552ad..cc6390ebd8 100644 --- a/calendar/gui/e-day-view-main-item.c +++ b/calendar/gui/e-day-view-main-item.c @@ -481,7 +481,7 @@ e_day_view_main_item_draw_long_events_in_vbars (EDayViewMainItem *dvmitem, gint event_num, start_day, end_day, day, bar_y1, bar_y2, grid_x; ECalComponentTransparency transparency; cairo_t *cr; - GdkColor *bg_color; + GdkColor bg_color; day_view = dvmitem->day_view; @@ -499,12 +499,11 @@ e_day_view_main_item_draw_long_events_in_vbars (EDayViewMainItem *dvmitem, event_num); if (gdk_color_parse (e_cal_model_get_color_for_component (e_calendar_view_get_model (E_CALENDAR_VIEW (day_view)), event->comp_data), &bg_color)) { - GdkColormap *colormap; + GdkColormap *colormap; - colormap = gtk_widget_get_colormap (GTK_WIDGET (day_view)); - if (gdk_colormap_alloc_color (colormap, &bg_color, TRUE, TRUE)) { - gdk_cairo_set_source_color (cr, - &bg_color); + colormap = gtk_widget_get_colormap (GTK_WIDGET (day_view)); + if (gdk_colormap_alloc_color (colormap, &bg_color, TRUE, TRUE)) { + gdk_cairo_set_source_color (cr, &bg_color); } } -- cgit