X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-platform-factory.c;h=62f8eefe8124f8019c843d416e04725bf8f1c199;hp=4d370a55512440fef9220d5f141d57fb7473f31f;hb=HEAD;hpb=e5d4412a9f76a8ba843fc979f9439bd092095ea8

diff --git a/src/modest-tny-platform-factory.c b/src/modest-tny-platform-factory.c
index 4d370a5..62f8eef 100644
--- a/src/modest-tny-platform-factory.c
+++ b/src/modest-tny-platform-factory.c
@@ -31,19 +31,19 @@
 #include <config.h>
 
 #include <modest-runtime.h>
+#include <modest-platform.h>
+
 #include <tny-camel-header.h>
 #include <tny-camel-mime-part.h>
 #include <tny-camel-msg.h>
 
-/* MODES_PLATFORM_ID: 1 ==> gtk, 2==> maemo */
-#if MODEST_PLATFORM_ID==1   
-#include <tny-gnome-device.h>
-#elif MODEST_PLATFORM_ID==2
-#include <tny-maemo-device.h>
-#endif
-
 #include "modest-tny-platform-factory.h"
 #include "modest-tny-account-store.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);
@@ -58,8 +58,6 @@ static TnyDevice*       modest_tny_platform_factory_new_device        (TnyPlatfo
 static TnyMsgView*      modest_tny_platform_factory_new_msg_view      (TnyPlatformFactory *self);
 static TnyMsg*          modest_tny_platform_factory_new_msg           (TnyPlatformFactory *self);
 static TnyMimePart*     modest_tny_platform_factory_new_mime_part     (TnyPlatformFactory *self);
-static TnyHeader*       modest_tny_platform_factory_new_header        (TnyPlatformFactory *self);
-
 
 /* list my signals  */
 enum {
@@ -68,12 +66,16 @@ enum {
 	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;
@@ -123,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;
 
-	g_type_class_add_private (gobject_class, sizeof(ModestTnyPlatformFactoryPrivate));
+/* 	g_type_class_add_private (gobject_class, sizeof(ModestTnyPlatformFactoryPrivate)); */
 }
 
 static void
@@ -162,13 +164,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;
-	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_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;
 }
 
@@ -191,21 +191,18 @@ modest_tny_platform_factory_new_account_store (TnyPlatformFactory *self)
 static TnyDevice *
 modest_tny_platform_factory_new_device (TnyPlatformFactory *self)
 {
-/* MODES_PLATFORM_ID: 1 ==> gtk, 2==> maemo */
-#if MODEST_PLATFORM_ID==1   
-	return TNY_DEVICE (tny_gnome_device_new ());
-#elif MODEST_PLATFORM_ID==2
-	return TNY_DEVICE (tny_maemo_device_new ());
-#else
-	g_return_val_if_reached (NULL);
-#endif /* MODEST_PLATFORM */
+	return modest_platform_get_new_device ();
 }
 
 static TnyMsgView*
 modest_tny_platform_factory_new_msg_view (TnyPlatformFactory *self)
 {
-	/* TODO */
-	return NULL;
+	/* Here we'll select one of the implementations available */
+#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*
@@ -222,8 +219,3 @@ modest_tny_platform_factory_new_mime_part (TnyPlatformFactory *self)
 }
 
 
-static TnyHeader*
-modest_tny_platform_factory_new_header (TnyPlatformFactory *self)
-{
-	return tny_camel_header_new ();
-}