diff options
| -rw-r--r-- | calendar/gui/alarm-notify/config-data.c | 2 | ||||
| -rw-r--r-- | calendar/gui/e-cal-model.c | 2 | ||||
| -rw-r--r-- | calendar/gui/e-week-view-event-item.c | 8 | ||||
| -rw-r--r-- | calendar/gui/e-week-view.c | 2 |
4 files changed, 6 insertions, 8 deletions
diff --git a/calendar/gui/alarm-notify/config-data.c b/calendar/gui/alarm-notify/config-data.c index c66819f0c4..db2322945b 100644 --- a/calendar/gui/alarm-notify/config-data.c +++ b/calendar/gui/alarm-notify/config-data.c @@ -267,7 +267,7 @@ config_data_set_last_notification_time (ECal *cal, time_t t) ESource *source = e_cal_get_source (cal); if (source) { GTimeVal tmval = {0}; - char *as_text; + gchar *as_text; tmval.tv_sec = (glong) t; as_text = g_time_val_to_iso8601 (&tmval); diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c index 0dc76a7b06..ff6ae4172a 100644 --- a/calendar/gui/e-cal-model.c +++ b/calendar/gui/e-cal-model.c @@ -1731,7 +1731,7 @@ free_comp_id (gpointer id) static void process_event (ECalView *query, GList *objects, ECalModel *model, - void (*process_fn) (ECalView *query, GList *objects, ECalModel *model), + void (*process_fn) (ECalView *query, GList *objects, ECalModel *model), gboolean *in, GList **save_list, gpointer (*copy_fn) (gpointer data), void (*free_fn)(gpointer data)) { gboolean skip = FALSE; diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c index 98963823b6..b8f086c210 100644 --- a/calendar/gui/e-week-view-event-item.c +++ b/calendar/gui/e-week-view-event-item.c @@ -311,7 +311,7 @@ e_week_view_event_item_draw (GnomeCanvasItem *canvas_item, gdk_region_destroy (draw_region); return; } - + cr = gdk_cairo_create (drawable); gradient = calendar_config_get_display_events_gradient (); @@ -469,7 +469,6 @@ e_week_view_event_item_draw (GnomeCanvasItem *canvas_item, rect_w -= 2; } - /* Here we draw the border around the event */ cx0 = rect_x; @@ -501,7 +500,7 @@ e_week_view_event_item_draw (GnomeCanvasItem *canvas_item, cairo_save (cr); draw_curved_rectangle (cr, cx0, cy0, rect_width, rect_height, radius); - if (gradient){ + if (gradient) { pat = cairo_pattern_create_linear (rect_x + 2, y1 + 1, rect_x + 2, y2 - 7.25); cairo_pattern_add_color_stop_rgba (pat, 1, red/cc, green/cc, blue/cc, 0.8); cairo_pattern_add_color_stop_rgba (pat, 0, red/cc, green/cc, blue/cc, 0.4); @@ -781,7 +780,7 @@ e_week_view_event_item_draw_icons (EWeekViewEventItem *wveitem, icon_x -= icon_x_inc * num_icons; #define draw_pixbuf(pf) \ - if (can_draw_in_region (draw_region, icon_x, icon_y, \ + if (can_draw_in_region (draw_region, icon_x, icon_y, \ E_WEEK_VIEW_ICON_WIDTH, E_WEEK_VIEW_ICON_HEIGHT)) { \ cairo_save (cr); \ gdk_cairo_set_source_pixbuf (cr, pf, icon_x, icon_y); \ @@ -791,7 +790,6 @@ e_week_view_event_item_draw_icons (EWeekViewEventItem *wveitem, \ icon_x += icon_x_inc; - if (draw_reminder_icon && icon_x + E_WEEK_VIEW_ICON_WIDTH <= x2) { draw_pixbuf (week_view->reminder_icon); } diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c index edcffa49da..aabcd7adde 100644 --- a/calendar/gui/e-week-view.c +++ b/calendar/gui/e-week-view.c @@ -2492,7 +2492,7 @@ e_week_view_add_event (ECalComponent *comp, g_print ("\tday_starts[0]: %s", ctime (&add_event_data->week_view->day_starts[0])); g_print ("\tday_starts[%d]: %s\n", num_days, ctime (&add_event_data->week_view->day_starts[num_days])); }*/ - + g_return_val_if_fail (start <= end, TRUE); g_return_val_if_fail (start < add_event_data->week_view->day_starts[num_days], TRUE); g_return_val_if_fail (end > add_event_data->week_view->day_starts[0], TRUE); |