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-text.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'widgets/text/e-text.c') diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c index 7bafb5d58c..d1bf3eb59e 100644 --- a/widgets/text/e-text.c +++ b/widgets/text/e-text.c @@ -48,13 +48,13 @@ #include #include -#include "gal/a11y/e-text/gal-a11y-e-text.h" -#include "gal/widgets/e-canvas.h" -#include "gal/widgets/e-canvas-utils.h" -#include "gal/widgets/e-unicode.h" -#include "gal/util/e-i18n.h" -#include "gal/util/e-text-event-processor-emacs-like.h" -#include "gal/util/e-util.h" +#include "a11y/e-text/gal-a11y-e-text.h" +#include "widgets/misc/e-canvas.h" +#include "widgets/misc/e-canvas-utils.h" +#include "widgets/misc/e-unicode.h" +#include "e-util/e-i18n.h" +#include "e-util/e-text-event-processor-emacs-like.h" +#include "e-util/e-util.h" #include "e-text.h" @@ -3413,7 +3413,7 @@ e_text_class_init (ETextClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETextClass, changed), NULL, NULL, - e_marshal_NONE__NONE, + e_util_marshal_NONE__NONE, G_TYPE_NONE, 0); e_text_signals[E_TEXT_ACTIVATE] = @@ -3422,7 +3422,7 @@ e_text_class_init (ETextClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETextClass, activate), NULL, NULL, - e_marshal_NONE__NONE, + e_util_marshal_NONE__NONE, G_TYPE_NONE, 0); e_text_signals[E_TEXT_KEYPRESS] = @@ -3431,7 +3431,7 @@ e_text_class_init (ETextClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETextClass, keypress), NULL, NULL, - e_marshal_NONE__INT_INT, + e_util_marshal_NONE__INT_INT, G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT); e_text_signals[E_TEXT_POPULATE_POPUP] = @@ -3440,7 +3440,7 @@ e_text_class_init (ETextClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETextClass, 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); g_object_class_install_property (gobject_class, PROP_MODEL, -- cgit v1.2.3