Changeset 279

Timestamp:

05/12/06 11:14:19

Author:

pvanhoof

Message:

Platform factory

Files:

• trunk/libtinymail-gnome-desktop/Makefile.am (modified) (2 diffs)
• trunk/libtinymail-gnome-desktop/tny-account-store.c (modified) (3 diffs)
• trunk/libtinymail-gnome-desktop/tny-account-store.h (modified) (1 diff)
• trunk/libtinymail-gnome-desktop/tny-platform-factory.c (added)
• trunk/libtinymail-gnome-desktop/tny-platform-factory.h (added)
• trunk/libtinymail/tny-shared.h (modified) (1 diff)
• trunk/libtinymailui-gtk/tny-msg-window.c (modified) (2 diffs)
• trunk/libtinymailui-gtk/tny-msg-window.h (modified) (2 diffs)
• trunk/libtinymailui/Makefile.am (modified) (2 diffs)
• trunk/libtinymailui/tny-platform-factory-iface.c (added)
• trunk/libtinymailui/tny-platform-factory-iface.h (added)
• trunk/tinymail/tny-main.c (modified) (3 diffs)
• trunk/tinymail/tny-summary-window.c (modified) (6 diffs)

trunk/libtinymail-gnome-desktop/Makefile.am

@@ -12 +12 @@
-        tny-moz-embed-stream.h                   \
-        tny-password-dialog.h                    \
-
+
+
-
-libtinymail_gnome_desktop_1_0_la_SOURCES =       \
@@ -21 +22 @@
-        tny-moz-embed-msg-view.c                 \
-        tny-moz-embed-stream.c                   \
-
+
+
-
-libtinymail_gnome_desktop_1_0_la_LIBADD =       \

trunk/libtinymail-gnome-desktop/tny-account-store.c

@@ -485 +485 @@
- **/
-TnyAccountStore*
-get_instance
+new
-{
-        TnyAccountStore *self = g_object_new (TNY_TYPE_ACCOUNT_STORE, NULL);
+        TnyAccountStorePriv *priv = TNY_ACCOUNT_STORE_GET_PRIVATE (self);
+
+        priv->device = TNY_DEVICE_IFACE (tny_device_new ());
+        priv->session = tny_session_camel_new (TNY_ACCOUNT_STORE_IFACE (self));
-
-        return self;
@@ -547 +551 @@
-}
-
-static TnyAccountStore *the_singleton = NULL;
-
-
-static GObject*
-tny_account_store_constructor (GType type, guint n_construct_params,
-                        GObjectConstructParam *construct_params)
-{
-        GObject *object;
-
-        /* TODO: potential problem: singleton without lock */
-
-        if (G_UNLIKELY (!the_singleton))
-        {
-                TnyAccountStorePriv *priv;
-
-                object = G_OBJECT_CLASS (parent_class)->constructor (type,
-                                n_construct_params, construct_params);
-
-                priv = TNY_ACCOUNT_STORE_GET_PRIVATE (object);
-                priv->device = TNY_DEVICE_IFACE (tny_device_new ());
-                priv->session = tny_session_camel_new 
-                        (TNY_ACCOUNT_STORE_IFACE (object));
-
-                the_singleton = TNY_ACCOUNT_STORE (object);
-        }
-        else
-        {
-                object = g_object_ref (G_OBJECT (the_singleton));
-                g_object_freeze_notify (G_OBJECT(the_singleton));
-        }
-
-        return object;
-}
-
-
-static void 
-tny_account_store_class_init (TnyAccountStoreClass *class)
@@ -591 +560 @@
-
-        object_class->finalize = tny_account_store_finalize;
-        object_class->constructor = tny_account_store_constructor;
-
-        g_type_class_add_private (object_class, sizeof (TnyAccountStorePriv));

trunk/libtinymail-gnome-desktop/tny-account-store.h

@@ -49 +49 @@
-
-GType               tny_account_store_get_type       (void);
-get_instance
+new         
-TnySessionCamel*    tny_account_store_get_session    (TnyAccountStore *self);
-

trunk/libtinymail/tny-shared.h

@@ -45 +45 @@
-typedef struct _TnyMsgHeaderProxy TnyMsgHeaderProxy;
-typedef struct _TnyMsgHeaderProxyClass TnyMsgHeaderProxyClass;
+typedef struct _TnyPlatformFactoryIface PlatformFactoryIface;
+typedef struct _PlatformFactoryIfaceClass PlatformFactoryIfaceClass;
-typedef gchar* (*TnyGetPassFunc) (TnyAccountIface *self, const gchar *prompt);
-typedef void (*TnyForgetPassFunc) (TnyAccountIface *self);

trunk/libtinymailui-gtk/tny-msg-window.c

@@ -55 +55 @@
- **/
-TnyMsgWindow*
-void
+TnyMsgViewIface *msgview
-{
-        TnyMsgWindow *self = g_object_new (TNY_TYPE_MSG_WINDOW, NULL);
+        TnyMsgWindowPriv *priv = TNY_MSG_WINDOW_GET_PRIVATE (self);
+
+        priv->msg_view = msgview;
+
+        /* TODO: Remove old msg_view first */
+
+        gtk_container_add (GTK_CONTAINER (self), GTK_WIDGET (priv->msg_view));
+        gtk_widget_show (GTK_WIDGET (priv->msg_view));
-
-        return self;
@@ -70 +78 @@
-        gtk_window_set_default_size (GTK_WINDOW (self), 640, 480);
-
-        priv->msg_view = TNY_MSG_VIEW_IFACE (tny_msg_view_new ());
-
-        gtk_container_add (GTK_CONTAINER (self), GTK_WIDGET (priv->msg_view));
-
-        gtk_widget_show (GTK_WIDGET (priv->msg_view));
-
-        return;

trunk/libtinymailui-gtk/tny-msg-window.h

@@ -24 +24 @@
-#include <tny-shared.h>
-
+#include <tny-msg-view-iface.h>
-#include <tny-msg-window-iface.h>
-#include <tny-msg-header-iface.h>
@@ -54 +55 @@
-
-GType               tny_msg_window_get_type       (void);
-void
+TnyMsgViewIface *msgview
-
-G_END_DECLS

trunk/libtinymailui/Makefile.am

@@ -8 +8 @@
-        tny-summary-window-iface.h      \
-        tny-msg-view-iface.h            \
-
+
+
-
-libtinymailui_1_0_la_SOURCES =          \
@@ -14 +15 @@
-        tny-summary-window-iface.c      \
-        tny-msg-view-iface.c            \
-
+
+
-
-libtinymailui_1_0_la_LIBADD =           \

trunk/tinymail/tny-main.c

@@ -22 +22 @@
-#include <tny-summary-window.h>
-#include <tny-summary-window-iface.h>
-
-
-
-
-
+
+
-
-#include <libgnomevfs/gnome-vfs.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
-
-#include <firefox/nspr/nspr.h>
-
-
@@ -47 +43 @@
-{
-        GtkWindow *window = NULL;
+        TnyPlatformFactoryIface *platfact;
-
-        gtk_init (&argc, &argv);
@@ -53 +50 @@
-        gnome_vfs_init ();
-
+        platfact = TNY_PLATFORM_FACTORY_IFACE 
+                        (tny_platform_factory_get_instance ());
+
-        window = GTK_WINDOW (tny_summary_window_new ());
-
-        gtk_widget_show (GTK_WIDGET (window));
-
-
-
+
+
+
-        
-        g_signal_connect (window, "destroy",

trunk/tinymail/tny-summary-window.c

@@ -23 +23 @@
-#include <gtk/gtk.h>
-
+#include <tny-platform-factory-iface.h>
+#include <tny-platform-factory.h>
+
-#include <tny-password-dialog.h>
-#include <tny-account-store-iface.h>
@@ -364 +367 @@
-                        const TnyMsgHeaderIface *nheader;
-
+                        TnyPlatformFactoryIface *platfact;
+
+                        platfact = TNY_PLATFORM_FACTORY_IFACE 
+                                (tny_platform_factory_get_instance ());
+
-                        folder = tny_msg_header_iface_get_folder (TNY_MSG_HEADER_IFACE (header));
-
@@ -378 +386 @@
-                        nheader = tny_msg_iface_get_header (TNY_MSG_IFACE (msg));
-
-
+
+
+
+
-                        tny_msg_window_iface_set_msg (msgwin, TNY_MSG_IFACE (msg));
-        
@@ -405 +416 @@
-        TnySummaryWindow *self = (TnySummaryWindow *)instance;
-        TnySummaryWindowPriv *priv = TNY_SUMMARY_WINDOW_GET_PRIVATE (self);
+        TnyPlatformFactoryIface *platfact;
+
-        GtkWindow *window = GTK_WINDOW (self);
-        GtkWidget *mailbox_sw;
@@ -416 +429 @@
-        GtkWidget *vpaned1;
-        GtkWidget *vbox;
-
+
-
-        /* TODO: Persist application UI status (of the panes) */
+
+        platfact = TNY_PLATFORM_FACTORY_IFACE 
+                        (tny_platform_factory_get_instance ());
-
-        hpaned1 = gtk_hpaned_new ();
@@ -438 +454 @@
-        gtk_widget_show (vpaned1);
-        
-
-
-
-
-
-
+
-
-        gtk_widget_show (GTK_WIDGET (priv->msg_view));