Removed several trailing whitespaces
[modest] / src / modest-init.c
index a315b2b..40c1454 100644 (file)
@@ -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