Coding style and whitespace cleanup.

5 files changed, 9 insertions, 10 deletions

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);