From 613453b1095e325149b8d37e5731d415e1d5f9bd Mon Sep 17 00:00:00 2001
From: Mike Kestner <mkestner@src.gnome.org>
Date: Thu, 31 Oct 2002 21:30:57 +0000
Subject: merging the gal-2 branch back to the trunk.

merging the gal-2 branch back to the trunk.

svn path=/trunk/; revision=18471
---
 widgets/misc/e-canvas-utils.h | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'widgets/misc/e-canvas-utils.h')

diff --git a/widgets/misc/e-canvas-utils.h b/widgets/misc/e-canvas-utils.h
index ad8422772c..5b1a329140 100644
--- a/widgets/misc/e-canvas-utils.h
+++ b/widgets/misc/e-canvas-utils.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /* 
- * e-canvas-utils.h
  * Copyright 2000, 2001, Ximian, Inc.
  *
  * Authors:
@@ -24,10 +23,9 @@
 #ifndef __E_CANVAS_UTILS__
 #define __E_CANVAS_UTILS__
 
-#include <libgnomeui/gnome-canvas.h>
-#include <libgnome/gnome-defs.h>
+#include <libgnomecanvas/gnome-canvas.h>
 
-BEGIN_GNOME_DECLS
+G_BEGIN_DECLS
 
 void      e_canvas_item_move_absolute      (GnomeCanvasItem *item,
 					    double           dx,
@@ -52,6 +50,6 @@ gboolean  e_canvas_item_area_shown         (GnomeCanvasItem *item,
 					    double           x2,
 					    double           y2);
 
-END_GNOME_DECLS
+G_END_DECLS
 
 #endif /* __E_CANVAS_UTILS__ */
-- 
cgit v1.2.3