#include <modest-tny-send-queue.h>
+#include <tny-simple-list.h>
+#include <tny-iterator.h>
+#include <tny-folder.h>
+#include <tny-camel-msg.h>
+#include <modest-tny-account.h>
/* 'private'/'protected' functions */
static void modest_tny_send_queue_class_init (ModestTnySendQueueClass *klass);
-static void modest_tny_send_queue_init (ModestTnySendQueue *obj);
static void modest_tny_send_queue_finalize (GObject *obj);
+static void modest_tny_send_queue_instance_init (GTypeInstance *instance, gpointer g_class);
+
/* list my signals */
enum {
/* MY_SIGNAL_1, */
typedef struct _ModestTnySendQueuePrivate ModestTnySendQueuePrivate;
struct _ModestTnySendQueuePrivate {
- TnyTransportAccount *account;
-
+ TnyCamelTransportAccount *account;
};
#define MODEST_TNY_SEND_QUEUE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
MODEST_TYPE_TNY_SEND_QUEUE, \
ModestTnySendQueuePrivate))
/* globals */
-static TnySendQueueClass *parent_class = NULL;
+static TnyCamelSendQueueClass *parent_class = NULL;
/* uncomment the following if you have defined any signals */
/* static guint signals[LAST_SIGNAL] = {0}; */
-
-static void
-modest_tny_send_queue_cancel (TnySendQueue *self, gboolean remove)
-{
- MODEST_TNY_SENT_QUEUE_GET_CLASS(self)->cancel_func (self, remove);
-}
-
-static void
-modest_tny_send_queue_add (TnySendQueue *self, TnyMsg *msg)
-{
- MODEST_TNY_SENT_QUEUE_GET_CLASS(self)->add_func (self, msg);
-}
+/*
+ * this thread actually tries to send all the mails in the outbox
+ */
static void
-modest_tny_send_queue_get_sentbox (TnySendQueue *self)
+modest_tny_send_queue_cancel (TnySendQueue *self, gboolean remove)
{
- MODEST_TNY_SENT_QUEUE_GET_CLASS(self)->get_sentbox (self);
-}
-
+ g_warning (__FUNCTION__);
-static void
-modest_tny_send_queue_get_outbox (TnySendQueue *self, TnyMsg *msg)
-{
- MODEST_TNY_SENT_QUEUE_GET_CLASS(self)->get_outbox (self);
+ TNY_CAMEL_SEND_QUEUE_CLASS(parent_class)->cancel_func (self, remove);
}
-
-
-
static void
-modest_tny_send_queue_cancel_default (TnySendQueue *self, gboolean remove)
-{
- /* FIXME */
-}
-
-
-static void
-modest_tny_send_queue_add_default (TnySendQueue *self, TnyMsg *msg)
+modest_tny_send_queue_add (TnySendQueue *self, TnyMsg *msg)
{
- ModestTnySendQueuePriv *priv;
+ ModestTnySendQueuePrivate *priv;
+
+ g_return_if_fail (TNY_IS_SEND_QUEUE(self));
+ g_return_if_fail (TNY_IS_CAMEL_MSG(msg));
- g_return_if_fail (self, NULL);
- g_return_if_fail (TNY_IS_CAMEL_MSG(msg), NULL);
+ g_warning (__FUNCTION__);
priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self);
- /* FIXME */
+ /* FIXME: do something smart here... */
+ TNY_CAMEL_SEND_QUEUE_CLASS(parent_class)->add_func (self, msg);
}
-
static TnyFolder*
-modest_tny_send_queue_get_sentbox_default (TnySendQueue *self)
+modest_tny_send_queue_get_sentbox (TnySendQueue *self)
{
- ModestTnySendQueuePriv *priv;
-
+ ModestTnySendQueuePrivate *priv;
+
+ g_warning (__FUNCTION__);
+
g_return_val_if_fail (self, NULL);
priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self);
- return modest_tny_account_get_special_folder (priv->account,
- TNY_FOLDER_TYPE_SENT);
+ return modest_tny_account_get_special_folder (TNY_ACCOUNT(priv->account),
+ TNY_FOLDER_TYPE_SENT);
}
static TnyFolder*
-modest_tny_send_queue_get_outbox_default (TnySendQueue *self)
+modest_tny_send_queue_get_outbox (TnySendQueue *self)
{
- ModestTnySendQueuePriv *priv;
+ ModestTnySendQueuePrivate *priv;
g_return_val_if_fail (self, NULL);
+
+ g_warning (__FUNCTION__);
priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self);
- return modest_tny_account_get_special_folder (priv->account,
+ return modest_tny_account_get_special_folder (TNY_ACCOUNT(priv->account),
TNY_FOLDER_TYPE_OUTBOX);
}
-
-
GType
modest_tny_send_queue_get_type (void)
{
static GType my_type = 0;
- if (!my_type) {
+
+ if (my_type == 0) {
static const GTypeInfo my_info = {
sizeof(ModestTnySendQueueClass),
NULL, /* base init */
NULL, /* class finalize */
NULL, /* class data */
sizeof(ModestTnySendQueue),
- 1, /* n_preallocs */
- (GInstanceInitFunc) modest_tny_send_queue_init,
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) modest_tny_send_queue_instance_init,
NULL
};
- my_type = g_type_register_static (TNY__TYPE__SEND_QUEUE,
- "ModestTnySendQueue",
- &my_info, 0);
+ my_type = g_type_register_static (TNY_TYPE_CAMEL_SEND_QUEUE,
+ "ModestTnySendQueue",
+ &my_info, 0);
}
return my_type;
}
static void
-modest_tny_send_queue_init (gpointer g, gpointer iface_data)
-{
- TnySendQueueIface *klass = (TnySendQueueIface*)g;
-
- klass->add_func = modest_tny_send_queue_add;
- klass->get_outbox_func = modest_tny_send_queue_get_outbox;
- klass->get_sentbox_func = modest_tny_send_queue_get_sentbox;
- klass->cancel_func = modest_tny_send_queue_cancel;
-}
-
-
-
-static void
modest_tny_send_queue_class_init (ModestTnySendQueueClass *klass)
{
GObjectClass *gobject_class;
parent_class = g_type_class_peek_parent (klass);
gobject_class->finalize = modest_tny_send_queue_finalize;
- klass->add_func = modest_tny_send_queue_add_default;
- klass->get_outbox_func = modest_tny_send_queue_get_outbox_default;
- klass->get_sentbox_func = modest_tny_send_queue_get_sentbox_default;
- klass->cancel_func = modest_tny_send_queue_cancel_default;
+ TNY_CAMEL_SEND_QUEUE_CLASS(klass)->add_func = modest_tny_send_queue_add;
+ TNY_CAMEL_SEND_QUEUE_CLASS(klass)->get_outbox_func = modest_tny_send_queue_get_outbox;
+ TNY_CAMEL_SEND_QUEUE_CLASS(klass)->get_sentbox_func = modest_tny_send_queue_get_sentbox;
+ TNY_CAMEL_SEND_QUEUE_CLASS(klass)->cancel_func = modest_tny_send_queue_cancel;
g_type_class_add_private (gobject_class, sizeof(ModestTnySendQueuePrivate));
}
modest_tny_send_queue_instance_init (GTypeInstance *instance, gpointer g_class)
{
ModestTnySendQueue *self;
- ModestTnySendQueuePriv *priv;
+ ModestTnySendQueuePrivate *priv;
self = (ModestTnySendQueue*)instance;
priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self);
static void
modest_tny_send_queue_finalize (GObject *obj)
{
- ModestTnySendQueuePriv *priv;
+ ModestTnySendQueuePrivate *priv;
priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (obj);
if (priv->account) {
g_object_unref (priv->account);
priv->account = NULL;
}
-
+
G_OBJECT_CLASS(parent_class)->finalize (obj);
}
ModestTnySendQueue*
-modest_tny_send_queue_new (TnyTransportAccount *account)
+modest_tny_send_queue_new (TnyCamelTransportAccount *account)
{
ModestTnySendQueue *self;
ModestTnySendQueuePrivate *priv;
- g_return_val_if_fail (account, NULL);
+ g_return_val_if_fail (TNY_IS_CAMEL_TRANSPORT_ACCOUNT(account), NULL);
self = MODEST_TNY_SEND_QUEUE(g_object_new(MODEST_TYPE_TNY_SEND_QUEUE, NULL));
priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self);
projects / modest / blobdiff