aboutsummaryrefslogtreecommitdiffstats
path: root/importers/elm-importer.c
diff options
context:
space:
mode:
authorIain Holmes <iain@src.gnome.org>2001-11-11 23:18:23 +0800
committerIain Holmes <iain@src.gnome.org>2001-11-11 23:18:23 +0800
commitf573f7b3883750363b4fc10f92d086ec5e58bbd0 (patch)
tree79fe32c1d3f95aa5f884f14e54f137bf7f12448d /importers/elm-importer.c
parentfeac853b1132238134d5616e5e4e180320ca4911 (diff)
downloadgsoc2013-evolution-f573f7b3883750363b4fc10f92d086ec5e58bbd0.tar
gsoc2013-evolution-f573f7b3883750363b4fc10f92d086ec5e58bbd0.tar.gz
gsoc2013-evolution-f573f7b3883750363b4fc10f92d086ec5e58bbd0.tar.bz2
gsoc2013-evolution-f573f7b3883750363b4fc10f92d086ec5e58bbd0.tar.lz
gsoc2013-evolution-f573f7b3883750363b4fc10f92d086ec5e58bbd0.tar.xz
gsoc2013-evolution-f573f7b3883750363b4fc10f92d086ec5e58bbd0.tar.zst
gsoc2013-evolution-f573f7b3883750363b4fc10f92d086ec5e58bbd0.zip
Don't let the importers run if people don't want them to
svn path=/trunk/; revision=14664
Diffstat (limited to 'importers/elm-importer.c')
-rw-r--r--importers/elm-importer.c22
1 files changed, 10 insertions, 12 deletions
diff --git a/importers/elm-importer.c b/importers/elm-importer.c
index 5b0aeac77a..ad48fb446b 100644
--- a/importers/elm-importer.c
+++ b/importers/elm-importer.c
@@ -114,8 +114,7 @@ elm_store_settings (ElmImporter *importer)
static void
elm_restore_settings (ElmImporter *importer)
{
- importer->do_mail = bonobo_config_get_boolean_with_default (
- importer->db, "/Importer/Elm/mail", TRUE, NULL);
+ importer->do_mail = FALSE;
}
static void
@@ -443,19 +442,18 @@ elm_create_structure (EvolutionIntelligentImporter *ii,
elm_store_settings (importer);
- /* Create a dialog */
- importer->dialog = create_importer_gui (importer);
- gtk_widget_show_all (importer->dialog);
- while (gtk_events_pending ()) {
- gtk_main_iteration ();
- }
-
if (importer->do_mail == TRUE) {
char *elmdir;
+ importer->dialog = create_importer_gui (importer);
+ gtk_widget_show_all (importer->dialog);
+ while (gtk_events_pending ()) {
+ gtk_main_iteration ();
+ }
+
bonobo_config_set_boolean (importer->db,
- "/Importer/Elm/mail-imported", TRUE, NULL);
-
+ "/Importer/Elm/mail-imported", TRUE, NULL);
+
maildir = elm_get_rc_value ("maildir");
if (maildir == NULL) {
maildir = g_strdup ("Mail");
@@ -470,7 +468,7 @@ elm_create_structure (EvolutionIntelligentImporter *ii,
}
g_free (maildir);
-
+
scan_dir (importer, "/", maildir);
g_free (maildir);