#include <glib.h> and move corresponding local includes to the top.

2001-04-25  Kjartan Maraas  <kmaraas@gnome.org>

	* e-component-register.c, e-corba-storage.c, e-folder-tree.c,
	e-folder-tree.h, e-folder.c, e-local-folder.c, e-shell.c,
	e-shortcuts-view-model.c, e-shortcuts.c, e-splash.c,
	e-storage-set-view.c, e-storage-set.c, evolution-local-storage.c,
	evolution-shell-component-client.c, evolution-shell-component.c,
	evolution-storage.[ch], importer/evolution-importer-client.[ch],
	importer/evolution-importer-listener.[ch],
	importer/evolution-importer.[ch],
	importer/evolution-intelligent-importer.[ch], importer/intelligent.c:
	#include <glib.h> and move corresponding local includes to the top.

svn path=/trunk/; revision=9556

27 files changed, 62 insertions, 25 deletions

diff --git a/shell/ChangeLog b/shell/ChangeLog
index 7859b4c9e9..5d9f82fe2f 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,16 @@
+2001-04-25  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* e-component-register.c, e-corba-storage.c, e-folder-tree.c,
+	e-folder-tree.h, e-folder.c, e-local-folder.c, e-shell.c,
+	e-shortcuts-view-model.c, e-shortcuts.c, e-splash.c, 
+	e-storage-set-view.c, e-storage-set.c, evolution-local-storage.c,
+	evolution-shell-component-client.c, evolution-shell-component.c,
+	evolution-storage.[ch], importer/evolution-importer-client.[ch],
+	importer/evolution-importer-listener.[ch],
+	importer/evolution-importer.[ch],
+	importer/evolution-intelligent-importer.[ch], importer/intelligent.c:
+	#include <glib.h> and move corresponding local includes to the top.
+	
 2001-04-23  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* e-splash.c: #include gnome-window-icon.h
diff --git a/shell/e-component-registry.c b/shell/e-component-registry.c
index 9b8d997222..f316c3fbf2 100644
--- a/shell/e-component-registry.c
+++ b/shell/e-component-registry.c
@@ -25,13 +25,15 @@
 #include <config.h>
 #endif
 
+#include "e-component-registry.h"
+
+#include <glib.h>
 #include <gtk/gtktypeutils.h>
 
 #include <gal/util/e-util.h>
 
 #include "Evolution.h"
 
-#include "e-component-registry.h"
 #include "e-shell-utils.h"
 #include "evolution-shell-component-client.h"
 
diff --git a/shell/e-corba-storage.c b/shell/e-corba-storage.c
index c58f75656b..99fd265c17 100644
--- a/shell/e-corba-storage.c
+++ b/shell/e-corba-storage.c
@@ -25,13 +25,14 @@
 #include <config.h>
 #endif
 
+#include "e-corba-storage.h"
+
+#include <glib.h>
 #include <bonobo/bonobo-main.h>
 #include <gal/util/e-util.h>
 
 #include "Evolution.h"
 
-#include "e-corba-storage.h"
-
 
 #define PARENT_TYPE E_TYPE_STORAGE
 static EStorageClass *parent_class = NULL;
diff --git a/shell/e-folder-tree.c b/shell/e-folder-tree.c
index 7e16b84ce6..bdafea8734 100644
--- a/shell/e-folder-tree.c
+++ b/shell/e-folder-tree.c
@@ -25,11 +25,11 @@
 #include <config.h>
 #endif
 
+#include "e-folder-tree.h"
+
 #include <string.h>
 #include <glib.h>
 
-#include "e-folder-tree.h"
-
 
 struct _Folder {
 	struct _Folder *parent;
diff --git a/shell/e-folder-tree.h b/shell/e-folder-tree.h
index 26fa4b13a4..46773c139b 100644
--- a/shell/e-folder-tree.h
+++ b/shell/e-folder-tree.h
@@ -24,6 +24,8 @@
 #ifndef _E_FOLDER_TREE_H_
 #define _E_FOLDER_TREE_H_
 
+#include <glib.h>
+
 
 typedef struct _EFolderTree EFolderTree;
 
diff --git a/shell/e-folder.c b/shell/e-folder.c
index 995685be65..0ea68d55ec 100644
--- a/shell/e-folder.c
+++ b/shell/e-folder.c
@@ -25,12 +25,13 @@
 #include <config.h>
 #endif
 
+#include "e-folder.h"
+
+#include <glib.h>
 #include <gtk/gtksignal.h>
 
 #include <gal/util/e-util.h>
 
-#include "e-folder.h"
-
 
 #define PARENT_TYPE GTK_TYPE_OBJECT
 static GtkObjectClass *parent_class = NULL;
diff --git a/shell/e-local-folder.c b/shell/e-local-folder.c
index 5825b5fe67..73ae6734da 100644
--- a/shell/e-local-folder.c
+++ b/shell/e-local-folder.c
@@ -38,6 +38,7 @@
 #include <config.h>
 #endif
 
+#include <string.h>
 #include <unistd.h>
 
 #include <gnome-xml/parser.h>
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 3736a6cab4..f9b38e666a 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -25,6 +25,7 @@
 #include <config.h>
 #endif
 
+#include <glib.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtksignal.h>
 #include <libgnome/gnome-defs.h>
diff --git a/shell/e-shortcuts-view-model.c b/shell/e-shortcuts-view-model.c
index 169b21b413..72afd70497 100644
--- a/shell/e-shortcuts-view-model.c
+++ b/shell/e-shortcuts-view-model.c
@@ -28,11 +28,12 @@
 #include <config.h>
 #endif
 
+#include "e-shortcuts-view-model.h"
+
+#include <glib.h>
 #include <gtk/gtksignal.h>
 #include <gal/util/e-util.h>
 
-#include "e-shortcuts-view-model.h"
-
 
 #define PARENT_TYPE e_shortcut_model_get_type ()
 static EShortcutModelClass *parent_class = NULL;
diff --git a/shell/e-shortcuts.c b/shell/e-shortcuts.c
index 0a7b8e83b9..5fae9cfb9d 100644
--- a/shell/e-shortcuts.c
+++ b/shell/e-shortcuts.c
@@ -43,8 +43,11 @@
 #include <config.h>
 #endif
 
+#include "e-shortcuts.h"
+
 #include <string.h>
 
+#include <glib.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtkobject.h>
 #include <gtk/gtksignal.h>
@@ -61,7 +64,6 @@
 
 #include "e-shortcuts-view.h"
 
-#include "e-shortcuts.h"
 #include "e-shell-constants.h"
 
 
diff --git a/shell/e-splash.c b/shell/e-splash.c
index 0dec81da89..cf1bbe5348 100644
--- a/shell/e-splash.c
+++ b/shell/e-splash.c
@@ -25,6 +25,7 @@
 #include <config.h>
 #endif
 
+#include "e-splash.h"
 #include <gtk/gtkframe.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtksignal.h>
@@ -32,7 +33,6 @@
 #include <libgnomeui/gnome-window-icon.h>
 #include <gal/util/e-util.h>
 
-#include "e-splash.h"
 
 
 #define PARENT_TYPE gtk_window_get_type ()
diff --git a/shell/e-storage-set-view.c b/shell/e-storage-set-view.c
index 92b2355c90..d2097683d8 100644
--- a/shell/e-storage-set-view.c
+++ b/shell/e-storage-set-view.c
@@ -26,6 +26,9 @@
 #include <config.h>
 #endif
 
+#include "e-storage-set-view.h"
+
+#include <glib.h>
 #include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-util.h>
 #include <gal/util/e-util.h>
@@ -39,8 +42,6 @@
 
 #include "e-shell-constants.h"
 #include "e-local-storage.h"
-#include "e-storage-set-view.h"
-
 #ifdef JUST_FOR_TRANSLATORS
 static char *list [] = {
 	N_("Folder"),
diff --git a/shell/e-storage-set.c b/shell/e-storage-set.c
index 6fff0554ec..f7aaf4e03d 100644
--- a/shell/e-storage-set.c
+++ b/shell/e-storage-set.c
@@ -27,6 +27,7 @@
 
 #include <string.h>
 
+#include <glib.h>
 #include <gtk/gtkobject.h>
 #include <gtk/gtksignal.h>
 #include <gtk/gtktypeutils.h>
diff --git a/shell/evolution-local-storage.c b/shell/evolution-local-storage.c
index fa8513c3b4..0039d21c7e 100644
--- a/shell/evolution-local-storage.c
+++ b/shell/evolution-local-storage.c
@@ -25,6 +25,7 @@
 #include <config.h>
 #endif
 
+#include <glib.h>
 #include <gtk/gtksignal.h>
 #include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-util.h>
diff --git a/shell/evolution-shell-component-client.c b/shell/evolution-shell-component-client.c
index c3fad4256a..759e4f6ac4 100644
--- a/shell/evolution-shell-component-client.c
+++ b/shell/evolution-shell-component-client.c
@@ -25,6 +25,7 @@
 #include <config.h>
 #endif
 
+#include <glib.h>
 #include <gtk/gtksignal.h>
 #include <gtk/gtktypeutils.h>
 
diff --git a/shell/evolution-shell-component.c b/shell/evolution-shell-component.c
index c29b3b00b7..3e13a80ea2 100644
--- a/shell/evolution-shell-component.c
+++ b/shell/evolution-shell-component.c
@@ -25,8 +25,11 @@
 #include <config.h>
 #endif
 
+#include "evolution-shell-component.h"
+
 #include <fcntl.h>
 
+#include <glib.h>
 #include <gtk/gtksignal.h>
 #include <bonobo/bonobo-object.h>
 
@@ -34,8 +37,6 @@
 
 #include "Evolution.h"
 
-#include "evolution-shell-component.h"
-
 
 #define PARENT_TYPE BONOBO_X_OBJECT_TYPE
 
diff --git a/shell/evolution-storage.c b/shell/evolution-storage.c
index e9a11fbbae..68cbf0c7f3 100644
--- a/shell/evolution-storage.c
+++ b/shell/evolution-storage.c
@@ -25,6 +25,7 @@
 #include <config.h>
 #endif
 
+#include <glib.h>
 #include <gtk/gtksignal.h>
 #include <bonobo/bonobo-object.h>
 
diff --git a/shell/evolution-storage.h b/shell/evolution-storage.h
index 39a82a019e..94b512ae3c 100644
--- a/shell/evolution-storage.h
+++ b/shell/evolution-storage.h
@@ -24,6 +24,7 @@
 #ifndef __EVOLUTION_STORAGE_H__
 #define __EVOLUTION_STORAGE_H__
 
+#include <glib.h>
 #include <bonobo/bonobo-object.h>
 
 #include "Evolution.h"
diff --git a/shell/importer/evolution-importer-client.c b/shell/importer/evolution-importer-client.c
index 0921dd8773..25a8f11b65 100644
--- a/shell/importer/evolution-importer-client.c
+++ b/shell/importer/evolution-importer-client.c
@@ -26,6 +26,9 @@
 #include <config.h>
 #endif
 
+#include "evolution-importer-client.h"
+
+#include <glib.h>
 #include <bonobo/bonobo-object.h>
 #include <bonobo/bonobo-main.h>
 #include <gal/util/e-util.h>
@@ -33,8 +36,6 @@
 #include <liboaf/liboaf.h>
 
 #include "GNOME_Evolution_Importer.h"
-#include "evolution-importer-client.h"
-
 
 #define PARENT_TYPE BONOBO_OBJECT_CLIENT_TYPE
 static BonoboObjectClass *parent_class = NULL;
diff --git a/shell/importer/evolution-importer-client.h b/shell/importer/evolution-importer-client.h
index e9a343dc80..71b20afc6a 100644
--- a/shell/importer/evolution-importer-client.h
+++ b/shell/importer/evolution-importer-client.h
@@ -24,6 +24,7 @@
 #ifndef EVOLUTION_IMPORTER_CLIENT_H
 #define EVOLUTION_IMPORTER_CLIENT_H
 
+#include <glib.h>
 #include <bonobo/bonobo-object-client.h>
 #include <importer/evolution-importer.h>
 #include <importer/evolution-importer-listener.h>
diff --git a/shell/importer/evolution-importer-listener.c b/shell/importer/evolution-importer-listener.c
index 84d6ad22b3..905ebd72fe 100644
--- a/shell/importer/evolution-importer-listener.c
+++ b/shell/importer/evolution-importer-listener.c
@@ -25,12 +25,12 @@
 #include <config.h>
 #endif
 
+#include "evolution-importer-listener.h"
+
 #include <bonobo/bonobo-object.h>
 #include <gal/util/e-util.h>
 
 #include "GNOME_Evolution_Importer.h"
-#include "evolution-importer-listener.h"
-
 #define PARENT_TYPE BONOBO_X_OBJECT_TYPE
 
 static BonoboObjectClass *parent_class = NULL;
diff --git a/shell/importer/evolution-importer-listener.h b/shell/importer/evolution-importer-listener.h
index e61fdb3465..6289e54d99 100644
--- a/shell/importer/evolution-importer-listener.h
+++ b/shell/importer/evolution-importer-listener.h
@@ -24,6 +24,7 @@
 #ifndef EVOLUTION_IMPORTER_LISTENER_H
 #define EVOLUTION_IMPORTER_LISTENER_H
 
+#include <glib.h>
 #include <bonobo/bonobo-xobject.h>
 #include <importer/GNOME_Evolution_Importer.h>
 #include "evolution-importer.h"
diff --git a/shell/importer/evolution-importer.c b/shell/importer/evolution-importer.c
index af3acf487b..fbefc42806 100644
--- a/shell/importer/evolution-importer.c
+++ b/shell/importer/evolution-importer.c
@@ -25,12 +25,12 @@
 #include <config.h>
 #endif
 
+#include "evolution-importer.h"
+
 #include <bonobo/bonobo-object.h>
 #include <gal/util/e-util.h>
 
 #include "GNOME_Evolution_Importer.h"
-#include "evolution-importer.h"
-
 
 #define PARENT_TYPE BONOBO_X_OBJECT_TYPE
 static BonoboObjectClass *parent_class = NULL;
diff --git a/shell/importer/evolution-importer.h b/shell/importer/evolution-importer.h
index 3df870bbf3..dbf672ddbd 100644
--- a/shell/importer/evolution-importer.h
+++ b/shell/importer/evolution-importer.h
@@ -24,6 +24,7 @@
 #ifndef EVOLUTION_IMPORTER_H
 #define EVOLUTION_IMPORTER_H
 
+#include <glib.h>
 #include <bonobo/bonobo-xobject.h>
 #include <importer/GNOME_Evolution_Importer.h>
 
diff --git a/shell/importer/evolution-intelligent-importer.c b/shell/importer/evolution-intelligent-importer.c
index 0149d48f97..e15f37cc24 100644
--- a/shell/importer/evolution-intelligent-importer.c
+++ b/shell/importer/evolution-intelligent-importer.c
@@ -25,11 +25,11 @@
 #include <config.h>
 #endif
 
+#include "evolution-intelligent-importer.h"
+
 #include <bonobo/bonobo-object.h>
 
 #include "GNOME_Evolution_Importer.h"
-#include "evolution-intelligent-importer.h"
-
 
 #define PARENT_TYPE BONOBO_X_OBJECT_TYPE
 static BonoboObjectClass *parent_class = NULL;
diff --git a/shell/importer/evolution-intelligent-importer.h b/shell/importer/evolution-intelligent-importer.h
index 1714a2a046..4d2a4e849d 100644
--- a/shell/importer/evolution-intelligent-importer.h
+++ b/shell/importer/evolution-intelligent-importer.h
@@ -24,6 +24,7 @@
 #ifndef EVOLUTION_INTELLIGENT_IMPORTER_H
 #define EVOLUTION_INTELLIGENT_IMPORTER_H
 
+#include <glib.h>
 #include <bonobo/bonobo-xobject.h>
 #include <importer/GNOME_Evolution_Importer.h>
 
diff --git a/shell/importer/intelligent.c b/shell/importer/intelligent.c
index 24d903d6f3..567af0683c 100644
--- a/shell/importer/intelligent.c
+++ b/shell/importer/intelligent.c
@@ -26,6 +26,8 @@
 #include <config.h>
 #endif
 
+#include "intelligent.h"
+#include <glib.h>
 #include <gtk/gtkbox.h>
 #include <gtk/gtkcheckbutton.h>
 #include <gtk/gtklabel.h>
@@ -44,7 +46,6 @@
 
 #include <liboaf/liboaf.h>
 
-#include "intelligent.h"
 #include "GNOME_Evolution_Importer.h"
 
 /* Prototypes */
@@ -64,7 +65,7 @@ start_importer (const char *iid)
 
 	GtkWidget *dialog, *label, *ask;
 	gboolean dontaskagain;
-	char *str, *prefix;
+	char *prefix;
 
 	if (iid == NULL || *iid == '\0')
 		return;