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/misc/e-reflow-model.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'widgets/misc/e-reflow-model.c') diff --git a/widgets/misc/e-reflow-model.c b/widgets/misc/e-reflow-model.c index 340cd04736..7e3eadd3f3 100644 --- a/widgets/misc/e-reflow-model.c +++ b/widgets/misc/e-reflow-model.c @@ -23,7 +23,9 @@ #include -#include "gal/util/e-util.h" +#include "e-util-marshal.h" + +#include "e-util/e-util.h" #include "e-reflow-model.h" @@ -162,7 +164,7 @@ e_reflow_model_class_init (GObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EReflowModelClass, model_changed), NULL, NULL, - e_marshal_NONE__NONE, + e_util_marshal_NONE__NONE, G_TYPE_NONE, 0); e_reflow_model_signals [COMPARISON_CHANGED] = @@ -171,7 +173,7 @@ e_reflow_model_class_init (GObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EReflowModelClass, comparison_changed), NULL, NULL, - e_marshal_NONE__NONE, + e_util_marshal_NONE__NONE, G_TYPE_NONE, 0); e_reflow_model_signals [MODEL_ITEMS_INSERTED] = @@ -180,7 +182,7 @@ e_reflow_model_class_init (GObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EReflowModelClass, model_items_inserted), NULL, NULL, - e_marshal_NONE__INT_INT, + e_util_marshal_NONE__INT_INT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT); e_reflow_model_signals [MODEL_ITEM_CHANGED] = @@ -189,7 +191,7 @@ e_reflow_model_class_init (GObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EReflowModelClass, model_item_changed), NULL, NULL, - e_marshal_NONE__INT, + e_util_marshal_NONE__INT, G_TYPE_NONE, 1, G_TYPE_INT); e_reflow_model_signals [MODEL_ITEM_REMOVED] = @@ -198,7 +200,7 @@ e_reflow_model_class_init (GObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EReflowModelClass, model_item_removed), NULL, NULL, - e_marshal_NONE__INT, + e_util_marshal_NONE__INT, G_TYPE_NONE, 1, G_TYPE_INT); klass->set_width = NULL; -- cgit v1.2.3