diff options
40 files changed, 221 insertions, 87 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 7fce0623c9..26130ec536 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,46 @@ +2001-03-29 Kjartan Maraas <kmaraas@gnome.org> + + * e-component-registry.c: Remove/replace unneeded includes and + move around stuff so that system headers are included first. + * e-corba-storage.c: Replace #include <bonobo.h> + * e-folder-tree.c: Shuffle. + * e-folder.c: Remove #include <gtk/gtkobject.h> + * e-local-storage.c: Replace #include <gnome.h> and <bonobo.h> + * e-setup.c: Replace #include <glib.h> and <gnome.h> + * e-shell-folder-creation-dialog.c: Replace #include <gnome.h> + * e-shell-folder-title-bar.c: Replace <gnome.h> + * e-shell-utils.c: Same here. + * e-shell-view-menu.c: Same here (and <bonobo.h>) + * e-shell-view.c: Replace <gnome.h> and <bonobo.h> + * e-shell.c: Replace <gnome.h> + * e-shell.h: Shuffle. + * e-shortcuts-view-model.c: Replace <gnome.h> + * e-shortcuts-view.c: Remove #include <gnome.h> + * e-shortcuts.c: Move <string.h> up. + * e-splash.c: Replace <gnome.h> + * e-storage-set-view.c: Replace <gnome.h> + * e-storage-set.c: Shuffle + * e-storage.c: Replace <gnome.h> + * evolution-local-storage.c: Same here + * evolution-local-storage.h: And here. + * evolution-session.c: Same here too. + * evolution-session.h: Replace <bonobo.h> + * evolution-shell-client.c: Here too. + * evolution-shell-component-client.c: Shuffle. + * evolution-shell-component.c: Replace <bonobo.h> + * evolution-shell-view.c: Remove #include <bonobo.h> + * evolution-shell-view.h: Replace <gnome.h> + * evolution-storage-listener.c: Replace <gnome.h> and <bonobo.h> + * evolution-storage-listener.h: Replace <gnome.h> + * evolution-storage-set-view-listener.c: Replace <gnome.h> and <bonobo.h> + * evolution-storage-set-view.c: Remove <gnome.h> + * evolution-storage.c: Replace <bonobo.h> + * main.c: Replace <gnome.h> and <bonobo.h> + * importer/importer.c: Replace <gnome.h> + * importer/intelligent.c: Replace <gnome.h>. Add prototype for + intelligent_importer_init(). + * importer/intelligent.h: Added this file. + 2001-03-28 Ettore Perazzoli <ettore@ximian.com> * e-storage-set-view.c (folder_sort_callback): Use diff --git a/shell/e-component-registry.c b/shell/e-component-registry.c index f175722ab7..9b8d997222 100644 --- a/shell/e-component-registry.c +++ b/shell/e-component-registry.c @@ -25,18 +25,15 @@ #include <config.h> #endif -#include <gtk/gtkobject.h> #include <gtk/gtktypeutils.h> -#include <bonobo.h> #include <gal/util/e-util.h> -#include "e-shell-utils.h" #include "Evolution.h" -#include "evolution-shell-component-client.h" - #include "e-component-registry.h" +#include "e-shell-utils.h" +#include "evolution-shell-component-client.h" #define PARENT_TYPE GTK_TYPE_OBJECT diff --git a/shell/e-corba-storage.c b/shell/e-corba-storage.c index 18e0723512..c58f75656b 100644 --- a/shell/e-corba-storage.c +++ b/shell/e-corba-storage.c @@ -25,8 +25,7 @@ #include <config.h> #endif -#include <bonobo.h> - +#include <bonobo/bonobo-main.h> #include <gal/util/e-util.h> #include "Evolution.h" diff --git a/shell/e-folder-tree.c b/shell/e-folder-tree.c index f8e23955a9..7e16b84ce6 100644 --- a/shell/e-folder-tree.c +++ b/shell/e-folder-tree.c @@ -25,8 +25,8 @@ #include <config.h> #endif -#include <glib.h> #include <string.h> +#include <glib.h> #include "e-folder-tree.h" diff --git a/shell/e-folder.c b/shell/e-folder.c index f76829b0d4..995685be65 100644 --- a/shell/e-folder.c +++ b/shell/e-folder.c @@ -25,7 +25,6 @@ #include <config.h> #endif -#include <gtk/gtkobject.h> #include <gtk/gtksignal.h> #include <gal/util/e-util.h> diff --git a/shell/e-local-storage.c b/shell/e-local-storage.c index f98ed81897..3a2960b4e9 100644 --- a/shell/e-local-storage.c +++ b/shell/e-local-storage.c @@ -45,10 +45,9 @@ #include <sys/types.h> #include <sys/stat.h> -#include <gnome.h> - -#include <bonobo.h> - +#include <gtk/gtksignal.h> +#include <libgnome/gnome-defs.h> +#include <libgnome/gnome-util.h> #include <gal/util/e-util.h> #include "e-local-folder.h" diff --git a/shell/e-setup.c b/shell/e-setup.c index 96a7a11d15..867aa73d2f 100644 --- a/shell/e-setup.c +++ b/shell/e-setup.c @@ -26,14 +26,18 @@ #include <config.h> #endif -#include <glib.h> -#include <gnome.h> - #include <errno.h> #include <sys/stat.h> #include <sys/types.h> #include <dirent.h> - +#include <stdio.h> /* rename() */ +#include <string.h> /* strlen() */ + +#include <gtk/gtklabel.h> +#include <libgnome/gnome-defs.h> +#include <libgnome/gnome-i18n.h> +#include <libgnome/gnome-util.h> +#include <libgnomeui/gnome-stock.h> #include <gal/widgets/e-gui-utils.h> #include "e-setup.h" diff --git a/shell/e-shell-folder-creation-dialog.c b/shell/e-shell-folder-creation-dialog.c index f3250716fe..62e3b7a60f 100644 --- a/shell/e-shell-folder-creation-dialog.c +++ b/shell/e-shell-folder-creation-dialog.c @@ -25,7 +25,10 @@ #include <config.h> #endif -#include <gnome.h> +#include <glib.h> +#include <libgnome/gnome-defs.h> +#include <libgnome/gnome-i18n.h> +#include <libgnome/gnome-util.h> #include <glade/glade-xml.h> #include <gal/util/e-util.h> diff --git a/shell/e-shell-folder-title-bar.c b/shell/e-shell-folder-title-bar.c index 44f5ae7988..2ad59f507f 100644 --- a/shell/e-shell-folder-title-bar.c +++ b/shell/e-shell-folder-title-bar.c @@ -25,12 +25,20 @@ #include <config.h> #endif -#include <gnome.h> +#include <gtk/gtkbox.h> +#include <gtk/gtkhbox.h> +#include <gtk/gtklabel.h> +#include <gtk/gtkpixmap.h> +#include <gtk/gtkrc.h> +#include <gtk/gtksignal.h> +#include <gtk/gtktogglebutton.h> +#include <libgnome/gnome-defs.h> +#include <libgnome/gnome-i18n.h> #include <gdk-pixbuf/gdk-pixbuf.h> -#include "widgets/misc/e-clipped-label.h" #include <gal/util/e-util.h> +#include "widgets/misc/e-clipped-label.h" #include "e-shell-constants.h" #include "e-shell-folder-title-bar.h" diff --git a/shell/e-shell-utils.c b/shell/e-shell-utils.c index 9065fc224c..0d7119b970 100644 --- a/shell/e-shell-utils.c +++ b/shell/e-shell-utils.c @@ -25,10 +25,13 @@ #include <config.h> #endif -#include <gnome.h> +#include <string.h> -#include "e-shell-constants.h" +#include <glib.h> +#include <libgnome/gnome-defs.h> +#include <libgnome/gnome-util.h> +#include "e-shell-constants.h" #include "e-shell-utils.h" diff --git a/shell/e-shell-view-menu.c b/shell/e-shell-view-menu.c index f2d8d6b7f2..f3fd95f6be 100644 --- a/shell/e-shell-view-menu.c +++ b/shell/e-shell-view-menu.c @@ -24,7 +24,20 @@ */ #include <config.h> -#include <gnome.h> + +#include <glib.h> +#include <gtk/gtksignal.h> +#include <libgnome/gnome-defs.h> +#include <libgnome/gnome-exec.h> +#include <libgnome/gnome-i18n.h> +#include <libgnome/gnome-url.h> +#include <libgnome/gnome-util.h> +#include <libgnomeui/gnome-about.h> +#include <libgnomeui/gnome-dialog.h> +#include <libgnomeui/gnome-dialog-util.h> + +#include <liboaf/liboaf.h> +#include <bonobo/bonobo-moniker-util.h> #include "e-shell-folder-creation-dialog.h" #include "e-shell-folder-selection-dialog.h" @@ -34,9 +47,6 @@ #include "e-shell-view-menu.h" #include "importer/importer.h" -#include <liboaf/liboaf.h> -#include <bonobo.h> - const char *authors[] = { "Seth Alves", diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c index c88c995c17..12f87a217c 100644 --- a/shell/e-shell-view.c +++ b/shell/e-shell-view.c @@ -28,11 +28,14 @@ #include <config.h> #endif -#include <gnome.h> -#include <bonobo.h> -#include <bonobo/bonobo-socket.h> +#include <libgnome/gnome-defs.h> +#include <libgnomeui/gnome-window.h> #include <libgnomeui/gnome-window-icon.h> +#include <bonobo/bonobo-socket.h> +#include <bonobo/bonobo-ui-util.h> +#include <bonobo/bonobo-widget.h> +#include <gal/e-paned/e-hpaned.h> #include <gal/util/e-util.h> #include <gal/widgets/e-gui-utils.h> #include <gal/widgets/e-unicode.h> @@ -53,7 +56,6 @@ #include "e-shell-view.h" #include "e-shell-view-menu.h" -#include <gal/e-paned/e-hpaned.h> static BonoboWindowClass *parent_class = NULL; diff --git a/shell/e-shell.c b/shell/e-shell.c index ba27c9a89f..3736a6cab4 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -25,14 +25,18 @@ #include <config.h> #endif -#include <gnome.h> -#include <liboaf/liboaf.h> - -#include "Evolution.h" +#include <gtk/gtkmain.h> +#include <gtk/gtksignal.h> +#include <libgnome/gnome-defs.h> +#include <libgnome/gnome-config.h> +#include <libgnome/gnome-i18n.h> +#include <libgnome/gnome-util.h> #include <gal/widgets/e-gui-utils.h> #include <gal/util/e-util.h> +#include "Evolution.h" + #include "e-component-registry.h" #include "e-corba-storage-registry.h" #include "e-folder-type-registry.h" @@ -48,6 +52,8 @@ #include "e-shell.h" +#include "importer/intelligent.h" + #define PARENT_TYPE BONOBO_OBJECT_TYPE static BonoboObjectClass *parent_class = NULL; diff --git a/shell/e-shell.h b/shell/e-shell.h index 2237f7458a..f4342988ce 100644 --- a/shell/e-shell.h +++ b/shell/e-shell.h @@ -24,9 +24,8 @@ #ifndef _E_SHELL_H_ #define _E_SHELL_H_ -#include <bonobo/bonobo-object.h> - #include <liboaf/liboaf.h> /* For the registration stuff. */ +#include <bonobo/bonobo-object.h> #ifdef __cplusplus extern "C" { diff --git a/shell/e-shortcuts-view-model.c b/shell/e-shortcuts-view-model.c index f0d08b8458..169b21b413 100644 --- a/shell/e-shortcuts-view-model.c +++ b/shell/e-shortcuts-view-model.c @@ -28,7 +28,7 @@ #include <config.h> #endif -#include <gnome.h> +#include <gtk/gtksignal.h> #include <gal/util/e-util.h> #include "e-shortcuts-view-model.h" diff --git a/shell/e-shortcuts-view-model.h b/shell/e-shortcuts-view-model.h index c8de47f773..85a5047c0a 100644 --- a/shell/e-shortcuts-view-model.h +++ b/shell/e-shortcuts-view-model.h @@ -24,10 +24,10 @@ #ifndef _E_SHORTCUTS_VIEW_MODEL_H_ #define _E_SHORTCUTS_VIEW_MODEL_H_ -#include "e-shortcuts.h" - #include <gal/shortcut-bar/e-shortcut-model.h> +#include "e-shortcuts.h" + #ifdef __cplusplus extern "C" { #pragma } diff --git a/shell/e-shortcuts-view.c b/shell/e-shortcuts-view.c index 4db5b2261c..1abe608f84 100644 --- a/shell/e-shortcuts-view.c +++ b/shell/e-shortcuts-view.c @@ -25,8 +25,6 @@ #include <config.h> #endif -#include <gnome.h> - #include <gal/util/e-util.h> #include "e-shortcuts-view-model.h" diff --git a/shell/e-shortcuts.c b/shell/e-shortcuts.c index 661201f9b0..3906775f42 100644 --- a/shell/e-shortcuts.c +++ b/shell/e-shortcuts.c @@ -43,14 +43,14 @@ #include <config.h> #endif +#include <string.h> + #include <gtk/gtkobject.h> #include <gtk/gtktypeutils.h> #include <gnome-xml/parser.h> #include <gnome-xml/xmlmemory.h> -#include <string.h> - #include <gal/util/e-util.h> #include <gal/util/e-xml-utils.h> #include <gal/shortcut-bar/e-shortcut-bar.h> diff --git a/shell/e-splash.c b/shell/e-splash.c index 424758d13c..3900c8238e 100644 --- a/shell/e-splash.c +++ b/shell/e-splash.c @@ -25,7 +25,9 @@ #include <config.h> #endif -#include <gnome.h> +#include <gtk/gtkframe.h> +#include <gtk/gtkmain.h> +#include <gtk/gtksignal.h> #include <gdk-pixbuf/gnome-canvas-pixbuf.h> #include <gal/util/e-util.h> diff --git a/shell/e-storage-set-view.c b/shell/e-storage-set-view.c index 92621ecf9b..40f92325db 100644 --- a/shell/e-storage-set-view.c +++ b/shell/e-storage-set-view.c @@ -26,20 +26,17 @@ #include <config.h> #endif -#include <gnome.h> - #include <gal/util/e-util.h> +#include <gal/e-table/e-tree-memory-callbacks.h> +#include <gal/e-table/e-cell-tree.h> +#include <gal/e-table/e-cell-text.h> + #include "e-util/e-gtk-utils.h" #include "e-shell-constants.h" -#include "e-storage-set-view.h" - #include "e-local-storage.h" - -#include <gal/e-table/e-tree-memory-callbacks.h> -#include <gal/e-table/e-cell-tree.h> -#include <gal/e-table/e-cell-text.h> +#include "e-storage-set-view.h" #ifdef JUST_FOR_TRANSLATORS static char *list [] = { diff --git a/shell/e-storage-set.c b/shell/e-storage-set.c index 34a40edc03..6fff0554ec 100644 --- a/shell/e-storage-set.c +++ b/shell/e-storage-set.c @@ -25,12 +25,12 @@ #include <config.h> #endif +#include <string.h> + #include <gtk/gtkobject.h> #include <gtk/gtksignal.h> #include <gtk/gtktypeutils.h> -#include <string.h> - #include <gal/util/e-util.h> #include "e-storage-set-view.h" diff --git a/shell/e-storage.c b/shell/e-storage.c index f3c48fa97a..4619d1c5ea 100644 --- a/shell/e-storage.c +++ b/shell/e-storage.c @@ -28,8 +28,8 @@ #include <gtk/gtkobject.h> #include <gtk/gtksignal.h> -#include <gnome.h> - +#include <libgnome/gnome-defs.h> +#include <libgnome/gnome-i18n.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 96a1af33dd..fa8513c3b4 100644 --- a/shell/evolution-local-storage.c +++ b/shell/evolution-local-storage.c @@ -25,7 +25,9 @@ #include <config.h> #endif -#include <gnome.h> +#include <gtk/gtksignal.h> +#include <libgnome/gnome-defs.h> +#include <libgnome/gnome-util.h> #include <gal/util/e-util.h> diff --git a/shell/evolution-local-storage.h b/shell/evolution-local-storage.h index 8f3f403d3a..fcd0fe6614 100644 --- a/shell/evolution-local-storage.h +++ b/shell/evolution-local-storage.h @@ -24,7 +24,7 @@ #ifndef __EVOLUTION_LOCAL_STORAGE_H__ #define __EVOLUTION_LOCAL_STORAGE_H__ -#include <gnome.h> +#include <glib.h> #include "evolution-storage.h" diff --git a/shell/evolution-session.c b/shell/evolution-session.c index d512ab1656..15df5fcae6 100644 --- a/shell/evolution-session.c +++ b/shell/evolution-session.c @@ -25,12 +25,11 @@ #include <config.h> #endif -#include <gnome.h> +#include <gtk/gtksignal.h> +#include <gal/util/e-util.h> #include "Evolution.h" -#include <gal/util/e-util.h> - #include "evolution-session.h" diff --git a/shell/evolution-session.h b/shell/evolution-session.h index 2eeab8e069..5e558d3e56 100644 --- a/shell/evolution-session.h +++ b/shell/evolution-session.h @@ -24,7 +24,7 @@ #ifndef __EVOLUTION_SESSION_H__ #define __EVOLUTION_SESSION_H__ -#include <bonobo.h> +#include <bonobo/bonobo-object.h> #ifdef __cplusplus extern "C" { diff --git a/shell/evolution-shell-client.c b/shell/evolution-shell-client.c index fb919b0a3f..ebb933d316 100644 --- a/shell/evolution-shell-client.c +++ b/shell/evolution-shell-client.c @@ -25,7 +25,9 @@ #include <config.h> #endif -#include <bonobo.h> +#include <gtk/gtkmain.h> +#include <bonobo/bonobo-main.h> +#include <bonobo/bonobo-object.h> #include <gal/util/e-util.h> diff --git a/shell/evolution-shell-component-client.c b/shell/evolution-shell-component-client.c index 1f6b0273b6..7f35d8571f 100644 --- a/shell/evolution-shell-component-client.c +++ b/shell/evolution-shell-component-client.c @@ -28,11 +28,11 @@ #include <gtk/gtksignal.h> #include <gtk/gtktypeutils.h> +#include <liboaf/liboaf.h> + #include <bonobo/bonobo-main.h> #include <bonobo/bonobo-widget.h> -#include <liboaf/liboaf.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 c0ff34e31b..d76b28a9ae 100644 --- a/shell/evolution-shell-component.c +++ b/shell/evolution-shell-component.c @@ -25,12 +25,13 @@ #include <config.h> #endif -#include <bonobo.h> - -#include "Evolution.h" +#include <gtk/gtksignal.h> +#include <bonobo/bonobo-object.h> #include <gal/util/e-util.h> +#include "Evolution.h" + #include "evolution-shell-component.h" diff --git a/shell/evolution-shell-view.c b/shell/evolution-shell-view.c index 53c525a5cb..82e471c35f 100644 --- a/shell/evolution-shell-view.c +++ b/shell/evolution-shell-view.c @@ -26,7 +26,6 @@ #endif #include <gtk/gtksignal.h> -#include <bonobo.h> #include <gal/util/e-util.h> diff --git a/shell/evolution-shell-view.h b/shell/evolution-shell-view.h index bdff814d0d..f7e58a316b 100644 --- a/shell/evolution-shell-view.h +++ b/shell/evolution-shell-view.h @@ -24,8 +24,8 @@ #ifndef __EVOLUTION_SHELL_VIEW_H__ #define __EVOLUTION_SHELL_VIEW_H__ -#include <gnome.h> - +#include <glib.h> +#include <bonobo/bonobo-object.h> #include "Evolution.h" #ifdef __cplusplus diff --git a/shell/evolution-storage-listener.c b/shell/evolution-storage-listener.c index 7dd8b9ac88..0d8ca46609 100644 --- a/shell/evolution-storage-listener.c +++ b/shell/evolution-storage-listener.c @@ -25,9 +25,8 @@ #include <config.h> #endif -#include <gnome.h> -#include <bonobo.h> - +#include <gtk/gtksignal.h> +#include <bonobo/bonobo-main.h> #include <gal/util/e-util.h> #include "evolution-storage-listener.h" diff --git a/shell/evolution-storage-listener.h b/shell/evolution-storage-listener.h index 7433c83836..a17dd6834b 100644 --- a/shell/evolution-storage-listener.h +++ b/shell/evolution-storage-listener.h @@ -24,8 +24,7 @@ #ifndef __EVOLUTION_STORAGE_LISTENER_H__ #define __EVOLUTION_STORAGE_LISTENER_H__ -#include <gnome.h> - +#include <gtk/gtkobject.h> #include "Evolution.h" #ifdef __cplusplus diff --git a/shell/evolution-storage-set-view-listener.c b/shell/evolution-storage-set-view-listener.c index e7f73b5e0a..b4b39072a7 100644 --- a/shell/evolution-storage-set-view-listener.c +++ b/shell/evolution-storage-set-view-listener.c @@ -25,9 +25,8 @@ #include <config.h> #endif -#include <gnome.h> -#include <bonobo.h> - +#include <gtk/gtksignal.h> +#include <bonobo/bonobo-main.h> #include <gal/util/e-util.h> #include "evolution-storage-set-view-listener.h" diff --git a/shell/evolution-storage-set-view.c b/shell/evolution-storage-set-view.c index a90bce0266..12ca532e86 100644 --- a/shell/evolution-storage-set-view.c +++ b/shell/evolution-storage-set-view.c @@ -25,7 +25,6 @@ #include <config.h> #endif -#include <gnome.h> #include "evolution-storage-set-view.h" diff --git a/shell/evolution-storage.c b/shell/evolution-storage.c index fd9bbc11d0..e9a11fbbae 100644 --- a/shell/evolution-storage.c +++ b/shell/evolution-storage.c @@ -25,12 +25,13 @@ #include <config.h> #endif -#include <bonobo.h> - -#include "Evolution.h" +#include <gtk/gtksignal.h> +#include <bonobo/bonobo-object.h> #include <gal/util/e-util.h> +#include "Evolution.h" + #include "e-util/e-corba-utils.h" #include "e-folder-tree.h" diff --git a/shell/importer/importer.c b/shell/importer/importer.c index a82bf72db2..824d95d388 100644 --- a/shell/importer/importer.c +++ b/shell/importer/importer.c @@ -25,7 +25,15 @@ #include <config.h> #endif -#include <gnome.h> +#include <glib.h> +#include <libgnome/gnome-defs.h> +#include <libgnome/gnome-i18n.h> +#include <libgnomeui/gnome-druid.h> +#include <libgnomeui/gnome-druid-page-finish.h> +#include <libgnomeui/gnome-druid-page-standard.h> +#include <libgnomeui/gnome-druid-page-start.h> +#include <libgnomeui/gnome-file-entry.h> +#include <libgnomeui/gnome-stock.h> #include <liboaf/liboaf.h> diff --git a/shell/importer/intelligent.c b/shell/importer/intelligent.c index d874dd3cdd..24d903d6f3 100644 --- a/shell/importer/intelligent.c +++ b/shell/importer/intelligent.c @@ -26,13 +26,33 @@ #include <config.h> #endif -#include <gnome.h> +#include <gtk/gtkbox.h> +#include <gtk/gtkcheckbutton.h> +#include <gtk/gtklabel.h> +#include <gtk/gtkmain.h> +#include <gtk/gtkobject.h> +#include <gtk/gtktogglebutton.h> +#include <gtk/gtkwidget.h> +#include <gtk/gtkwindow.h> + +#include <libgnome/gnome-defs.h> +#include <libgnome/gnome-config.h> +#include <libgnome/gnome-i18n.h> +#include <libgnome/gnome-util.h> +#include <libgnomeui/gnome-dialog.h> +#include <libgnomeui/gnome-stock.h> #include <liboaf/liboaf.h> #include "intelligent.h" #include "GNOME_Evolution_Importer.h" +/* Prototypes */ + +void intelligent_importer_init (void); + +/* End prototypes */ + static void start_importer (const char *iid) { diff --git a/shell/importer/intelligent.h b/shell/importer/intelligent.h index e69de29bb2..8d528f5e77 100644 --- a/shell/importer/intelligent.h +++ b/shell/importer/intelligent.h @@ -0,0 +1,29 @@ +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ +/* importer.c + * + * Copyright (C) 2000 Helix Code, Inc. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + * + * Author: Kjartan Maraas <kmaraas@gnome.org> + */ + +#ifndef __INTELLIGENT_H__ +#define __INTELLIGENT_H__ + +void intelligent_importer_init (void); + +#endif diff --git a/shell/main.c b/shell/main.c index de3bd81816..c111b9faf1 100644 --- a/shell/main.c +++ b/shell/main.c @@ -22,9 +22,17 @@ */ #include <config.h> -#include <gnome.h> -#include <bonobo.h> +#include <glib.h> +#include <gtk/gtkmain.h> +#include <gtk/gtklabel.h> +#include <gtk/gtksignal.h> +#include <libgnome/gnome-defs.h> +#include <libgnome/gnome-i18n.h> +#include <libgnome/gnome-util.h> +#include <libgnomeui/gnome-init.h> +#include <libgnomeui/gnome-stock.h> #include <libgnomeui/gnome-window-icon.h> +#include <bonobo/bonobo-main.h> #include <glade/glade.h> #include <liboaf/liboaf.h> #include <unicode.h> |