Changeset 252

Timestamp:

05/10/06 12:30:46

Author:

pvanhoof

Message:

Offline online

Files:

• trunk/libtinymail-camel/tny-camel-shared.h (modified) (1 diff)
• trunk/libtinymail-camel/tny-session-camel.c (modified) (5 diffs)
• trunk/libtinymail-camel/tny-session-camel.h (modified) (2 diffs)
• trunk/libtinymail-gnome-desktop/Makefile.am (modified) (1 diff)
• trunk/libtinymail-gnome-desktop/tny-account-store.c (modified) (3 diffs)
• trunk/libtinymail-gnome-desktop/tny-device.c (modified) (1 diff)
• trunk/libtinymail-gnome-desktop/tny-device.h (modified) (1 diff)

trunk/libtinymail-camel/tny-camel-shared.h

@@ -28 +28 @@
-typedef struct _TnySessionCamelClass TnySessionCamelClass;
-
-
+, TnyDeviceIface *device
-
-#endif

trunk/libtinymail-camel/tny-session-camel.c

@@ -35 +35 @@
-#include <tny-session-camel.h>
-
+#include <tny-device-iface.h>
-#include <tny-account-store-iface.h>
-#include <tny-store-account.h>
@@ -391 +392 @@
-}
-
+static void
+connection_changed (TnyDeviceIface *device, gboolean online, gpointer user_data)
+{
+        TnySessionCamel *self = user_data;
+
+        g_print ("Going %s\n", online?"ONLINE":"OFFLINE");
+
+        camel_session_set_online ((CamelSession *) self, online); 
+
+        return;
+}
+
-/**
- * tny_session_camel_set_account_store:
- * @self: a #TnySessionCamel object
-the
+A
- *
- *
@@ -427 +440 @@
-
-/**
+ * tny_session_camel_set_device:
+ * @self: a #TnySessionCamel object
+ * @device: a #TnyDeviceIface instance
+ *
+ *
+ **/
+void 
+tny_session_camel_set_device (TnySessionCamel *self, TnyDeviceIface *device)
+{
+
+        if (self->device && g_signal_handler_is_connected (G_OBJECT (self->device), self->connchanged_signal))
+        {
+                g_signal_handler_disconnect (G_OBJECT (device), 
+                        self->connchanged_signal);
+        }
+
+        self->device = device;
+        self->connchanged_signal = 
+                g_signal_connect (G_OBJECT (device), "connection_changed",
+                        G_CALLBACK (connection_changed), self); 
+
+        return;
+}
+
+
+/**
- * tny_session_camel_new:
- * @account_store: A TnyAccountStoreIface instance
+ * @device: a TnyDeviceIface instance
- *
- * Return value: The #TnySessionCamel singleton instance
- **/
-TnySessionCamel*
-
+, TnyDeviceIface *device
-{
-        TnySessionCamel *retval = TNY_SESSION_CAMEL 
@@ -439 +479 @@
-
-        tny_session_camel_set_account_store (retval, account_store);
+        tny_session_camel_set_device (retval, device);
-
-        return retval;
@@ -447 +488 @@
-tny_session_camel_finalise (CamelObject *object)
-{
-
+
+
+
+
+
+
+
+
-        /* CamelObject types don't need parent finalization (build-in camel)
-        (*((CamelObjectClass*)ms_parent_class)->finalise) (object); */

trunk/libtinymail-camel/tny-session-camel.h

@@ -37 +37 @@
-        CamelSession parent_object;
-        gboolean interactive;
+        gpointer device;
+        guint connchanged_signal;
-};
-
@@ -55 +57 @@
-
-void              tny_session_camel_set_account_store (TnySessionCamel *self, TnyAccountStoreIface *account_store);
+void              tny_session_camel_set_device (TnySessionCamel *self, TnyDeviceIface *device);
-
-G_END_DECLS

trunk/libtinymail-gnome-desktop/Makefile.am

@@ -14 +14 @@
-        $(libtinymail_gnome_desktop_1_0_headers) \
-        tny-account-store.c                      \
+        rny-device-priv.h                        \
-        tny-device.c
-

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

@@ -36 +36 @@
-#include <tny-transport-account.h>
-
+#include <tny-device-iface.h>
+#include <tny-device.h>
+
-/* "GConf vs. Camel" account implementation */
-
@@ -534 +537 @@
-        if (G_UNLIKELY (!the_singleton))
-        {
+                TnyDeviceIface *device = tny_device_get_instance ();
-                TnyAccountStorePriv *priv;
-
@@ -541 +545 @@
-                priv = TNY_ACCOUNT_STORE_GET_PRIVATE (object);
-                priv->session = tny_session_camel_new 
-
+, device
-
-                the_singleton = TNY_ACCOUNT_STORE (object);

trunk/libtinymail-gnome-desktop/tny-device.c

@@ +1 @@
+/* libtinymail-camel - The Tiny Mail base library for Camel
+ * Copyright (C) 2006-2007 Philip Van Hoof <pvanhoof@gnome.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with self library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include <tny-device.h>
+
+static GObjectClass *parent_class = NULL;
+
+#include "tny-device-priv.h"
+
+static void
+tny_device_on_online (TnyDeviceIface *self)
+{
+        g_signal_emit (self, tny_device_iface_signals [CONNECTION_CHANGED], 0, TRUE);
+
+        return;
+}
+
+static void
+tny_device_on_offline (TnyDeviceIface *self)
+{
+        g_signal_emit (self, tny_device_iface_signals [CONNECTION_CHANGED], 0, FALSE);
+
+        return;
+}
+
+static void
+tny_device_instance_init (GTypeInstance *instance, gpointer g_class)
+{
+        /* TnyDevice *self = (TnyDevice *)instance;
+        TnyDevicePriv *priv = TNY_DEVICE_GET_PRIVATE (self); */
+
+        return;
+}
+
+
+
+/**
+ * tny_device_get_instance:
+ *
+ *
+ * Return value: The #TnyDeviceIface singleton instance
+ **/
+
+TnyDeviceIface*
+tny_device_get_instance (void)
+{
+        TnyDevice *self = g_object_new (TNY_TYPE_DEVICE, NULL);
+
+        return TNY_DEVICE_IFACE (self);
+}
+
+
+static void
+tny_device_finalize (GObject *object)
+{
+        /* TnyDevice *self = (TnyDevice *)object;       
+        TnyDevicePriv *priv = TNY_DEVICE_GET_PRIVATE (self); */
+
+        (*parent_class->finalize) (object);
+
+        return;
+}
+
+
+static void
+tny_device_iface_init (gpointer g_iface, gpointer iface_data)
+{
+        /* TnyDeviceIfaceClass *klass = (TnyDeviceIfaceClass *)g_iface; */
+
+        return;
+}
+
+
+static TnyDevice *the_singleton = NULL;
+
+static GObject*
+tny_device_constructor (GType type, guint n_construct_params,
+                        GObjectConstructParam *construct_params)
+{
+        GObject *object;
+
+        /* TODO: potential problem: singleton without lock */
+
+        if (G_UNLIKELY (!the_singleton))
+        {
+
+                object = G_OBJECT_CLASS (parent_class)->constructor (type,
+                                n_construct_params, construct_params);
+
+                the_singleton = TNY_DEVICE (object);
+        }
+        else
+        {
+                object = g_object_ref (G_OBJECT (the_singleton));
+                g_object_freeze_notify (G_OBJECT(the_singleton));
+        }
+
+        return object;
+}
+
+
+static void 
+tny_device_class_init (TnyDeviceClass *class)
+{
+        GObjectClass *object_class;
+
+        parent_class = g_type_class_peek_parent (class);
+        object_class = (GObjectClass*) class;
+
+        object_class->finalize = tny_device_finalize;
+        object_class->constructor = tny_device_constructor;
+
+        g_type_class_add_private (object_class, sizeof (TnyDevicePriv));
+
+        return;
+}
+
+GType 
+tny_device_get_type (void)
+{
+        static GType type = 0;
+
+        if (G_UNLIKELY(type == 0))
+        {
+                static const GTypeInfo info = 
+                {
+                  sizeof (TnyDeviceClass),
+                  NULL,   /* base_init */
+                  NULL,   /* base_finalize */
+                  (GClassInitFunc) tny_device_class_init,   /* class_init */
+                  NULL,   /* class_finalize */
+                  NULL,   /* class_data */
+                  sizeof (TnyDevice),
+                  0,      /* n_preallocs */
+                  tny_device_instance_init    /* instance_init */
+                };
+
+                static const GInterfaceInfo tny_device_iface_info = 
+                {
+                  (GInterfaceInitFunc) tny_device_iface_init, /* interface_init */
+                  NULL,         /* interface_finalize */
+                  NULL          /* interface_data */
+                };
+
+                type = g_type_register_static (G_TYPE_OBJECT,
+                        "TnyDevice",
+                        &info, 0);
+
+                g_type_add_interface_static (type, TNY_TYPE_DEVICE_IFACE, 
+                        &tny_device_iface_info);
+
+        }
+
+        return type;
+}

trunk/libtinymail-gnome-desktop/tny-device.h

@@ +1 @@
+#ifndef TNY_DEVICE_H
+#define TNY_DEVICE_H
+
+/* libtinymail-camel - The Tiny Mail base library for Camel
+ * Copyright (C) 2006-2007 Philip Van Hoof <pvanhoof@gnome.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with self library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include <glib.h>
+#include <glib-object.h>
+
+#include <tny-device-iface.h>
+
+G_BEGIN_DECLS
+
+#define TNY_TYPE_DEVICE             (tny_device_get_type ())
+#define TNY_DEVICE(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), TNY_TYPE_DEVICE, TnyDevice))
+#define TNY_DEVICE_CLASS(vtable)    (G_TYPE_CHECK_CLASS_CAST ((vtable), TNY_TYPE_DEVICE, TnyDeviceClass))
+#define TNY_IS_DEVICE(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TNY_TYPE_DEVICE))
+#define TNY_IS_DEVICE_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), TNY_TYPE_DEVICE))
+#define TNY_DEVICE_GET_CLASS(inst)  (G_TYPE_INSTANCE_GET_CLASS ((inst), TNY_TYPE_DEVICE, TnyDeviceClass))
+
+/* This is an abstract type */
+
+typedef struct _TnyDevice TnyDevice;
+typedef struct _TnyDeviceClass TnyDeviceClass;
+
+struct _TnyDevice
+{
+        GObject parent;
+};
+
+struct _TnyDeviceClass 
+{
+        GObjectClass parent;
+};
+
+GType tny_device_get_type (void);
+
+TnyDeviceIface* tny_device_get_instance (void);
+
+G_END_DECLS
+
+#endif
+