}
ModestTnySendQueue*
-modest_runtime_get_send_queue (TnyTransportAccount *account)
+modest_runtime_get_send_queue (TnyTransportAccount *account,
+ gboolean create)
{
ModestCacheMgr *cache_mgr;
GHashTable *send_queue_cache;
- gpointer orig_key, send_queue;
+ gpointer orig_key = NULL, send_queue = NULL;
g_return_val_if_fail (_singletons, NULL);
g_return_val_if_fail (TNY_IS_TRANSPORT_ACCOUNT(account), NULL);
* Note that each modest account will have its own outbox folder,
* returned by TnySendQueue::get_outbox_func().
*/
- if (!g_hash_table_lookup_extended (send_queue_cache, account, &orig_key, &send_queue)) {
+ if (!g_hash_table_lookup_extended (send_queue_cache, account, &orig_key, &send_queue) &&
+ create) {
/* Note that this send queue will start sending messages from its outbox
* as soon as it is instantiated: */
- send_queue = (gpointer)modest_tny_send_queue_new (TNY_CAMEL_TRANSPORT_ACCOUNT(account));
-
- _sig_handlers =
- modest_signal_mgr_connect (_sig_handlers,
- send_queue,
- "error_happened",
- G_CALLBACK (modest_ui_actions_on_send_queue_error_happened),
- NULL);
-
- _sig_handlers =
- modest_signal_mgr_connect (_sig_handlers,
- send_queue,
- "status_changed",
- G_CALLBACK (modest_ui_actions_on_send_queue_status_changed),
- NULL);
-
-
- g_hash_table_insert (send_queue_cache,
- g_object_ref (account),
- g_object_ref (send_queue));
+ send_queue = modest_tny_send_queue_new (TNY_CAMEL_TRANSPORT_ACCOUNT(account));
+
+ if (send_queue) {
+ _sig_handlers =
+ modest_signal_mgr_connect (_sig_handlers,
+ send_queue,
+ "error_happened",
+ G_CALLBACK (modest_ui_actions_on_send_queue_error_happened),
+ NULL);
+
+ _sig_handlers =
+ modest_signal_mgr_connect (_sig_handlers,
+ send_queue,
+ "status_changed",
+ G_CALLBACK (modest_ui_actions_on_send_queue_status_changed),
+ NULL);
+
+ g_hash_table_insert (send_queue_cache,
+ g_object_ref (account),
+ g_object_ref (send_queue));
+ }
}
- return MODEST_TNY_SEND_QUEUE(send_queue);
+ return (send_queue) ? MODEST_TNY_SEND_QUEUE(send_queue) : NULL;
}
void modest_runtime_remove_all_send_queues ()