- if (!g_hash_table_lookup_extended (send_queue_cache, account, &orig_key, &send_queue)) {
- send_queue = (gpointer)modest_tny_send_queue_new (TNY_CAMEL_TRANSPORT_ACCOUNT(account));
- g_hash_table_insert (send_queue_cache, account, send_queue);
+ /* Each modest account has its own send queue.
+ * 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) &&
+ create) {
+ /* Note that this send queue will start sending messages from its outbox
+ * as soon as it is instantiated: */
+ 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),
+ send_queue);
+ }