From: Dirk-Jan C. Binnema <dirk-jan.binnema@nokia.com>
Date: Sun, 24 Jun 2007 10:17:13 +0000 (+0000)
Subject: * remove some unintended changes in the last checkin
X-Git-Tag: git_migration_finished~3147
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=ef8694f7d80505ee356897d45d9757d7b68a6f5c

* remove some unintended changes in the last checkin

pmo-trunk-r2384
---

diff --git a/src/modest-init.c b/src/modest-init.c
index 47014e0..2580951 100644
--- a/src/modest-init.c
+++ b/src/modest-init.c
@@ -109,8 +109,7 @@ static const FolderCols SENT_COLUMNS_TWOLINES[] = {
 static const TnyFolderType LOCAL_FOLDERS[] = {
 /*	TNY_FOLDER_TYPE_OUTBOX, */
 	TNY_FOLDER_TYPE_DRAFTS,
-	TNY_FOLDER_TYPE_SENT,
-	TNY_FOLDER_TYPE_ARCHIVE
+	TNY_FOLDER_TYPE_SENT
 };
 #else
 static const TnyFolderType LOCAL_FOLDERS[] = {
@@ -205,12 +204,7 @@ modest_init_init_core (void)
 		return FALSE;
 	}
 
-	/* based on the debug settings, we decide whether to overwrite old settings */
-	/* FIXME: hack: overwrite the settings, so we're not going to see the invisble
-	   headers problem -- however, this should be fixed more properly, maybe by ripping
-	   out the header-column system, which is really overengineered for our modest needs */
-	//reset = modest_runtime_get_debug_flags () & MODEST_RUNTIME_DEBUG_FACTORY_SETTINGS;
-	reset = TRUE;
+	reset = modest_runtime_get_debug_flags () & MODEST_RUNTIME_DEBUG_FACTORY_SETTINGS;
 	if (!init_header_columns(modest_runtime_get_conf(), reset)) {
 		modest_init_uninit ();
 		g_printerr ("modest: failed to init header columns\n");
diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 98d57c6..fe43926 100644
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -349,7 +349,9 @@ modest_ui_actions_on_quit (GtkAction *action, ModestWindow *win)
 	modest_osso_save_state();
 #endif /* MODEST_PLATFORM_MAEMO */
 
-	g_message ("quiting...");	
+	/* FIXME: we need to cancel all actions/threads here,
+	 so we really quit */
+
 	gtk_main_quit ();
 }