* all:

  - cosmetics

pmo-trunk-r597

diff --git a/src/modest-tny-platform-factory.c b/src/modest-tny-platform-factory.c
index 1e3ae1e..f968dfb 100644 (file)
--- a/src/modest-tny-platform-factory.c
+++ b/src/modest-tny-platform-factory.c
@@ -192,11 +192,11 @@ tny_platform_factory_init (gpointer g, gpointer iface_data)
        TnyPlatformFactoryIface *klass = (TnyPlatformFactoryIface *)g;
 
        klass->new_account_store_func = modest_tny_platform_factory_new_account_store;
        TnyPlatformFactoryIface *klass = (TnyPlatformFactoryIface *)g;
 
        klass->new_account_store_func = modest_tny_platform_factory_new_account_store;

-       klass->new_device_func = modest_tny_platform_factory_new_device;
-       klass->new_msg_view_func = modest_tny_platform_factory_new_msg_view;
-       klass->new_msg_func = modest_tny_platform_factory_new_msg;
-       klass->new_mime_part_func = modest_tny_platform_factory_new_mime_part;
-       klass->new_header_func = modest_tny_platform_factory_new_header;
+       klass->new_device_func        = modest_tny_platform_factory_new_device;
+       klass->new_msg_view_func      = modest_tny_platform_factory_new_msg_view;
+       klass->new_msg_func           = modest_tny_platform_factory_new_msg;
+       klass->new_mime_part_func     = modest_tny_platform_factory_new_mime_part;
+       klass->new_header_func        = modest_tny_platform_factory_new_header;

 
        return;
 }
 
        return;
 }

diff --git a/src/modest-ui.c b/src/modest-ui.c
index ab6e035..56a98b2 100644 (file)
--- a/src/modest-ui.c
+++ b/src/modest-ui.c
@@ -46,6 +46,7 @@
 #include "modest-widget-factory.h"
 #include "modest-tny-platform-factory.h"
 
 #include "modest-widget-factory.h"
 #include "modest-tny-platform-factory.h"
 

+#include <modest-widget-memory.h>

 #include "modest-edit-msg-window.h"
 #include "modest-account-view-window.h"
 #include "modest-icon-names.h"
 #include "modest-edit-msg-window.h"
 #include "modest-account-view-window.h"
 #include "modest-icon-names.h"

diff --git a/src/modest-widget-factory.c b/src/modest-widget-factory.c
index cf0c97c..4b33f71 100644 (file)
--- a/src/modest-widget-factory.c
+++ b/src/modest-widget-factory.c
@@ -173,12 +173,11 @@ init_widgets (ModestWidgetFactory *self)
        /* header view */
        if (!(priv->header_view =
              MODEST_HEADER_VIEW(modest_header_view_new
        /* header view */
        if (!(priv->header_view =
              MODEST_HEADER_VIEW(modest_header_view_new

-                                (NULL, NULL,MODEST_HEADER_VIEW_STYLE_NORMAL)))) {
+                                (NULL, NULL,0)))) {

                g_printerr ("modest: cannot instantiate header view\n");
                return FALSE;
        }
                g_printerr ("modest: cannot instantiate header view\n");
                return FALSE;
        }

-       
-       
+               

        /* msg preview */
        if (!(priv->msg_preview = MODEST_MSG_VIEW(modest_msg_view_new (NULL)))) {
                g_printerr ("modest: cannot instantiate header view\n");
        /* msg preview */
        if (!(priv->msg_preview = MODEST_MSG_VIEW(modest_msg_view_new (NULL)))) {
                g_printerr ("modest: cannot instantiate header view\n");

diff --git a/src/widgets/modest-folder-view.h b/src/widgets/modest-folder-view.h
index 5cffc0f..9a8f081 100644 (file)
--- a/src/widgets/modest-folder-view.h
+++ b/src/widgets/modest-folder-view.h
@@ -70,11 +70,10 @@ struct _ModestFolderViewClass {
 
 /* FIXME: move these to TnyMail */
 enum {
 
 /* FIXME: move these to TnyMail */
 enum {

-

        TNY_FOLDER_TYPE_NOTES = TNY_FOLDER_TYPE_ROOT + 1, /* urgh */
        TNY_FOLDER_TYPE_DRAFTS,
        TNY_FOLDER_TYPE_CONTACTS,
        TNY_FOLDER_TYPE_NOTES = TNY_FOLDER_TYPE_ROOT + 1, /* urgh */
        TNY_FOLDER_TYPE_DRAFTS,
        TNY_FOLDER_TYPE_CONTACTS,

-       TNY_FOLDER_TYPE_CALENDAR
+       TNY_FOLDER_TYPE_CALENDAR,

 };
 
 
 };