X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-init.c;h=40c145458966e38b94ab2f4ceb3f47ad1dcd6940;hb=04a8f75ba92f077cd0d408caed023eb49fd40ea0;hp=7797e951311cd16f2446e237bc410fd2a018386b;hpb=85d113ea54904d4f5e6fa431827336c40695773d;p=modest

diff --git a/src/modest-init.c b/src/modest-init.c
index 7797e95..40c1454 100644
--- a/src/modest-init.c
+++ b/src/modest-init.c
@@ -50,6 +50,7 @@
 #include "modest-tny-msg.h"
 #include <libgnomevfs/gnome-vfs.h>
 #include <string.h>
+#include "modest-text-utils.h"
 
 #ifndef MODEST_TOOLKIT_GTK
 #include "modest-hildon-includes.h"
@@ -183,7 +184,7 @@ static gboolean
 force_ke_recv_load (void)
 {
 	if (strcmp ("cerm_device_memory_full",
-		    dgettext("ke-recv", "cerm_device_memory_full")) == 0) {
+		    _KR("cerm_device_memory_full")) == 0) {
 		g_warning ("%s: cannot get translation for cerm_device_memory_full",
 			   __FUNCTION__);
 		return FALSE;
@@ -386,7 +387,7 @@ init_header_columns (ModestConf *conf, gboolean overwrite)
 	gchar *key;
 	
 	for (folder_type = TNY_FOLDER_TYPE_UNKNOWN;
-	     folder_type <= TNY_FOLDER_TYPE_CALENDAR; ++folder_type) {		
+	     folder_type < TNY_FOLDER_TYPE_NUM; ++folder_type) {		
 		
 		switch (folder_type) {
 		case TNY_FOLDER_TYPE_SENT:
@@ -678,7 +679,11 @@ init_stock_icons (void)
 #ifndef MODEST_PLATFORM_GTK  
 			pixbuf = gtk_icon_theme_load_icon (current_theme,
 							   items_names[i],
+#ifdef MODEST_TOOLKIT_HILDON2
+							   48,
+#else
 							   26,
+#endif
 							   GTK_ICON_LOOKUP_NO_SVG,
 							   NULL);
 #else
@@ -729,7 +734,7 @@ init_default_settings (ModestConf *conf)
 
 	/* Editor keys */
 	if (!modest_conf_key_exists (conf, MODEST_CONF_SHOW_CC, NULL))
-		modest_conf_set_bool (conf, MODEST_CONF_SHOW_CC, TRUE, NULL);
+		modest_conf_set_bool (conf, MODEST_CONF_SHOW_CC, FALSE, NULL);
 
 	if (!modest_conf_key_exists (conf, MODEST_CONF_SHOW_BCC, NULL))
 		modest_conf_set_bool (conf, MODEST_CONF_SHOW_BCC, FALSE, NULL);