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-text.h | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

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

diff --git a/widgets/text/e-text.h b/widgets/text/e-text.h
index 49cc4b9e57..911edcd046 100644
--- a/widgets/text/e-text.h
+++ b/widgets/text/e-text.h
@@ -38,15 +38,13 @@
 #define E_TEXT_H
 
 #include <gtk/gtkobject.h>
-#include <gtk/gtkpacker.h>
 
 #include <gal/widgets/e-font.h>
 #include <gal/util/e-text-event-processor.h>
 #include <gal/e-text/e-text-model.h>
 #include <gal/widgets/e-canvas.h>
-#include <libgnome/gnome-defs.h>
 
-BEGIN_GNOME_DECLS
+G_BEGIN_DECLS
 
 
 /* Text item for the canvas.  Text items are positioned by an anchor point and an anchor direction.
@@ -249,7 +247,7 @@ struct _EText {
 
 	gint     last_type_request;       /* Last selection type requested. */
 	guint32  last_time_request;       /* The time of the last selection request. */
-	guint32  last_selection_request;  /* The time of the last selection request. */
+	GdkAtom  last_selection_request;  /* The time of the last selection request. */
 	GList   *queued_requests;         /* Queued selection requests. */
 };
 
@@ -269,6 +267,6 @@ GtkType  e_text_get_type        (void);
 void     e_text_cancel_editing  (EText *text);
 void     e_text_stop_editing    (EText *text);
 
-END_GNOME_DECLS
+G_END_DECLS
 
 #endif
-- 
cgit v1.2.3