4 files changed, 12 insertions, 59 deletions

diff --git a/mail/importers/elm-importer.c b/mail/importers/elm-importer.c
index 439a6a69b9..0314952b94 100644
--- a/mail/importers/elm-importer.c
+++ b/mail/importers/elm-importer.c
@@ -91,6 +91,8 @@ typedef struct {
 
 static GHashTable *elm_prefs = NULL;
 
+void mail_importer_module_init (void);
+
 static void import_next (ElmImporter *importer);
 
 static GtkWidget *
@@ -154,9 +156,7 @@ importer_cb (EvolutionImporterListener *listener,
 	     void *data)
 {
 	ElmImporter *importer = (ElmImporter *) data;
-	CORBA_Object objref;
-	CORBA_Environment ev;
-
+	
 	if (more_items) {
 		g_assert(importer->import_id == 0);
 		importer->progress_count++;
@@ -292,7 +292,7 @@ elm_can_import (EvolutionIntelligentImporter *ii,
 	char *elmdir, *maildir, *aliasfile;
 	char *elmrc;
 	gboolean exists, mailexists, aliasexists;
-	gboolean mail, alias;
+	gboolean mail;
 	struct stat st;
 	GConfClient *gconf = gconf_client_get_default();
 
@@ -446,7 +446,6 @@ static void
 elm_create_structure (EvolutionIntelligentImporter *ii,
 		      void *closure)
 {
-	CORBA_Environment ev;
 	ElmImporter *importer = closure;
 	char *maildir;
 
@@ -496,8 +495,6 @@ elm_create_structure (EvolutionIntelligentImporter *ii,
 static void
 elm_destroy_cb (ElmImporter *importer, GtkObject *object)
 {
-	CORBA_Environment ev;
-
 	elm_store_settings (importer);
 
 	if (importer->dialog)
diff --git a/mail/importers/evolution-mbox-importer.c b/mail/importers/evolution-mbox-importer.c
index 4c948a595c..f7fedee526 100644
--- a/mail/importers/evolution-mbox-importer.c
+++ b/mail/importers/evolution-mbox-importer.c
@@ -331,7 +331,7 @@ load_file_fn (EvolutionImporter *eimporter,
 	if (folderpath == NULL || *folderpath == '\0') {
 		importer->folder = mail_tool_get_local_inbox (NULL);
 	} else {
-		char *parent, *tmp, *fullpath, *homedir;
+		char *parent, *fullpath, *homedir;
 		const char *name;
 		BonoboListener *listener;
 		CamelException *ex;
diff --git a/mail/importers/netscape-importer.c b/mail/importers/netscape-importer.c
index 4a4ddd656e..85f8e132f8 100644
--- a/mail/importers/netscape-importer.c
+++ b/mail/importers/netscape-importer.c
@@ -197,12 +197,13 @@ typedef struct {
 
 
 /* Prototypes ------------------------------------------------------------- */
+void mail_importer_module_init (void);
+
 static void  netscape_filter_cleanup (NsFilter *nsf);
 static char *fix_netscape_folder_names (const char *original_name);
 static void  import_next (NsImporter *importer);
 
 
-
 /* Email filter stuff ----------------------------------------------------- */
 
 static gboolean
@@ -1754,9 +1755,7 @@ importer_cb (EvolutionImporterListener *listener,
 	     void *data)
 {
 	NsImporter *importer = (NsImporter *) data;
-	CORBA_Object objref;
-	CORBA_Environment ev;
-
+	
 	if (result == EVOLUTION_IMPORTER_NOT_READY ||
 	    result == EVOLUTION_IMPORTER_BUSY) {
 		g_timeout_add (1000, importer_timeout_fn, data);
@@ -1978,7 +1977,6 @@ static void
 netscape_create_structure (EvolutionIntelligentImporter *ii,
 			   void *closure)
 {
-	CORBA_Environment ev;
 	NsImporter *importer = closure;
 	GConfClient *gconf = gconf_client_get_default();
 
@@ -2053,8 +2051,6 @@ netscape_create_structure (EvolutionIntelligentImporter *ii,
 static void
 netscape_destroy_cb (NsImporter *importer, GObject *object)
 {
-	CORBA_Environment ev;
-
 	netscape_store_settings (importer);
 
 	if (importer->importer != CORBA_OBJECT_NIL) {
diff --git a/mail/importers/pine-importer.c b/mail/importers/pine-importer.c
index c023c99fbe..af4f8f783b 100644
--- a/mail/importers/pine-importer.c
+++ b/mail/importers/pine-importer.c
@@ -101,6 +101,8 @@ typedef struct {
 	gboolean folder;
 } PineFolder;
 
+void mail_importer_module_init (void);
+
 static void import_next (PineImporter *importer);
 
 static GtkWidget *
@@ -139,41 +141,6 @@ pine_restore_settings (PineImporter *importer)
 	importer->do_address = gconf_client_get_bool (gconf, "/apps/evolution/importer/pine/address", NULL);
 }
 
-/* A very basic address spliter.
-   Returns the first email address
-   denoted by <address> */
-static char *
-parse_address (const char *address)
-{
-	char *addr_dup, *result, *start, *end;
-
-	if (address == NULL) {
-		return NULL;
-	}
-
-	addr_dup = g_strdup (address);
-	start = strchr (addr_dup, '<');
-	if (start == NULL) {
-		/* Whole line is an address */
-		return addr_dup;
-	}
-
-	start += 1;
-	end = strchr (start, '>');
-	if (end == NULL) {
-		result = g_strdup (start);
-		g_free (addr_dup);
-
-		return result;
-	}
-
-	*end = 0;
-	result = strdup (start);
-	g_free (addr_dup);
-
-	return result;
-}
-
 static void
 add_card_cb (EBook *book, 
 	     EBookStatus status,
@@ -325,9 +292,7 @@ importer_cb (EvolutionImporterListener *listener,
 	     void *data)
 {
 	PineImporter *importer = (PineImporter *) data;
-	CORBA_Object objref;
-	CORBA_Environment ev;
-
+	
 	if (result == EVOLUTION_IMPORTER_NOT_READY ||
 	    result == EVOLUTION_IMPORTER_BUSY) {
 		importer->more = more_items;
@@ -396,11 +361,9 @@ pine_can_import (EvolutionIntelligentImporter *ii,
 {
 	PineImporter *importer = closure;
 	char *maildir, *addrfile;
-	gboolean mail;
 	gboolean md_exists = FALSE, addr_exists = FALSE;
 	struct stat st;
-	GConfClient *gconf = gconf_client_get_default();
-
+	
 	maildir = g_build_filename(g_get_home_dir(), "mail", NULL);
 	md_exists = lstat(maildir, &st) == 0 && S_ISDIR(st.st_mode);
 	importer->do_mail = md_exists;
@@ -542,7 +505,6 @@ static void
 pine_create_structure (EvolutionIntelligentImporter *ii,
 		       void *closure)
 {
-	CORBA_Environment ev;
 	PineImporter *importer = closure;
 	char *maildir;
 	GConfClient *gconf = gconf_client_get_default ();
@@ -593,8 +555,6 @@ pine_create_structure (EvolutionIntelligentImporter *ii,
 static void
 pine_destroy_cb (PineImporter *importer, GtkObject *object)
 {
-	CORBA_Environment ev;
-
 	pine_store_settings (importer);
 
 	if (importer->dialog)