From 27a61acf278caf11e5e203d4ee13e107d5b84b2d Mon Sep 17 00:00:00 2001 From: Kaushal Kumar Date: Fri, 17 Jun 2005 15:20:35 +0000 Subject: Retired GAL from Head. The relevant files have moved inside evolution. 2005-06-17 Kaushal Kumar * Retired GAL from Head. The relevant files have moved inside evolution. Thanks to JP Rosevear for performing the cvs surgery. The files have been moved in the following order. evolution/e-util <- gal/gal/util evolution/a11y <- gal/gal/a11y evolution/a11y/e-table <- gal/gal/a11y/e-table evolution/a11y/e-text <- gal/gal/a11y/e-text evolution/widgets/table <- gal/gal/e-table evolution/widgets/text <- gal/gal/e-text evolution/widgets/misc <- gal/gal/widgets evolution/widgets/misc/pixmaps <- gal/gal/widgets/pixmaps evolution/widgets/menus <- gal/gal/menus Following is the summary of changes done to fix the build:- - New files added to cvs repository, - a11y/e-table/Makefile.am - a11y/e-text/Makefile.am - widgets/table/Makefile.am - widgets/text/Makefile.am - widgets/misc/pixmaps/Makefile.am - iconv-detect.h - iconv-detect.c - Updated configure.in. - Updated all the relevant Makefile.am files. - Updated the include paths to replace all gal references. - Updated the marshal list to suit gal files requirements. svn path=/trunk/; revision=29522 --- widgets/text/e-entry.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'widgets/text/e-entry.c') diff --git a/widgets/text/e-entry.c b/widgets/text/e-entry.c index 8b41d952f0..d00b2e1665 100644 --- a/widgets/text/e-entry.c +++ b/widgets/text/e-entry.c @@ -36,10 +36,10 @@ #include #include -#include "gal/util/e-i18n.h" -#include "gal/util/e-util.h" -#include "gal/widgets/e-canvas.h" -#include "gal/widgets/e-canvas-utils.h" +#include "e-util/e-i18n.h" +#include "e-util/e-util.h" +#include "widgets/misc/e-canvas.h" +#include "widgets/misc/e-canvas-utils.h" #include "e-completion-view.h" #include "e-entry.h" @@ -1200,7 +1200,7 @@ e_entry_class_init (GObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EEntryClass, changed), NULL, NULL, - e_marshal_NONE__NONE, + e_util_marshal_NONE__NONE, G_TYPE_NONE, 0); e_entry_signals[E_ENTRY_ACTIVATE] = @@ -1209,7 +1209,7 @@ e_entry_class_init (GObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EEntryClass, activate), NULL, NULL, - e_marshal_NONE__NONE, + e_util_marshal_NONE__NONE, G_TYPE_NONE, 0); e_entry_signals[E_ENTRY_POPULATE_POPUP] = @@ -1218,7 +1218,7 @@ e_entry_class_init (GObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EEntryClass, populate_popup), NULL, NULL, - e_marshal_NONE__POINTER_INT_OBJECT, + e_util_marshal_NONE__POINTER_INT_OBJECT, G_TYPE_NONE, 3, G_TYPE_POINTER, G_TYPE_INT, GTK_TYPE_MENU); e_entry_signals[E_ENTRY_COMPLETION_POPUP] = -- cgit