diff options
Diffstat (limited to 'shell')
29 files changed, 59 insertions, 42 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 4f0936875d..e592ffac5f 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,21 @@ +2000-09-18 Christopher James Lahey <clahey@helixcode.com> + + * Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and + $(EXTRA_GNOME_LIBS). Removed unneeded libraries. + + * e-component-registry.c, e-corba-storage-registry.c, + e-corba-storage.c, e-folder-type-registry.c, e-folder.c, + e-local-folder.c, e-local-storage.c, + e-shell-folder-creation-dialog.c, + e-shell-folder-selection-dialog.c, e-shell-folder-title-bar.c, + e-shell-view.c, e-shell.c, e-shortcuts-view.c, e-shortcuts.c, + e-storage-set-view.c, e-storage-set-view.h, e-storage-set.c, + e-storage.c, evolution-local-storage.c, evolution-session.c, + evolution-shell-client.c, evolution-shell-component-client.c, + evolution-shell-component.c, evolution-shell-view.c, + evolution-storage-listener.c, evolution-storage.c, main.c: Fixed + the #include lines to deal properly with gal. + 2000-09-16 Michael Meeks <michael@helixcode.com> * e-shell-view-menu.c (e_shell_view_menu_setup): use datadir. diff --git a/shell/Makefile.am b/shell/Makefile.am index 3b6bc1c85f..9928d52774 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -5,6 +5,7 @@ INCLUDES = \ -I$(top_srcdir)/widgets/misc \ -I$(top_srcdir) \ $(BONOBO_GNOME_CFLAGS) \ + $(EXTRA_GNOME_CFLAGS) \ -DEVOLUTION_IMAGES=\""$(datadir)/images/evolution"\" \ -DEVOLUTION_VERSION=\""$(VERSION)"\" \ -DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\" \ @@ -116,11 +117,9 @@ evolution_SOURCES = \ evolution_LDADD = \ libeshell.a \ $(top_builddir)/widgets/shortcut-bar/libshortcut-bar.a \ - $(top_builddir)/widgets/e-paned/libepaned.a \ - $(top_builddir)/widgets/e-text/libetext.a \ - $(top_builddir)/widgets/e-table/libetable.a \ $(top_builddir)/widgets/misc/libemiscwidgets.a \ $(top_builddir)/e-util/libeutil.la \ + $(EXTRA_GNOME_LIBS) \ $(UNICODE_LIBS) \ $(GNOME_PRINT_LIBS) \ $(BONOBO_GNOME_LIBS) diff --git a/shell/e-component-registry.c b/shell/e-component-registry.c index 589d6bca38..4ec951a81c 100644 --- a/shell/e-component-registry.c +++ b/shell/e-component-registry.c @@ -29,7 +29,7 @@ #include <gtk/gtktypeutils.h> #include <bonobo.h> -#include "e-util/e-util.h" +#include <gal/util/e-util.h> #include "e-shell-utils.h" #include "Evolution.h" diff --git a/shell/e-corba-storage-registry.c b/shell/e-corba-storage-registry.c index c3b259bb71..a1881f10dd 100644 --- a/shell/e-corba-storage-registry.c +++ b/shell/e-corba-storage-registry.c @@ -25,7 +25,7 @@ #include <config.h> #endif -#include "e-util/e-util.h" +#include <gal/util/e-util.h> #include "e-corba-storage.h" diff --git a/shell/e-corba-storage.c b/shell/e-corba-storage.c index 3e977afaf1..2b3b8dee9d 100644 --- a/shell/e-corba-storage.c +++ b/shell/e-corba-storage.c @@ -27,7 +27,7 @@ #include <bonobo.h> -#include "e-util/e-util.h" +#include <gal/util/e-util.h> #include "Evolution.h" diff --git a/shell/e-folder-type-registry.c b/shell/e-folder-type-registry.c index 34fa5a0193..515efe88a7 100644 --- a/shell/e-folder-type-registry.c +++ b/shell/e-folder-type-registry.c @@ -28,7 +28,7 @@ #include <glib.h> #include <gtk/gtktypeutils.h> -#include "e-util/e-util.h" +#include <gal/util/e-util.h> #include "e-shell-utils.h" diff --git a/shell/e-folder.c b/shell/e-folder.c index 90bd886352..d490db99bf 100644 --- a/shell/e-folder.c +++ b/shell/e-folder.c @@ -28,7 +28,7 @@ #include <gtk/gtkobject.h> #include <gtk/gtksignal.h> -#include "e-util/e-util.h" +#include <gal/util/e-util.h> #include "e-folder.h" diff --git a/shell/e-local-folder.c b/shell/e-local-folder.c index 80cee7d7bc..62dad4f4c2 100644 --- a/shell/e-local-folder.c +++ b/shell/e-local-folder.c @@ -41,8 +41,8 @@ #include <gnome-xml/parser.h> #include <gnome-xml/xmlmemory.h> -#include "e-util/e-util.h" -#include "e-util/e-xml-utils.h" +#include <gal/util/e-util.h> +#include <gal/util/e-xml-utils.h> #include "e-local-folder.h" diff --git a/shell/e-local-storage.c b/shell/e-local-storage.c index 11708a5801..173bdf2991 100644 --- a/shell/e-local-storage.c +++ b/shell/e-local-storage.c @@ -49,7 +49,7 @@ #include <bonobo.h> -#include "e-util/e-util.h" +#include <gal/util/e-util.h> #include "e-local-folder.h" #include "evolution-local-storage.h" diff --git a/shell/e-shell-folder-creation-dialog.c b/shell/e-shell-folder-creation-dialog.c index e9beb13670..fc55cd75d6 100644 --- a/shell/e-shell-folder-creation-dialog.c +++ b/shell/e-shell-folder-creation-dialog.c @@ -29,10 +29,10 @@ #include <glade/glade-xml.h> #include "e-util/e-gui-utils.h" -#include "e-util/e-util.h" -#include "e-util/e-unicode.h" +#include <gal/util/e-util.h> +#include <gal/widgets/e-unicode.h> -#include "widgets/misc/e-scroll-frame.h" +#include <gal/widgets/e-scroll-frame.h> #include "e-storage-set.h" #include "e-storage-set-view.h" diff --git a/shell/e-shell-folder-selection-dialog.c b/shell/e-shell-folder-selection-dialog.c index 76801def2b..46fb5ce82e 100644 --- a/shell/e-shell-folder-selection-dialog.c +++ b/shell/e-shell-folder-selection-dialog.c @@ -30,8 +30,8 @@ #include <libgnome/gnome-i18n.h> #include "e-util/e-gui-utils.h" -#include "e-util/e-util.h" -#include "widgets/misc/e-scroll-frame.h" +#include <gal/util/e-util.h> +#include <gal/widgets/e-scroll-frame.h> #include "e-shell-constants.h" #include "e-storage-set-view.h" diff --git a/shell/e-shell-folder-title-bar.c b/shell/e-shell-folder-title-bar.c index 56dbe3d9d8..11c6232973 100644 --- a/shell/e-shell-folder-title-bar.c +++ b/shell/e-shell-folder-title-bar.c @@ -29,7 +29,7 @@ #include <gdk-pixbuf/gdk-pixbuf.h> #include "widgets/misc/e-clipped-label.h" -#include "e-util/e-util.h" +#include <gal/util/e-util.h> #include "e-shell-constants.h" #include "e-shell-folder-title-bar.h" diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c index 211fdfdb2a..1b8a84e603 100644 --- a/shell/e-shell-view.c +++ b/shell/e-shell-view.c @@ -33,9 +33,9 @@ #include <libgnomeui/gnome-window-icon.h> #include "widgets/misc/e-clipped-label.h" -#include "e-util/e-util.h" -#include "e-util/e-gui-utils.h" -#include "e-util/e-unicode.h" +#include <gal/util/e-util.h> +#include <gal/widgets/e-gui-utils.h> +#include <gal/widgets/e-unicode.h> #include "evolution-shell-view.h" @@ -50,7 +50,7 @@ #include "e-shell-view.h" #include "e-shell-view-menu.h" -#include <widgets/e-paned/e-hpaned.h> +#include <gal/e-paned/e-hpaned.h> static BonoboWinClass *parent_class = NULL; diff --git a/shell/e-shell.c b/shell/e-shell.c index 0ddbd5248b..c67d42a52c 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -31,7 +31,7 @@ #include "Evolution.h" #include "e-util/e-gui-utils.h" -#include "e-util/e-util.h" +#include <gal/util/e-util.h> #include "e-component-registry.h" #include "e-corba-storage-registry.h" diff --git a/shell/e-shortcuts-view.c b/shell/e-shortcuts-view.c index 6f457cc18d..7a9b75a86a 100644 --- a/shell/e-shortcuts-view.c +++ b/shell/e-shortcuts-view.c @@ -27,7 +27,7 @@ #include <gnome.h> -#include "e-util/e-util.h" +#include <gal/util/e-util.h> #include "e-shortcuts-view.h" diff --git a/shell/e-shortcuts.c b/shell/e-shortcuts.c index 1828406df3..4d4b8ed9ee 100644 --- a/shell/e-shortcuts.c +++ b/shell/e-shortcuts.c @@ -51,8 +51,8 @@ #include <string.h> -#include "e-util/e-util.h" -#include "e-util/e-xml-utils.h" +#include <gal/util/e-util.h> +#include <gal/util/e-xml-utils.h> #include "shortcut-bar/e-shortcut-bar.h" #include "e-shortcuts-view.h" diff --git a/shell/e-storage-set-view.c b/shell/e-storage-set-view.c index f57cb6280c..1a979fe350 100644 --- a/shell/e-storage-set-view.c +++ b/shell/e-storage-set-view.c @@ -28,16 +28,16 @@ #include <gnome.h> -#include "e-util/e-util.h" +#include <gal/util/e-util.h> #include "e-util/e-gtk-utils.h" #include "e-shell-constants.h" #include "e-storage-set-view.h" -#include "e-table/e-tree-simple.h" -#include "e-table/e-cell-tree.h" -#include "e-table/e-cell-text.h" +#include <gal/e-table/e-tree-simple.h> +#include <gal/e-table/e-cell-tree.h> +#include <gal/e-table/e-cell-text.h> #include "art/tree-expanded.xpm" #include "art/tree-unexpanded.xpm" diff --git a/shell/e-storage-set-view.h b/shell/e-storage-set-view.h index 8f5ef750f3..b1e6cc699b 100644 --- a/shell/e-storage-set-view.h +++ b/shell/e-storage-set-view.h @@ -28,7 +28,7 @@ #include <config.h> #endif -#include "e-table/e-table.h" +#include <gal/e-table/e-table.h> #include "e-storage-set.h" #ifdef __cplusplus diff --git a/shell/e-storage-set.c b/shell/e-storage-set.c index 405c3e2c61..7d3fb84a59 100644 --- a/shell/e-storage-set.c +++ b/shell/e-storage-set.c @@ -31,7 +31,7 @@ #include <string.h> -#include "e-util/e-util.h" +#include <gal/util/e-util.h> #include "e-storage-set-view.h" #include "e-storage-set.h" diff --git a/shell/e-storage.c b/shell/e-storage.c index 61b185fb6a..384e88af33 100644 --- a/shell/e-storage.c +++ b/shell/e-storage.c @@ -30,7 +30,7 @@ #include <gnome.h> -#include "e-util/e-util.h" +#include <gal/util/e-util.h> #include "e-folder-tree.h" diff --git a/shell/evolution-local-storage.c b/shell/evolution-local-storage.c index 2340bbfc93..f8ddfb5c88 100644 --- a/shell/evolution-local-storage.c +++ b/shell/evolution-local-storage.c @@ -27,7 +27,7 @@ #include <gnome.h> -#include "e-util/e-util.h" +#include <gal/util/e-util.h> #include "evolution-local-storage.h" diff --git a/shell/evolution-session.c b/shell/evolution-session.c index 8d92f8fd56..a53d98243f 100644 --- a/shell/evolution-session.c +++ b/shell/evolution-session.c @@ -29,7 +29,7 @@ #include "Evolution.h" -#include "e-util/e-util.h" +#include <gal/util/e-util.h> #include "evolution-session.h" diff --git a/shell/evolution-shell-client.c b/shell/evolution-shell-client.c index a380cae22a..7e32883439 100644 --- a/shell/evolution-shell-client.c +++ b/shell/evolution-shell-client.c @@ -27,7 +27,7 @@ #include <bonobo.h> -#include "e-util/e-util.h" +#include <gal/util/e-util.h> #include "evolution-shell-client.h" diff --git a/shell/evolution-shell-component-client.c b/shell/evolution-shell-component-client.c index bc7c1f9507..318554a826 100644 --- a/shell/evolution-shell-component-client.c +++ b/shell/evolution-shell-component-client.c @@ -33,7 +33,7 @@ #include <liboaf/liboaf.h> -#include "e-util/e-util.h" +#include <gal/util/e-util.h> #include "evolution-shell-component-client.h" diff --git a/shell/evolution-shell-component.c b/shell/evolution-shell-component.c index ed83895392..6361272714 100644 --- a/shell/evolution-shell-component.c +++ b/shell/evolution-shell-component.c @@ -29,7 +29,7 @@ #include "Evolution.h" -#include "e-util/e-util.h" +#include <gal/util/e-util.h> #include "evolution-shell-component.h" diff --git a/shell/evolution-shell-view.c b/shell/evolution-shell-view.c index cef3287851..5c46f70fbb 100644 --- a/shell/evolution-shell-view.c +++ b/shell/evolution-shell-view.c @@ -28,7 +28,7 @@ #include <gnome.h> #include <bonobo.h> -#include "e-util/e-util.h" +#include <gal/util/e-util.h> #include "evolution-shell-view.h" diff --git a/shell/evolution-storage-listener.c b/shell/evolution-storage-listener.c index e059fd72b6..3e1085ab10 100644 --- a/shell/evolution-storage-listener.c +++ b/shell/evolution-storage-listener.c @@ -28,7 +28,7 @@ #include <gnome.h> #include <bonobo.h> -#include "e-util/e-util.h" +#include <gal/util/e-util.h> #include "evolution-storage-listener.h" diff --git a/shell/evolution-storage.c b/shell/evolution-storage.c index 90ca36f397..1561c48242 100644 --- a/shell/evolution-storage.c +++ b/shell/evolution-storage.c @@ -29,7 +29,7 @@ #include "Evolution.h" -#include "e-util/e-util.h" +#include <gal/util/e-util.h> #include "e-folder-tree.h" diff --git a/shell/main.c b/shell/main.c index df3a571048..33ba37a868 100644 --- a/shell/main.c +++ b/shell/main.c @@ -29,8 +29,8 @@ #include <liboaf/liboaf.h> #include <unicode.h> -#include "e-util/e-gui-utils.h" -#include "e-util/e-cursors.h" +#include <gal/widgets/e-gui-utils.h> +#include <gal/widgets/e-cursors.h> #include "e-setup.h" #include "e-shell.h" |