Modified webpage: now tinymail repository is in gitorious.

[modest] / src / modest-tny-platform-factory.c

diff --git a/src/modest-tny-platform-factory.c b/src/modest-tny-platform-factory.c
index e6a3870..62f8eef 100644 (file)
--- a/src/modest-tny-platform-factory.c
+++ b/src/modest-tny-platform-factory.c
@@ -39,7 +39,11 @@
 
 #include "modest-tny-platform-factory.h"
 #include "modest-tny-account-store.h"
 
 #include "modest-tny-platform-factory.h"
 #include "modest-tny-account-store.h"

-#include <widgets/modest-msg-view.h>
+#ifdef MODEST_USE_WEBKIT
+#include <widgets/modest-webkit-msg-view.h>
+#else
+#include <widgets/modest-gtkhtml-msg-view.h>
+#endif

 
 /* 'private'/'protected' functions */
 static void modest_tny_platform_factory_class_init (ModestTnyPlatformFactoryClass *klass);
 
 /* 'private'/'protected' functions */
 static void modest_tny_platform_factory_class_init (ModestTnyPlatformFactoryClass *klass);

@@ -62,12 +66,16 @@ enum {
        LAST_SIGNAL
 };
 
        LAST_SIGNAL
 };
 

-typedef struct _ModestTnyPlatformFactoryPrivate ModestTnyPlatformFactoryPrivate;
-struct _ModestTnyPlatformFactoryPrivate {};
+/* PRIVATE area commented as it's empty now. If you enable this again remember to enable also
+ * private area registration in class init */
+
+/* typedef struct _ModestTnyPlatformFactoryPrivate ModestTnyPlatformFactoryPrivate; */
+/* struct _ModestTnyPlatformFactoryPrivate {}; */
+
+/* #define MODEST_TNY_PLATFORM_FACTORY_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \ */
+/*                                                          MODEST_TYPE_TNY_PLATFORM_FACTORY, \ */
+/*                                                          ModestTnyPlatformFactoryPrivate)) */

 
 

-#define MODEST_TNY_PLATFORM_FACTORY_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
-                                                         MODEST_TYPE_TNY_PLATFORM_FACTORY, \
-                                                         ModestTnyPlatformFactoryPrivate))

 /* globals */
 static GObjectClass *parent_class = NULL;
 static ModestTnyPlatformFactory *singleton = NULL;
 /* globals */
 static GObjectClass *parent_class = NULL;
 static ModestTnyPlatformFactory *singleton = NULL;

@@ -117,7 +125,7 @@ modest_tny_platform_factory_class_init (ModestTnyPlatformFactoryClass *klass)
        gobject_class->finalize = modest_tny_platform_factory_finalize;
        gobject_class->constructor = modest_tny_platform_factory_constructor;
 
        gobject_class->finalize = modest_tny_platform_factory_finalize;
        gobject_class->constructor = modest_tny_platform_factory_constructor;
 

-       g_type_class_add_private (gobject_class, sizeof(ModestTnyPlatformFactoryPrivate));
+/*     g_type_class_add_private (gobject_class, sizeof(ModestTnyPlatformFactoryPrivate)); */

 }
 
 static void
 }
 
 static void

@@ -156,11 +164,11 @@ tny_platform_factory_init (gpointer g, gpointer iface_data)
 {
        TnyPlatformFactoryIface *klass = (TnyPlatformFactoryIface *)g;
 
 {
        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_account_store = modest_tny_platform_factory_new_account_store;
+       klass->new_device        = modest_tny_platform_factory_new_device;
+       klass->new_msg_view      = modest_tny_platform_factory_new_msg_view;
+       klass->new_msg           = modest_tny_platform_factory_new_msg;
+       klass->new_mime_part     = modest_tny_platform_factory_new_mime_part;

        return;
 }
 
        return;
 }
 

@@ -190,7 +198,11 @@ static TnyMsgView*
 modest_tny_platform_factory_new_msg_view (TnyPlatformFactory *self)
 {
        /* Here we'll select one of the implementations available */
 modest_tny_platform_factory_new_msg_view (TnyPlatformFactory *self)
 {
        /* Here we'll select one of the implementations available */

-       return g_object_new (MODEST_TYPE_MSG_VIEW, NULL);
+#ifdef MODEST_USE_WEBKIT
+       return g_object_new (MODEST_TYPE_WEBKIT_MSG_VIEW, NULL);
+#else
+       return g_object_new (MODEST_TYPE_GTKHTML_MSG_VIEW, NULL);
+#endif

 }
 
 static TnyMsg*
 }
 
 static TnyMsg*