diff options
| author | Kaushal Kumar <kakumar@novell.com> | 2005-06-17 23:20:35 +0800 |
|---|---|---|
| committer | Kaushal Kumar <kaushal@src.gnome.org> | 2005-06-17 23:20:35 +0800 |
| commit | 27a61acf278caf11e5e203d4ee13e107d5b84b2d (patch) | |
| tree | 3cfc4a916ecfd4d75587e6939b4e4990a35eb5d1 /widgets/misc/e-printable.c | |
| parent | 5a7ddf3c6dab1474185d7c92a1413601878eb690 (diff) | |
| download | gsoc2013-evolution-27a61acf278caf11e5e203d4ee13e107d5b84b2d.tar.gz gsoc2013-evolution-27a61acf278caf11e5e203d4ee13e107d5b84b2d.tar.zst gsoc2013-evolution-27a61acf278caf11e5e203d4ee13e107d5b84b2d.zip | |
Retired GAL from Head. The relevant files have moved inside evolution.
2005-06-17 Kaushal Kumar <kakumar@novell.com>
* 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
Diffstat (limited to 'widgets/misc/e-printable.c')
| -rw-r--r-- | widgets/misc/e-printable.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/widgets/misc/e-printable.c b/widgets/misc/e-printable.c index d4f2da36c9..d8c1f115d4 100644 --- a/widgets/misc/e-printable.c +++ b/widgets/misc/e-printable.c @@ -25,7 +25,9 @@ #include <gtk/gtk.h> -#include "gal/util/e-util.h" +#include "e-util-marshal.h" + +#include "e-util/e-util.h" #include "e-printable.h" @@ -59,7 +61,7 @@ e_printable_class_init (GtkObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EPrintableClass, print_page), NULL, NULL, - e_marshal_NONE__OBJECT_DOUBLE_DOUBLE_BOOLEAN, + e_util_marshal_NONE__OBJECT_DOUBLE_DOUBLE_BOOLEAN, G_TYPE_NONE, 4, G_TYPE_OBJECT, G_TYPE_DOUBLE, G_TYPE_DOUBLE, G_TYPE_BOOLEAN); @@ -69,7 +71,7 @@ e_printable_class_init (GtkObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EPrintableClass, data_left), NULL, NULL, - e_marshal_BOOLEAN__NONE, + e_util_marshal_BOOLEAN__NONE, G_TYPE_BOOLEAN, 0, G_TYPE_NONE); e_printable_signals [RESET] = @@ -78,7 +80,7 @@ e_printable_class_init (GtkObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EPrintableClass, reset), NULL, NULL, - e_marshal_NONE__NONE, + e_util_marshal_NONE__NONE, G_TYPE_NONE, 0, G_TYPE_NONE); e_printable_signals [HEIGHT] = @@ -87,7 +89,7 @@ e_printable_class_init (GtkObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EPrintableClass, height), NULL, NULL, - e_marshal_DOUBLE__OBJECT_DOUBLE_DOUBLE_BOOLEAN, + e_util_marshal_DOUBLE__OBJECT_DOUBLE_DOUBLE_BOOLEAN, G_TYPE_DOUBLE, 4, G_TYPE_OBJECT, G_TYPE_DOUBLE, G_TYPE_DOUBLE, G_TYPE_BOOLEAN); @@ -97,7 +99,7 @@ e_printable_class_init (GtkObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EPrintableClass, will_fit), NULL, NULL, - e_marshal_BOOLEAN__OBJECT_DOUBLE_DOUBLE_BOOLEAN, + e_util_marshal_BOOLEAN__OBJECT_DOUBLE_DOUBLE_BOOLEAN, G_TYPE_BOOLEAN, 4, G_TYPE_OBJECT, G_TYPE_DOUBLE, G_TYPE_DOUBLE, G_TYPE_BOOLEAN); |