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 /addressbook/gui/contact-editor | |
| parent | 5a7ddf3c6dab1474185d7c92a1413601878eb690 (diff) | |
| download | gsoc2013-evolution-27a61acf278caf11e5e203d4ee13e107d5b84b2d.tar gsoc2013-evolution-27a61acf278caf11e5e203d4ee13e107d5b84b2d.tar.gz gsoc2013-evolution-27a61acf278caf11e5e203d4ee13e107d5b84b2d.tar.bz2 gsoc2013-evolution-27a61acf278caf11e5e203d4ee13e107d5b84b2d.tar.lz gsoc2013-evolution-27a61acf278caf11e5e203d4ee13e107d5b84b2d.tar.xz 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 'addressbook/gui/contact-editor')
| -rw-r--r-- | addressbook/gui/contact-editor/Makefile.am | 3 | ||||
| -rw-r--r-- | addressbook/gui/contact-editor/e-contact-editor-address.c | 2 | ||||
| -rw-r--r-- | addressbook/gui/contact-editor/e-contact-editor.c | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am index c43937752f..642bc1edf1 100644 --- a/addressbook/gui/contact-editor/Makefile.am +++ b/addressbook/gui/contact-editor/Makefile.am @@ -1,10 +1,11 @@ INCLUDES = \ -I$(top_srcdir) \ + -I$(top_srcdir)/widgets \ -I$(top_srcdir)/addressbook/ \ -I$(top_srcdir)/addressbook/backend \ -I$(top_builddir)/addressbook/backend \ -I$(top_srcdir)/addressbook/gui/merging \ - -I$(top_srcdir)/widgets/e-table \ + -I$(top_srcdir)/widgets/table \ -I$(top_builddir)/shell \ -I$(top_srcdir)/camel \ -I$(top_builddir)/camel \ diff --git a/addressbook/gui/contact-editor/e-contact-editor-address.c b/addressbook/gui/contact-editor/e-contact-editor-address.c index 1fc4994594..de2f7eccc8 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-address.c +++ b/addressbook/gui/contact-editor/e-contact-editor-address.c @@ -27,7 +27,7 @@ #include <glib.h> #include <libgnome/gnome-i18n.h> #include <libgnome/gnome-util.h> -#include <gal/widgets/e-gui-utils.h> +#include <widgets/misc/e-gui-utils.h> #include <gtk/gtkcombo.h> #include <gtk/gtkentry.h> #include <gtk/gtkstock.h> diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index c798267789..145437bf33 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -41,8 +41,8 @@ #include <gdk-pixbuf/gdk-pixbuf.h> #include <libedataserverui/e-categories-dialog.h> -#include <gal/widgets/e-gui-utils.h> -#include <gal/e-text/e-entry.h> +#include <widgets/misc/e-gui-utils.h> +#include <text/e-entry.h> #include <libebook/e-address-western.h> #include <libedataserverui/e-source-option-menu.h> |