← Back to branch summary

~ubuntu-branches/ubuntu/saucy/evolution-data-server/saucy

« back to all changes in this revision

Viewing changes to camel/camel-imapx-conn-manager.c

  • Committer: Package Import Robot
  • Author(s): Chris Coulson
  • Date: 2012-10-08 12:58:16 UTC
  • mfrom: (181.1.7 quantal)
  • Revision ID: package-import@ubuntu.com-20121008125816-i3n76e8c0m64e7xp
Tags: 3.6.0-0ubuntu2
https://launchpad.net/bugs/1038047
https://launchpad.net/bugs/1038047
* Fix LP: #1038047 part 1 - Don't abort in e_source_registry_new* when a
  problem occurs connecting to the Dbus service
  - add debian/patches/dont-abort-in-e_source_registry_new.patch
  - update debian/patches/series
* Fix LP: #1038047 part 2 - libedataserver depends on
  evolution-data-server-common to ensure that the GSettings schemas are
  present
  - update debian/control

Show diffs side-by-side

added added

removed removed

Lines of Context:
camel/camel-imapx-conn-manager.c
295
295
        link = g_list_find (list, cinfo);
296
296
 
297
297
        if (link != NULL) {
298
 
                list = g_list_remove_link (list, link);
 
298
                list = g_list_delete_link (list, link);
299
299
                connection_info_unref (cinfo);
300
300
                removed = TRUE;
301
301
        }
464
464
                jinfo = camel_imapx_server_get_job_queue_info (is);
465
465
                if (!g_hash_table_lookup (jinfo->folders, old_selected_folder)) {
466
466
                        connection_info_remove_folder_name (cinfo, old_selected_folder);
467
 
                        c(is->tagprefix, "Removed folder %s from connection folder list - select changed \n", old_selected_folder);
 
467
                        c (is->tagprefix, "Removed folder %s from connection folder list - select changed \n", old_selected_folder);
468
468
                }
469
469
                camel_imapx_destroy_job_queue_info (jinfo);
470
470
 
492
492
        /* Caller must be holding CON_WRITE_LOCK. */
493
493
 
494
494
        service = CAMEL_SERVICE (con_man->priv->store);
495
 
        settings = camel_service_get_settings (service);
 
495
 
 
496
        settings = camel_service_ref_settings (service);
496
497
 
497
498
        concurrent_connections =
498
499
                camel_imapx_settings_get_concurrent_connections (
499
500
                CAMEL_IMAPX_SETTINGS (settings));
500
501
 
 
502
        g_object_unref (settings);
 
503
 
501
504
        /* XXX Have a dedicated connection for INBOX ? */
502
505
 
503
506
        list = con_man->priv->connections;
570
573
{
571
574
        CamelIMAPXServer *is = NULL;
572
575
        CamelIMAPXStore *imapx_store;
573
 
        CamelStore *store = con_man->priv->store;
574
576
        ConnectionInfo *cinfo = NULL;
575
577
        gboolean success;
576
578
 
577
579
        /* Caller must be holding CON_WRITE_LOCK. */
578
580
 
579
 
        imapx_store = CAMEL_IMAPX_STORE (store);
 
581
        imapx_store = CAMEL_IMAPX_STORE (con_man->priv->store);
580
582
 
581
583
        /* Check if we got cancelled while we were waiting. */
582
584
        if (g_cancellable_set_error_if_cancelled (cancellable, error))
583
585
                return NULL;
584
586
 
585
 
        is = camel_imapx_server_new (store);
 
587
        is = camel_imapx_server_new (imapx_store);
586
588
 
587
589
        /* XXX As part of the connect operation the CamelIMAPXServer will
588
590
         *     have to call camel_session_authenticate_sync(), but it has
625
627
        con_man->priv->connections = g_list_prepend (
626
628
                con_man->priv->connections, cinfo);
627
629
 
628
 
        c(is->tagprefix, "Created new connection for %s and total connections %d \n", folder_name, g_list_length (con_man->priv->connections));
 
630
        c (is->tagprefix, "Created new connection for %s and total connections %d \n", folder_name, g_list_length (con_man->priv->connections));
629
631
 
630
632
        return is;
631
633
}
715
717
        jinfo = camel_imapx_server_get_job_queue_info (cinfo->is);
716
718
        if (!g_hash_table_lookup (jinfo->folders, folder_name)) {
717
719
                connection_info_remove_folder_name (cinfo, folder_name);
718
 
                c(is->tagprefix, "Removed folder %s from connection folder list - op done \n", folder_name);
 
720
                c (is->tagprefix, "Removed folder %s from connection folder list - op done \n", folder_name);
719
721
        }
720
722
        camel_imapx_destroy_job_queue_info (jinfo);
721
723