← Back to branch summary

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

« back to all changes in this revision

Viewing changes to camel/camel-folder.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-folder.c
250
250
        gint i, status = 0;
251
251
        CamelJunkFilter *junk_filter;
252
252
        gboolean synchronize = FALSE;
253
 
        const gchar *full_name;
 
253
        const gchar *display_name;
254
254
 
255
 
        full_name = camel_folder_get_full_name (data->folder);
 
255
        display_name = camel_folder_get_display_name (data->folder);
256
256
        parent_store = camel_folder_get_parent_store (data->folder);
257
257
        junk_filter = camel_session_get_junk_filter (session);
258
258
 
269
269
                        cancellable, ngettext (
270
270
                        "Learning new spam message in '%s'",
271
271
                        "Learning new spam messages in '%s'",
272
 
                        data->junk->len), full_name);
 
272
                        data->junk->len), display_name);
273
273
 
274
274
                for (i = 0; success && i < data->junk->len; i++) {
275
275
                        CamelMimeMessage *message;
309
309
                        cancellable, ngettext (
310
310
                        "Learning new ham message in '%s'",
311
311
                        "Learning new ham messages in '%s'",
312
 
                        data->notjunk->len), full_name);
 
312
                        data->notjunk->len), display_name);
313
313
 
314
314
                for (i = 0; success && i < data->notjunk->len; i++) {
315
315
                        CamelMimeMessage *message;
357
357
                        cancellable, ngettext (
358
358
                        "Filtering new message in '%s'",
359
359
                        "Filtering new messages in '%s'",
360
 
                        data->recents->len), full_name);
 
360
                        data->recents->len), display_name);
361
361
 
362
362
                service = CAMEL_SERVICE (parent_store);
363
363
                store_uid = camel_service_get_uid (service);
373
373
                        if (info == NULL) {
374
374
                                g_warning (
375
375
                                        "uid '%s' vanished from folder '%s'",
376
 
                                        uid, full_name);
 
376
                                        uid, display_name);
377
377
                                continue;
378
378
                        }
379
379
 
1696
1696
 
1697
1697
        if ((folder->folder_flags & (CAMEL_FOLDER_FILTER_RECENT | CAMEL_FOLDER_FILTER_JUNK))
1698
1698
            && p->uid_filter->len > 0)
1699
 
                driver = camel_session_get_filter_driver (session,
1700
 
                                                         (folder->folder_flags & CAMEL_FOLDER_FILTER_RECENT)
1701
 
                                                         ? "incoming":"junktest", NULL);
 
1699
                driver = camel_session_get_filter_driver (
 
1700
                        session,
 
1701
                        (folder->folder_flags & CAMEL_FOLDER_FILTER_RECENT)
 
1702
                        ? "incoming" : "junktest", NULL);
1702
1703
 
1703
1704
        if (driver) {
1704
1705
                recents = g_ptr_array_new ();
3351
3352
                           GError **error)
3352
3353
{
3353
3354
        CamelFolderClass *class;
 
3355
        const gchar *display_name;
 
3356
        const gchar *message;
3354
3357
        gboolean success = TRUE;
3355
3358
 
3356
3359
        g_return_val_if_fail (CAMEL_IS_FOLDER (folder), FALSE);
3366
3369
                return FALSE;
3367
3370
        }
3368
3371
 
 
3372
        message = _("Expunging folder '%s'");
 
3373
        display_name = camel_folder_get_display_name (folder);
 
3374
        camel_operation_push_message (cancellable, message, display_name);
 
3375
 
3369
3376
        if (!(folder->folder_flags & CAMEL_FOLDER_HAS_BEEN_DELETED)) {
3370
3377
                success = class->expunge_sync (folder, cancellable, error);
3371
3378
                CAMEL_CHECK_GERROR (folder, expunge_sync, success, error);
3372
3379
        }
3373
3380
 
 
3381
        camel_operation_pop_message (cancellable);
 
3382
 
3374
3383
        camel_folder_unlock (folder, CAMEL_FOLDER_REC_LOCK);
3375
3384
 
3376
3385
        return success;
3637
3646
        camel_operation_pop_message (cancellable);
3638
3647
 
3639
3648
        if (message != NULL && camel_debug_start (":folder")) {
3640
 
                printf ("CamelFolder:get_message ('%s', '%s') =\n",
 
3649
                printf (
 
3650
                        "CamelFolder:get_message ('%s', '%s') =\n",
3641
3651
                        camel_folder_get_full_name (folder), message_uid);
3642
3652
                camel_mime_message_dump (message, FALSE);
3643
3653
                camel_debug_end ();
3734
3744
{
3735
3745
        CamelFolderClass *class;
3736
3746
        CamelFolderQuotaInfo *quota_info;
 
3747
        const gchar *display_name;
 
3748
        const gchar *message;
3737
3749
 
3738
3750
        g_return_val_if_fail (CAMEL_IS_FOLDER (folder), NULL);
3739
3751
 
3740
3752
        class = CAMEL_FOLDER_GET_CLASS (folder);
3741
3753
        g_return_val_if_fail (class->get_quota_info_sync != NULL, NULL);
3742
3754
 
3743
 
        camel_operation_push_message (
3744
 
                cancellable, _("Retrieving quota information for '%s'"),
3745
 
                camel_folder_get_display_name (folder));
 
3755
        message = _("Retrieving quota information for '%s'");
 
3756
        display_name = camel_folder_get_display_name (folder);
 
3757
        camel_operation_push_message (cancellable, message, display_name);
3746
3758
 
3747
3759
        quota_info = class->get_quota_info_sync (folder, cancellable, error);
3748
3760
        CAMEL_CHECK_GERROR (
3955
3967
                                GError **error)
3956
3968
{
3957
3969
        CamelFolderClass *class;
 
3970
        const gchar *display_name;
 
3971
        const gchar *message;
3958
3972
        gboolean success;
3959
3973
 
3960
3974
        g_return_val_if_fail (CAMEL_IS_FOLDER (folder), FALSE);
3970
3984
                return FALSE;
3971
3985
        }
3972
3986
 
 
3987
        message = _("Refreshing folder '%s'");
 
3988
        display_name = camel_folder_get_display_name (folder);
 
3989
        camel_operation_push_message (cancellable, message, display_name);
 
3990
 
3973
3991
        success = class->refresh_info_sync (folder, cancellable, error);
3974
3992
        CAMEL_CHECK_GERROR (folder, refresh_info_sync, success, error);
3975
3993
 
 
3994
        camel_operation_pop_message (cancellable);
 
3995
 
3976
3996
        camel_folder_unlock (folder, CAMEL_FOLDER_REC_LOCK);
3977
3997
 
3978
3998
        return success;