Miscellaneous cleanups.

6 files changed, 38 insertions, 38 deletions

diff --git a/libgnomecanvas/gailcanvas.c b/libgnomecanvas/gailcanvas.c
index 23cf894149..6af1a0745a 100644
--- a/libgnomecanvas/gailcanvas.c
+++ b/libgnomecanvas/gailcanvas.c
@@ -186,7 +186,7 @@ gail_canvas_real_initialize (AtkObject *obj,
 		adj, "value_changed",
 		G_CALLBACK (adjustment_changed), canvas);
 
-	obj->role =  ATK_ROLE_LAYERED_PANE;
+	obj->role = ATK_ROLE_LAYERED_PANE;
 }
 
 static gint
diff --git a/libgnomecanvas/gailcanvastext.c b/libgnomecanvas/gailcanvastext.c
index a8d04f3ae3..6a658d6388 100644
--- a/libgnomecanvas/gailcanvastext.c
+++ b/libgnomecanvas/gailcanvastext.c
@@ -130,7 +130,7 @@ gail_canvas_text_new (GObject *obj)
 				   GNOME_CANVAS_TEXT (obj)->text);
     }
 
-  atk_object->role =  ATK_ROLE_TEXT;
+  atk_object->role = ATK_ROLE_TEXT;
   return atk_object;
 }
 
diff --git a/libgnomecanvas/gnome-canvas-rect.c b/libgnomecanvas/gnome-canvas-rect.c
index fde76b70be..eefdb12118 100644
--- a/libgnomecanvas/gnome-canvas-rect.c
+++ b/libgnomecanvas/gnome-canvas-rect.c
@@ -105,8 +105,8 @@ gnome_canvas_rect_setup_for_fill (GnomeCanvasRect *rect,
 		cr,
 		((rect->priv->fill_rgba >> 24) & 0xff) / 255.0,
 		((rect->priv->fill_rgba >> 16) & 0xff) / 255.0,
-		((rect->priv->fill_rgba >>  8) & 0xff) / 255.0,
-		( rect->priv->fill_rgba        & 0xff) / 255.0);
+		((rect->priv->fill_rgba >> 8) & 0xff) / 255.0,
+		( rect->priv->fill_rgba & 0xff) / 255.0);
 	cairo_set_fill_rule (cr, rect->priv->wind);
 
 	return TRUE;
@@ -123,8 +123,8 @@ gnome_canvas_rect_setup_for_stroke (GnomeCanvasRect *rect,
 		cr,
 		((rect->priv->outline_rgba >> 24) & 0xff) / 255.0,
 		((rect->priv->outline_rgba >> 16) & 0xff) / 255.0,
-		((rect->priv->outline_rgba >>  8) & 0xff) / 255.0,
-		( rect->priv->outline_rgba        & 0xff) / 255.0);
+		((rect->priv->outline_rgba >> 8) & 0xff) / 255.0,
+		( rect->priv->outline_rgba & 0xff) / 255.0);
 	cairo_set_line_width (cr, rect->priv->line_width);
 	cairo_set_line_cap (cr, rect->priv->cap);
 	cairo_set_line_join (cr, rect->priv->join);
diff --git a/libgnomecanvas/gnome-canvas-text.c b/libgnomecanvas/gnome-canvas-text.c
index f0c5308aed..e030b9b73b 100644
--- a/libgnomecanvas/gnome-canvas-text.c
+++ b/libgnomecanvas/gnome-canvas-text.c
@@ -583,13 +583,13 @@ gnome_canvas_text_init (GnomeCanvasText *text)
 
 	text->font_desc = NULL;
 
-	text->underline     = PANGO_UNDERLINE_NONE;
+	text->underline = PANGO_UNDERLINE_NONE;
 	text->strikethrough = FALSE;
-	text->rise          = 0;
+	text->rise = 0;
 
 	text->underline_set = FALSE;
-	text->strike_set    = FALSE;
-	text->rise_set      = FALSE;
+	text->strike_set = FALSE;
+	text->rise_set = FALSE;
 }
 
 /* Dispose handler for the text item */
@@ -1330,8 +1330,8 @@ gnome_canvas_text_draw (GnomeCanvasItem *item,
 		cr,
 		((text->rgba >> 24) & 0xff) / 255.0,
 		((text->rgba >> 16) & 0xff) / 255.0,
-		((text->rgba >>  8) & 0xff) / 255.0,
-		( text->rgba        & 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 60a05681d0..a9688d90f3 100644
--- a/libgnomecanvas/gnome-canvas.c
+++ b/libgnomecanvas/gnome-canvas.c
@@ -1862,7 +1862,7 @@ gnome_canvas_class_init (GnomeCanvasClass *class)
 	GtkWidgetClass *widget_class;
 
 	object_class = (GObjectClass *) class;
-	widget_class  = (GtkWidgetClass *) class;
+	widget_class = (GtkWidgetClass *) class;
 
 	object_class->set_property = gnome_canvas_set_property;
 	object_class->get_property = gnome_canvas_get_property;
@@ -2491,16 +2491,16 @@ pick_current_item (GnomeCanvas *canvas,
 		    (event->type == GDK_BUTTON_RELEASE)) {
 			/* these fields have the same offsets in both types of events */
 
-			canvas->pick_event.crossing.type       = GDK_ENTER_NOTIFY;
-			canvas->pick_event.crossing.window     = event->motion.window;
+			canvas->pick_event.crossing.type = GDK_ENTER_NOTIFY;
+			canvas->pick_event.crossing.window = event->motion.window;
 			canvas->pick_event.crossing.send_event = event->motion.send_event;
-			canvas->pick_event.crossing.subwindow  = NULL;
-			canvas->pick_event.crossing.x          = event->motion.x;
-			canvas->pick_event.crossing.y          = event->motion.y;
-			canvas->pick_event.crossing.mode       = GDK_CROSSING_NORMAL;
-			canvas->pick_event.crossing.detail     = GDK_NOTIFY_NONLINEAR;
-			canvas->pick_event.crossing.focus      = FALSE;
-			canvas->pick_event.crossing.state      = event->motion.state;
+			canvas->pick_event.crossing.subwindow = NULL;
+			canvas->pick_event.crossing.x = event->motion.x;
+			canvas->pick_event.crossing.y = event->motion.y;
+			canvas->pick_event.crossing.mode = GDK_CROSSING_NORMAL;
+			canvas->pick_event.crossing.detail = GDK_NOTIFY_NONLINEAR;
+			canvas->pick_event.crossing.focus = FALSE;
+			canvas->pick_event.crossing.state = event->motion.state;
 
 			/* these fields don't have the same offsets in both types of events */
 
diff --git a/libgnomecanvas/gnome-canvas.h b/libgnomecanvas/gnome-canvas.h
index 9e6b5bc3df..f24c929f95 100644
--- a/libgnomecanvas/gnome-canvas.h
+++ b/libgnomecanvas/gnome-canvas.h
@@ -46,14 +46,14 @@ G_BEGIN_DECLS
  * [0, 255].
  */
 
-#define GNOME_CANVAS_COLOR(r, g, b) ((((guint) (r) & 0xff) << 24)	\
-				     | (((guint) (g) & 0xff) << 16)	\
-				     | (((guint) (b) & 0xff) << 8)	\
+#define GNOME_CANVAS_COLOR(r, g, b) ((((guint) (r) & 0xff) << 24) \
+				     | (((guint) (g) & 0xff) << 16) \
+				     | (((guint) (b) & 0xff) << 8) \
 				     | 0xff)
 
-#define GNOME_CANVAS_COLOR_A(r, g, b, a) ((((guint) (r) & 0xff) << 24)	\
-					  | (((guint) (g) & 0xff) << 16)	\
-					  | (((guint) (b) & 0xff) << 8)	\
+#define GNOME_CANVAS_COLOR_A(r, g, b, a) ((((guint) (r) & 0xff) << 24) \
+					  | (((guint) (g) & 0xff) << 16) \
+					  | (((guint) (b) & 0xff) << 8) \
 					  | ((guint) (a) & 0xff))
 
 typedef struct _GnomeCanvas           GnomeCanvas;
@@ -79,20 +79,20 @@ typedef struct _GnomeCanvasGroupClass GnomeCanvasGroupClass;
 
 /* Object flags for items */
 typedef enum {
-	GNOME_CANVAS_ITEM_REALIZED      = 1 << 0,
-	GNOME_CANVAS_ITEM_MAPPED        = 1 << 1,
-	GNOME_CANVAS_ITEM_VISIBLE       = 1 << 2,
-	GNOME_CANVAS_ITEM_NEED_UPDATE	= 1 << 3,
-	GNOME_CANVAS_ITEM_NEED_AFFINE	= 1 << 4,
-	GNOME_CANVAS_ITEM_NEED_CLIP	= 1 << 5,
-	GNOME_CANVAS_ITEM_NEED_VIS	= 1 << 6
+	GNOME_CANVAS_ITEM_REALIZED = 1 << 0,
+	GNOME_CANVAS_ITEM_MAPPED = 1 << 1,
+	GNOME_CANVAS_ITEM_VISIBLE = 1 << 2,
+	GNOME_CANVAS_ITEM_NEED_UPDATE = 1 << 3,
+	GNOME_CANVAS_ITEM_NEED_AFFINE = 1 << 4,
+	GNOME_CANVAS_ITEM_NEED_CLIP = 1 << 5,
+	GNOME_CANVAS_ITEM_NEED_VIS = 1 << 6
 } GnomeCanvasItemFlags;
 
 /* Update flags for items */
 enum {
-	GNOME_CANVAS_UPDATE_REQUESTED  = 1 << 0,
-	GNOME_CANVAS_UPDATE_AFFINE     = 1 << 1,
-	GNOME_CANVAS_UPDATE_CLIP       = 1 << 2,
+	GNOME_CANVAS_UPDATE_REQUESTED = 1 << 0,
+	GNOME_CANVAS_UPDATE_AFFINE = 1 << 1,
+	GNOME_CANVAS_UPDATE_CLIP = 1 << 2,
 	GNOME_CANVAS_UPDATE_VISIBILITY = 1 << 3,
 	GNOME_CANVAS_UPDATE_IS_VISIBLE = 1 << 4		/* Deprecated.  FIXME: remove this */
 };