aboutsummaryrefslogtreecommitdiffstats
path: root/shell/importer
diff options
context:
space:
mode:
authorKjartan Maraas <kmaraas@gnome.org>2001-04-25 15:55:21 +0800
committerKjartan Maraas <kmaraas@src.gnome.org>2001-04-25 15:55:21 +0800
commit65464a8165e62f342a8164a02024ce29f1b0bfe6 (patch)
tree15291bf88d47a2ca21ac6b256095ff4810b8b915 /shell/importer
parent1fbf5280384a3cc61b5a417079e481eaf19628f4 (diff)
downloadgsoc2013-evolution-65464a8165e62f342a8164a02024ce29f1b0bfe6.tar
gsoc2013-evolution-65464a8165e62f342a8164a02024ce29f1b0bfe6.tar.gz
gsoc2013-evolution-65464a8165e62f342a8164a02024ce29f1b0bfe6.tar.bz2
gsoc2013-evolution-65464a8165e62f342a8164a02024ce29f1b0bfe6.tar.lz
gsoc2013-evolution-65464a8165e62f342a8164a02024ce29f1b0bfe6.tar.xz
gsoc2013-evolution-65464a8165e62f342a8164a02024ce29f1b0bfe6.tar.zst
gsoc2013-evolution-65464a8165e62f342a8164a02024ce29f1b0bfe6.zip
#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
Diffstat (limited to 'shell/importer')
-rw-r--r--shell/importer/evolution-importer-client.c5
-rw-r--r--shell/importer/evolution-importer-client.h1
-rw-r--r--shell/importer/evolution-importer-listener.c4
-rw-r--r--shell/importer/evolution-importer-listener.h1
-rw-r--r--shell/importer/evolution-importer.c4
-rw-r--r--shell/importer/evolution-importer.h1
-rw-r--r--shell/importer/evolution-intelligent-importer.c4
-rw-r--r--shell/importer/evolution-intelligent-importer.h1
-rw-r--r--shell/importer/intelligent.c5
9 files changed, 16 insertions, 10 deletions
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;