From a891b81cfb3430a764dab0d5644114c4dab22297 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 7 Nov 2010 21:13:03 -0500 Subject: Coding style and whitespace cleanup. --- calendar/gui/e-alarm-list.c | 2 +- calendar/gui/e-day-view-top-item.c | 8 ++++---- calendar/gui/e-meeting-time-sel-item.c | 4 ++-- calendar/gui/e-week-view-event-item.c | 14 +++++++------- calendar/gui/print.c | 22 ++++++++++------------ libgnomecanvas/gailcanvasitem.c | 2 +- libgnomecanvas/gnome-canvas-pixbuf.c | 4 ++-- libgnomecanvas/gnome-canvas-rect.c | 4 ++-- libgnomecanvas/gnome-canvas-text.c | 5 ++--- libgnomecanvas/gnome-canvas.c | 4 ++-- mail/e-mail-reader.c | 2 +- mail/e-mail-session.h | 1 - mail/em-folder-properties.c | 2 +- mail/mail-ops.c | 2 +- modules/calendar/e-cal-shell-backend.c | 2 +- modules/mail/e-mail-shell-view-actions.c | 6 +++--- widgets/misc/e-calendar-item.c | 2 +- widgets/misc/e-dateedit.c | 2 +- widgets/misc/e-map.c | 22 +++++++++++----------- widgets/table/e-cell-text.c | 2 +- widgets/table/e-cell-tree.c | 2 +- widgets/table/e-table-field-chooser-item.c | 2 +- widgets/table/e-table-header-item.c | 1 - widgets/table/e-table-header-utils.c | 2 +- widgets/table/e-table-item.c | 10 +++++----- widgets/text/e-text.c | 14 +++++++------- 26 files changed, 69 insertions(+), 74 deletions(-) diff --git a/calendar/gui/e-alarm-list.c b/calendar/gui/e-alarm-list.c index 48b55bbc02..c7f7ff9691 100644 --- a/calendar/gui/e-alarm-list.c +++ b/calendar/gui/e-alarm-list.c @@ -556,7 +556,7 @@ e_alarm_list_get_value (GtkTreeModel *tree_model, EAlarmList *alarm_list = E_ALARM_LIST (tree_model); ECalComponentAlarm *alarm; GList *l; - gchar *str; + gchar *str; g_return_if_fail (E_IS_ALARM_LIST (tree_model)); g_return_if_fail (column < E_ALARM_LIST_NUM_COLUMNS); diff --git a/calendar/gui/e-day-view-top-item.c b/calendar/gui/e-day-view-top-item.c index c58f057903..e517e75781 100644 --- a/calendar/gui/e-day-view-top-item.c +++ b/calendar/gui/e-day-view-top-item.c @@ -360,7 +360,7 @@ day_view_top_item_draw_long_event (EDayViewTopItem *top_item, cairo_rectangle (cr, item_x - x, item_y - y, - item_w - E_DAY_VIEW_LONG_EVENT_BORDER_WIDTH, item_h); + item_w - E_DAY_VIEW_LONG_EVENT_BORDER_WIDTH, item_h); cairo_clip (cr); time_x = item_x + E_DAY_VIEW_LONG_EVENT_X_PAD - x; @@ -368,7 +368,7 @@ day_view_top_item_draw_long_event (EDayViewTopItem *top_item, time_x += day_view->digit_width; layout = gtk_widget_create_pango_layout (GTK_WIDGET (day_view), buffer); - cairo_move_to (cr, + cairo_move_to (cr, time_x, item_y + E_DAY_VIEW_LONG_EVENT_BORDER_HEIGHT + E_DAY_VIEW_LONG_EVENT_Y_PAD - y); @@ -413,7 +413,7 @@ day_view_top_item_draw_long_event (EDayViewTopItem *top_item, time_x += day_view->digit_width; layout = gtk_widget_create_pango_layout (GTK_WIDGET (day_view), buffer); - cairo_move_to (cr, + cairo_move_to (cr, time_x, item_y + E_DAY_VIEW_LONG_EVENT_Y_PAD + 1 - y); pango_cairo_show_layout (cr, layout); @@ -486,7 +486,7 @@ day_view_top_item_draw_long_event (EDayViewTopItem *top_item, if (icon_x <= max_icon_x) { gdk_cairo_set_source_pixbuf (cr, pixbuf, icon_x, icon_y); - cairo_rectangle (cr, + cairo_rectangle (cr, icon_x, icon_y, E_DAY_VIEW_ICON_WIDTH, E_DAY_VIEW_ICON_HEIGHT); diff --git a/calendar/gui/e-meeting-time-sel-item.c b/calendar/gui/e-meeting-time-sel-item.c index b04591220a..7a50f13a1d 100644 --- a/calendar/gui/e-meeting-time-sel-item.c +++ b/calendar/gui/e-meeting-time-sel-item.c @@ -201,7 +201,7 @@ e_meeting_time_selector_item_update (GnomeCanvasItem *item, const cairo_matrix_t static void draw_strikeout_box (EMeetingTimeSelectorItem *mts_item, cairo_t *cr, - int x, int y, int width, int height) + gint x, gint y, gint width, gint height) { GnomeCanvas *canvas = GNOME_CANVAS_ITEM (mts_item)->canvas; EMeetingTimeSelector *mts = mts_item->mts; @@ -291,7 +291,7 @@ e_meeting_time_selector_item_draw (GnomeCanvasItem *item, GdkDrawable *drawable, if (e_meeting_attendee_get_has_calendar_info (ia)) { if (e_meeting_time_selector_item_calculate_busy_range (mts, row, x, width, &start_x, &end_x)) { if (start_x >= width || end_x <= 0) { - draw_strikeout_box (mts_item, cr, 0, row_y, width, mts->row_height); + draw_strikeout_box (mts_item, cr, 0, row_y, width, mts->row_height); } else { if (start_x >= 0) { draw_strikeout_box (mts_item, cr, 0, row_y, start_x, mts->row_height); diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c index 569449fe34..8a525ebfd6 100644 --- a/calendar/gui/e-week-view-event-item.c +++ b/calendar/gui/e-week-view-event-item.c @@ -329,13 +329,13 @@ week_view_draw_time (EWeekView *week_view, /* Draw the hour. */ if (hour_to_display < 10) { pango_layout_set_text (layout, buffer + 1, 1); - cairo_move_to (cr, + cairo_move_to (cr, time_x + week_view->digit_width, time_y_normal_font); pango_cairo_show_layout (cr, layout); } else { pango_layout_set_text (layout, buffer, 2); - cairo_move_to (cr, + cairo_move_to (cr, time_x, time_y_normal_font); pango_cairo_show_layout (cr, layout); @@ -346,7 +346,7 @@ week_view_draw_time (EWeekView *week_view, /* Draw the start minute, in the small font. */ pango_layout_set_font_description (layout, week_view->small_font_desc); pango_layout_set_text (layout, buffer + 3, 2); - cairo_move_to (cr, + cairo_move_to (cr, time_x, time_y_small_font); pango_cairo_show_layout (cr, layout); @@ -359,7 +359,7 @@ week_view_draw_time (EWeekView *week_view, if (!e_cal_model_get_use_24_hour_format (model)) { pango_layout_set_text (layout, suffix, -1); - cairo_move_to (cr, + cairo_move_to (cr, time_x, time_y_normal_font); pango_cairo_show_layout (cr, layout); @@ -1051,9 +1051,9 @@ week_view_event_item_draw (GnomeCanvasItem *canvas_item, cairo_rectangle (cr, x1, y1, - x2 - x1 - E_WEEK_VIEW_EVENT_R_PAD - - E_WEEK_VIEW_EVENT_BORDER_WIDTH + 1, - y2 - y1 + 1); + x2 - x1 - E_WEEK_VIEW_EVENT_R_PAD + - E_WEEK_VIEW_EVENT_BORDER_WIDTH + 1, + y2 - y1 + 1); cairo_clip (cr); week_view_draw_time ( diff --git a/calendar/gui/print.c b/calendar/gui/print.c index 7378ca719f..051dbc7cce 100644 --- a/calendar/gui/print.c +++ b/calendar/gui/print.c @@ -91,8 +91,8 @@ evo_calendar_print_renderer_get_width (GtkPrintContext *context, static gdouble evo_calendar_print_renderer_get_height (GtkPrintContext *context, - PangoFontDescription *font, - const gchar *text) + PangoFontDescription *font, + const gchar *text) { PangoLayout *layout; gint layout_width, layout_height; @@ -2291,7 +2291,7 @@ print_work_week_background (GtkPrintContext *context, GnomeCalendar *gcal, gdouble font_size, max_font_size, hour_font_size, minute_font_size; gchar buf[20]; const gchar *minute; - const int LONG_EVENT_OFFSET = 6; + const gint LONG_EVENT_OFFSET = 6; gboolean use_24_hour; gint i, hour, row; gdouble hour_minute_xl, hour_minute_xr; @@ -2322,7 +2322,6 @@ print_work_week_background (GtkPrintContext *context, GnomeCalendar *gcal, cairo_line_to (cr, right - width, top); cairo_stroke (cr); - /* Calculate the row height. */ if (top > bottom) yinc = (top - bottom) / (pdi->end_hour - pdi->start_hour); @@ -2382,7 +2381,6 @@ print_work_week_background (GtkPrintContext *context, GnomeCalendar *gcal, hour_minute_xr, right - 3, y - yinc, y - yinc + minute_font_size); - /* Draw the horizontal line between hours, across the entire width of the day view. */ cr = gtk_print_context_get_cairo_context (context); @@ -2397,12 +2395,12 @@ print_work_week_background (GtkPrintContext *context, GnomeCalendar *gcal, cairo_line_to (cr, right, y - yinc / 2); cairo_set_line_width (cr, 1); cairo_stroke (cr); - row ++; + row++; } /* Draw the vertical lines for the days */ day_width = (right - left - 2*width) / pdi->days_shown; - for(i = 0; i < pdi->days_shown - 1; ++i){ + for (i = 0; i < pdi->days_shown - 1; ++i) { cr = gtk_print_context_get_cairo_context (context); cairo_move_to (cr, left + width + day_width * (i + 1), top); cairo_line_to (cr, left + width + day_width * (i + 1), bottom); @@ -2579,7 +2577,7 @@ print_work_week_day_details (GtkPrintContext *context, GnomeCalendar *gcal, max_font_size = ((top - bottom) / pdi.rows) - 4; else max_font_size = ((bottom - top ) / pdi.rows) - 4; - font_size = MIN(DAY_NORMAL_FONT_SIZE, max_font_size); + font_size = MIN (DAY_NORMAL_FONT_SIZE, max_font_size); font = get_font_for_size (font_size, PANGO_WEIGHT_NORMAL); for (i = 0; i < pdi.events[0]->len; i++) { @@ -2614,7 +2612,7 @@ print_work_week_view_cb (ECalComponent *comp, tt = icaltime_from_timet_with_zone (iend, FALSE, pdi->zone); /* If we're past the hour, use the next one */ - pdi->end_hour = MAX(pdi->end_hour, tt.minute ? tt.hour + 1 : tt.hour); + pdi->end_hour = MAX (pdi->end_hour, tt.minute ? tt.hour + 1 : tt.hour); return TRUE; } @@ -2627,8 +2625,8 @@ print_work_week_view (GtkPrintContext *context, GnomeCalendar *gcal, time_t date time_t when, start, end; gdouble width, height, l, small_month_width = calc_small_month_width (context, HEADER_HEIGHT); gint i, days = 5; - char buf[100]; - const int LONG_EVENT_OFFSET = 6; + gchar buf[100]; + const gint LONG_EVENT_OFFSET = 6; struct pdinfo pdi; struct tm tm; gdouble day_width, day_x; @@ -2692,7 +2690,7 @@ print_work_week_view (GtkPrintContext *context, GnomeCalendar *gcal, time_t date /* Now print each days' events */ day_width = (width - 2*DAY_VIEW_TIME_COLUMN_WIDTH) / days; when = start; - for(i = 0; i < days; ++i){ + for (i = 0; i < days; ++i) { day_x = DAY_VIEW_TIME_COLUMN_WIDTH + day_width * i; /* Print the day, e.g. 'Tuesday'. */ diff --git a/libgnomecanvas/gailcanvasitem.c b/libgnomecanvas/gailcanvasitem.c index 54e0b7c576..0cad301343 100644 --- a/libgnomecanvas/gailcanvasitem.c +++ b/libgnomecanvas/gailcanvasitem.c @@ -398,7 +398,7 @@ is_item_in_window (GnomeCanvasItem *item, if (window) { GdkRectangle window_rect; - + window_rect.x = 0; window_rect.y = 0; window_rect.width = gdk_window_get_width (window); diff --git a/libgnomecanvas/gnome-canvas-pixbuf.c b/libgnomecanvas/gnome-canvas-pixbuf.c index 910b61b8e7..ea331c6ee8 100644 --- a/libgnomecanvas/gnome-canvas-pixbuf.c +++ b/libgnomecanvas/gnome-canvas-pixbuf.c @@ -285,7 +285,7 @@ gnome_canvas_pixbuf_draw (GnomeCanvasItem *item, GdkDrawable *drawable, return; } cairo_transform (cr, &matrix); - + gdk_cairo_set_source_pixbuf (cr, priv->pixbuf, 0, 0); cairo_paint (cr); @@ -305,7 +305,7 @@ gnome_canvas_pixbuf_point (GnomeCanvasItem *item, GnomeCanvasPixbuf *gcp; GnomeCanvasPixbufPrivate *priv; GdkPixbuf *pixbuf; - int px, py; + gint px, py; guchar *src; gcp = GNOME_CANVAS_PIXBUF (item); diff --git a/libgnomecanvas/gnome-canvas-rect.c b/libgnomecanvas/gnome-canvas-rect.c index 84f4d4b20b..aa1399b56e 100644 --- a/libgnomecanvas/gnome-canvas-rect.c +++ b/libgnomecanvas/gnome-canvas-rect.c @@ -53,7 +53,7 @@ struct _GnomeCanvasRectPrivate { gdouble miterlimit; /* Miter limit */ guint n_dash; /* Number of elements in dashing pattern */ - gdouble *dash; /* Dashing pattern */ + gdouble *dash; /* Dashing pattern */ gdouble dash_offset; /* Dashing offset */ }; @@ -376,7 +376,7 @@ gnome_canvas_rect_update (GnomeCanvasItem *item, gint flags) { GnomeCanvasRect *rect; - double x1, x2, y1, y2; + gdouble x1, x2, y1, y2; rect = GNOME_CANVAS_RECT (item); diff --git a/libgnomecanvas/gnome-canvas-text.c b/libgnomecanvas/gnome-canvas-text.c index ef100b285a..870b3272b1 100644 --- a/libgnomecanvas/gnome-canvas-text.c +++ b/libgnomecanvas/gnome-canvas-text.c @@ -182,7 +182,6 @@ gnome_canvas_text_class_init (GnomeCanvasTextClass *class) gobject_class->set_property = gnome_canvas_text_set_property; gobject_class->get_property = gnome_canvas_text_get_property; - /* Text */ g_object_class_install_property (gobject_class, @@ -1201,7 +1200,7 @@ gnome_canvas_text_draw (GnomeCanvasItem *item, GdkDrawable *drawable, cr = gdk_cairo_create (drawable); if (text->clip) { - cairo_rectangle (cr, + cairo_rectangle (cr, text->clip_cx - x, text->clip_cy - y, text->clip_cwidth, @@ -1214,7 +1213,7 @@ gnome_canvas_text_draw (GnomeCanvasItem *item, GdkDrawable *drawable, ((text->rgba >> 16) & 0xff) / 255.0, ((text->rgba >> 8) & 0xff) / 255.0, ( text->rgba & 0xff) / 255.0); - + cairo_move_to (cr, text->cx - x, text->cy - y); pango_cairo_show_layout (cr, text->layout); diff --git a/libgnomecanvas/gnome-canvas.c b/libgnomecanvas/gnome-canvas.c index b72d0a1b50..cd2ffaa69f 100644 --- a/libgnomecanvas/gnome-canvas.c +++ b/libgnomecanvas/gnome-canvas.c @@ -2729,7 +2729,7 @@ gnome_canvas_paint_rect (GnomeCanvas *canvas, gint x0, gint y0, gint x1, gint y1 /* Copy the pixmap to the window and clean up */ cr = gdk_cairo_create (bin_window); - gdk_cairo_set_source_pixmap (cr, pixmap, + gdk_cairo_set_source_pixmap (cr, pixmap, draw_x1 + canvas->zoom_xofs, draw_y1 + canvas->zoom_yofs); cairo_paint (cr); @@ -2772,7 +2772,7 @@ gnome_canvas_expose (GtkWidget *widget, GdkEventExpose *event) rect.height = rects[i].height; if (canvas->need_update) { - gnome_canvas_request_redraw (canvas, + gnome_canvas_request_redraw (canvas, rect.x, rect.y, rect.x + rect.width, rect.y + rect.height); diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c index 8432e3388b..2c1bbb2fc8 100644 --- a/mail/e-mail-reader.c +++ b/mail/e-mail-reader.c @@ -464,7 +464,7 @@ action_mail_remove_attachments_cb (GtkAction *action, EMailReader *reader) /* make a copy of the message */ camel_message_info_set_flags (newinfo, flags, flags); camel_folder_append_message_sync (folder, message, newinfo, NULL, NULL, &error); - + if (!error) { /* marked the original message deleted */ camel_message_info_set_flags (info, CAMEL_MESSAGE_DELETED, CAMEL_MESSAGE_DELETED); diff --git a/mail/e-mail-session.h b/mail/e-mail-session.h index f9cab970cc..99c1b77d7c 100644 --- a/mail/e-mail-session.h +++ b/mail/e-mail-session.h @@ -110,7 +110,6 @@ CamelFolder * e_mail_session_uri_to_folder_finish GAsyncResult *result, GError **error); - /*** Legacy API ***/ void mail_session_flush_filter_log (EMailSession *session); diff --git a/mail/em-folder-properties.c b/mail/em-folder-properties.c index 8679fd1dc1..8b454d21a2 100644 --- a/mail/em-folder-properties.c +++ b/mail/em-folder-properties.c @@ -248,7 +248,7 @@ emfp_dialog_got_folder_quota (CamelFolder *folder, client = gconf_client_get_default (); key = "/apps/evolution/mail/display/show_deleted"; - hide_deleted = !gconf_client_get_bool(client, key, NULL); + hide_deleted = !gconf_client_get_bool (client, key, NULL); g_object_unref (client); /* diff --git a/mail/mail-ops.c b/mail/mail-ops.c index 3da4f7a085..24826afd10 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -1797,7 +1797,7 @@ expunge_pop3_stores (CamelFolder *expunging, EMailSession *session, GCancellable if (!info) continue; - + if ((camel_message_info_flags (info) & CAMEL_MESSAGE_DELETED) != 0) { CamelMimeMessage *msg; GError *local_error = NULL; diff --git a/modules/calendar/e-cal-shell-backend.c b/modules/calendar/e-cal-shell-backend.c index fa4c2db0de..4988ab4617 100644 --- a/modules/calendar/e-cal-shell-backend.c +++ b/modules/calendar/e-cal-shell-backend.c @@ -474,7 +474,7 @@ static time_t utc_to_user_zone (time_t utc_time, icaltimezone *zone) { - if (!zone || (int) utc_time == -1) + if (!zone || (gint) utc_time == -1) return utc_time; return icaltime_as_timet ( diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c index ba21f28b8d..0c82778f5e 100644 --- a/modules/mail/e-mail-shell-view-actions.c +++ b/modules/mail/e-mail-shell-view-actions.c @@ -447,7 +447,7 @@ action_mail_folder_rename_cb (GtkAction *action, em_folder_tree_edit_selected (folder_tree); } -static gchar* +static gchar * get_message_checksum (CamelFolder *folder, const gchar *uid) { static const GChecksumType duplicate_csum = G_CHECKSUM_SHA256; @@ -494,7 +494,7 @@ message_is_duplicated (GHashTable *messages, guint64 id, gchar *digest) if (!hash_digest) return FALSE; - return g_str_equal (digest, hash_digest); + return g_str_equal (digest, hash_digest); } static void @@ -520,7 +520,7 @@ action_mail_folder_remove_duplicates (GtkAction *action, EMailShellView *mail_sh folder = message_list->folder; messages = g_hash_table_new_full (g_int_hash, g_int_equal, g_free, g_free); - dups = g_ptr_array_new(); + dups = g_ptr_array_new (); for (i = 0; i < uids->len; i++) { CamelMessageInfo *msg_info = camel_folder_get_message_info (folder, uids->pdata[i]); diff --git a/widgets/misc/e-calendar-item.c b/widgets/misc/e-calendar-item.c index a7a1a68d71..6afe62d381 100644 --- a/widgets/misc/e-calendar-item.c +++ b/widgets/misc/e-calendar-item.c @@ -1330,7 +1330,7 @@ e_calendar_item_draw_month (ECalendarItem *calitem, gdk_cairo_set_source_color (cr, &style->text[GTK_STATE_ACTIVE]); for (day = 0; day < 7; day++) { layout_set_day_text (calitem, layout, day_index); - cairo_move_to (cr, + cairo_move_to (cr, text_x - calitem->day_widths[day_index], text_y); pango_cairo_show_layout (cr, layout); diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c index 5045a1d53f..a1a385ca70 100644 --- a/widgets/misc/e-dateedit.c +++ b/widgets/misc/e-dateedit.c @@ -588,7 +588,7 @@ create_children (EDateEdit *dedit) gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (priv->time_combo), cell, TRUE); gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (priv->time_combo), cell, "text", 0, NULL); } - + #else priv->time_combo = gtk_combo_box_entry_new_with_model ( GTK_TREE_MODEL (time_store), 0); diff --git a/widgets/misc/e-map.c b/widgets/misc/e-map.c index d88e1698dc..4c292bfc4a 100644 --- a/widgets/misc/e-map.c +++ b/widgets/misc/e-map.c @@ -120,7 +120,7 @@ static void e_map_get_current_location (EMap *map, double *longitude, double *la static void e_map_world_to_render_surface (EMap *map, gdouble world_longitude, gdouble world_latitude, gdouble *win_x, gdouble *win_y); static void update_render_surface (EMap *map, gboolean render_overlays); -static void set_scroll_area (EMap *view, int width, int height); +static void set_scroll_area (EMap *view, gint width, gint height); static void center_at (EMap *map, double longitude, double latitude); static void scroll_to (EMap *view, gint x, gint y); static gint load_map_background (EMap *view, gchar *name); @@ -176,7 +176,7 @@ e_map_do_tween_cb (gpointer data) priv->timer_current_ms = g_timer_elapsed (priv->timer, NULL) * 1000; gtk_widget_queue_draw (GTK_WIDGET (view)); - + /* Can't use for loop here, because we need to advance * the list before deleting. */ @@ -184,7 +184,7 @@ e_map_do_tween_cb (gpointer data) while (walk) { EMapTween *tween = walk->data; - + walk = walk->next; if (tween->end_time <= priv->timer_current_ms) @@ -215,7 +215,7 @@ e_map_tween_new (EMap *view, guint msecs, double longitude_offset, double latitu { EMapPrivate *priv = view->priv; EMapTween *tween; - + if (!priv->smooth_zoom) return; @@ -412,7 +412,7 @@ e_map_unrealize (GtkWidget *widget) cairo_surface_destroy (priv->map_render_surface); priv->map_render_surface = NULL; - + if (GTK_WIDGET_CLASS (e_map_parent_class)->unrealize) (*GTK_WIDGET_CLASS (e_map_parent_class)->unrealize) (widget); } @@ -557,7 +557,7 @@ e_map_tweens_compute_matrix (EMap *view, cairo_matrix_t *matrix) cairo_matrix_init_translate (matrix, allocation.width / 2.0, allocation.height / 2.0); - + e_map_world_to_render_surface (view, longitude, latitude, &x, &y); @@ -576,7 +576,7 @@ e_map_expose (GtkWidget *widget, GdkEventExpose *event) cairo_matrix_t matrix; if (!gtk_widget_is_drawable (widget)) - return FALSE; + return FALSE; view = E_MAP (widget); priv = view->priv; @@ -588,11 +588,11 @@ e_map_expose (GtkWidget *widget, GdkEventExpose *event) e_map_tweens_compute_matrix (view, &matrix); cairo_transform (cr, &matrix); - cairo_set_source_surface (cr, + cairo_set_source_surface (cr, priv->map_render_surface, 0, 0); cairo_paint (cr); - + cairo_destroy (cr); return FALSE; @@ -1268,7 +1268,7 @@ e_map_get_current_location (EMap *map, double *longitude, double *latitude) e_map_window_to_world (map, allocation.width / 2.0, allocation.height / 2.0, - longitude, latitude); + longitude, latitude); } /* Callback used when an adjustment is changed */ @@ -1289,7 +1289,7 @@ adjustment_changed_cb (GtkAdjustment *adj, gpointer data) } static void -set_scroll_area (EMap *view, int width, int height) +set_scroll_area (EMap *view, gint width, gint height) { EMapPrivate *priv; GtkAllocation allocation; diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c index 897e02ad19..a718f1d91e 100644 --- a/widgets/table/e-cell-text.c +++ b/widgets/table/e-cell-text.c @@ -734,7 +734,7 @@ ect_draw (ECellView *ecell_view, GdkDrawable *drawable, cell_foreground = e_cell_text_get_color (text_view, color_spec); if (cell_foreground) - gdk_cairo_set_source_color (cr, cell_foreground); + gdk_cairo_set_source_color (cr, cell_foreground); } } diff --git a/widgets/table/e-cell-tree.c b/widgets/table/e-cell-tree.c index e0de5e047c..5771cbc053 100644 --- a/widgets/table/e-cell-tree.c +++ b/widgets/table/e-cell-tree.c @@ -649,7 +649,7 @@ ect_print (ECellView *ecell_view, GtkPrintContext *context, /* now draw our icon if we're expandable */ if (expandable) { #if GTK_CHECK_VERSION (3, 0, 0) - gboolean expanded = e_tree_table_adapter_node_is_expanded (tree_table_adapter, node); + gboolean expanded = e_tree_table_adapter_node_is_expanded (tree_table_adapter, node); #error Paint an expander here #endif } diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c index fb8f2babca..02c86b8136 100644 --- a/widgets/table/e-table-field-chooser-item.c +++ b/widgets/table/e-table-field-chooser-item.c @@ -180,7 +180,7 @@ etfci_update (GnomeCanvasItem *item, gint flags) { ETableFieldChooserItem *etfci = E_TABLE_FIELD_CHOOSER_ITEM (item); - double x1, y1, x2, y2; + gdouble x1, y1, x2, y2; if (GNOME_CANVAS_ITEM_CLASS (etfci_parent_class)->update) GNOME_CANVAS_ITEM_CLASS (etfci_parent_class)->update ( diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c index 43400cae82..28d53ce971 100644 --- a/widgets/table/e-table-header-item.c +++ b/widgets/table/e-table-header-item.c @@ -969,7 +969,6 @@ ethi_unrealize (GnomeCanvasItem *item) gtk_drag_dest_unset (GTK_WIDGET (item->canvas)); - if (GNOME_CANVAS_ITEM_CLASS (ethi_parent_class)->unrealize) (*GNOME_CANVAS_ITEM_CLASS (ethi_parent_class)->unrealize)(item); } diff --git a/widgets/table/e-table-header-utils.c b/widgets/table/e-table-header-utils.c index 19a493b0f4..56fa44a3c6 100644 --- a/widgets/table/e-table-header-utils.c +++ b/widgets/table/e-table-header-utils.c @@ -379,7 +379,7 @@ e_table_header_draw_button (GdkDrawable *drawable, ETableCol *ecol, } #endif gdk_cairo_set_source_pixbuf (cr, ecol->pixbuf, - xpos, inner_y + (inner_height - clip_height) / 2); + xpos, inner_y + (inner_height - clip_height) / 2); cairo_paint (cr); } else { pango_layout_set_width (layout, inner_width * PANGO_SCALE); diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c index b9d0f63c68..7c45bbe656 100644 --- a/widgets/table/e-table-item.c +++ b/widgets/table/e-table-item.c @@ -792,7 +792,7 @@ static void eti_item_region_redraw (ETableItem *eti, gint x0, gint y0, gint x1, gint y1) { GnomeCanvasItem *item = GNOME_CANVAS_ITEM (eti); - double dx1, dy1, dx2, dy2; + gdouble dx1, dy1, dx2, dy2; cairo_matrix_t i2c; dx1 = x0; @@ -1719,7 +1719,7 @@ eti_unrealize (GnomeCanvasItem *item) static void eti_draw_grid_line (ETableItem *eti, cairo_t *cr, GtkStyle *style, - int x1, int y1, int x2, int y2) + gint x1, gint y1, gint x2, gint y2) { cairo_save (cr); @@ -1746,7 +1746,7 @@ eti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, gint x, gint y, gint wid gint f_x1, f_x2, f_y1, f_y2; gboolean f_found; cairo_matrix_t i2c; - double eti_base_x, eti_base_y, lower_right_y, lower_right_x; + gdouble eti_base_x, eti_base_y, lower_right_y, lower_right_x; GtkWidget *canvas = GTK_WIDGET (item->canvas); GtkStyle *style = gtk_widget_get_style (canvas); gint height_extra = eti->horizontal_draw_grid ? 1 : 0; @@ -1990,7 +1990,7 @@ eti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, gint x, gint y, gint wid yd += height; if (eti->horizontal_draw_grid) { - eti_draw_grid_line (eti, cr, style, eti_base_x - x, yd, eti_base_x + eti->width - x, yd); + eti_draw_grid_line (eti, cr, style, eti_base_x - x, yd, eti_base_x + eti->width - x, yd); yd++; } } @@ -2001,7 +2001,7 @@ eti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, gint x, gint y, gint wid for (col = first_col; col <= last_col; col++) { ETableCol *ecol = e_table_header_get_column (eti->header, col); - eti_draw_grid_line (eti, cr, style, xd, y_offset, xd, yd - 1); + eti_draw_grid_line (eti, cr, style, xd, y_offset, xd, yd - 1); /* * This looks wierd, but it is to draw the last line diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c index cbae6d1da8..6ce9716b00 100644 --- a/widgets/text/e-text.c +++ b/widgets/text/e-text.c @@ -768,8 +768,8 @@ e_text_set_property (GObject *object, (color.green & 0xff00) << 8 | (color.blue & 0xff00) | 0xff); - text->needs_redraw = 1; - needs_update = 1; + text->needs_redraw = 1; + needs_update = 1; break; case PROP_FILL_COLOR_GDK: @@ -782,8 +782,8 @@ e_text_set_property (GObject *object, (color.green & 0xff00) << 8 | (color.blue & 0xff00) | 0xff); - text->needs_redraw = 1; - needs_update = 1; + text->needs_redraw = 1; + needs_update = 1; break; case PROP_FILL_COLOR_RGBA: @@ -791,8 +791,8 @@ e_text_set_property (GObject *object, color.red = ((text->rgba >> 24) & 0xff) * 0x101; color.green = ((text->rgba >> 16) & 0xff) * 0x101; color.blue = ((text->rgba >> 8) & 0xff) * 0x101; - text->needs_redraw = 1; - needs_update = 1; + text->needs_redraw = 1; + needs_update = 1; break; case PROP_EDITABLE: @@ -1456,7 +1456,7 @@ e_text_draw (GnomeCanvasItem *item, GdkDrawable *drawable, if (text->clip) { cairo_rectangle (cr, - xpos, ypos, + xpos, ypos, text->clip_cwidth - text->xofs, text->clip_cheight - text->yofs); cairo_clip (cr); -- cgit v1.2.3