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/text/e-entry.h | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'widgets/text/e-entry.h')

diff --git a/widgets/text/e-entry.h b/widgets/text/e-entry.h
index bd57e862a8..1e073a87e8 100644
--- a/widgets/text/e-entry.h
+++ b/widgets/text/e-entry.h
@@ -25,15 +25,13 @@
 #ifndef _E_ENTRY_H_
 #define _E_ENTRY_H_
 
-#include <libgnomeui/gnome-canvas.h>
+#include <libgnomecanvas/gnome-canvas.h>
 #include <gtk/gtktable.h>
-#include <gnome-xml/tree.h>
+#include <libxml/tree.h>
 #include <gal/e-text/e-text.h>
 #include "e-completion.h"
-#include <libgnome/gnome-defs.h>
 
-
-BEGIN_GNOME_DECLS
+G_BEGIN_DECLS
 
 #define E_ENTRY_TYPE        (e_entry_get_type ())
 #define E_ENTRY(o)          (GTK_CHECK_CAST ((o), E_ENTRY_TYPE, EEntry))
@@ -84,6 +82,6 @@ void         e_entry_enable_completion_full (EEntry *entry, ECompletion *complet
 					     EEntryCompletionHandler handler);
 gboolean     e_entry_completion_popup_is_visible (EEntry *entry);
 
-END_GNOME_DECLS
+G_END_DECLS
 
 #endif /* _E_ENTRY_H_ */
-- 
cgit