From d6f661cd37f86e4dc61e486ae84e702b84d8d1cb Mon Sep 17 00:00:00 2001
From: Kjartan Maraas <kmaraas@gnome.org>
Date: Thu, 29 Mar 2001 18:39:21 +0000
Subject: Remove/replace unneeded includes and move around stuff so that system

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

svn path=/trunk/; revision=9019
---
 shell/importer/importer.c    | 10 +++++++++-
 shell/importer/intelligent.c | 22 +++++++++++++++++++++-
 shell/importer/intelligent.h | 29 +++++++++++++++++++++++++++++
 3 files changed, 59 insertions(+), 2 deletions(-)

(limited to 'shell/importer')

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
-- 
cgit v1.2.3