← Back to branch summary

~vcs-imports/evolution-data-server/trunk

« back to all changes in this revision

Viewing changes to src/camel/camel-folder-summary.c

  • Committer: Milan Crha
  • Date: 2017-09-25 15:26:09 UTC
  • Revision ID: git-v1:8c482257ed9ac4f33aa5a7232853a89cab1dc8fc
Bug 788051 - Junk messages moved to a real folder are considered seen

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/camel/camel-folder-summary.c
375
375
 
376
376
                is_junk_folder = vtrash && camel_vtrash_folder_get_folder_type (vtrash) == CAMEL_VTRASH_FOLDER_JUNK;
377
377
                is_trash_folder = vtrash && camel_vtrash_folder_get_folder_type (vtrash) == CAMEL_VTRASH_FOLDER_TRASH;
 
378
        } else if (summary->priv->folder) {
 
379
                guint32 folder_flags;
 
380
 
 
381
                folder_flags = camel_folder_get_flags (summary->priv->folder);
 
382
 
 
383
                is_junk_folder = (folder_flags & CAMEL_FOLDER_IS_JUNK) != 0;
 
384
                is_trash_folder = (folder_flags & CAMEL_FOLDER_IS_TRASH) != 0;
378
385
        }
379
386
 
380
387
        if (!(flags & CAMEL_MESSAGE_SEEN))
421
428
 
422
429
        if (unread) {
423
430
                summary->priv->unread_count += unread;
 
431
 
 
432
                if (summary->priv->unread_count < 0)
 
433
                        summary->priv->unread_count = 0;
 
434
 
424
435
                g_object_notify (summary_object, "unread-count");
425
436
                changed = TRUE;
426
437
        }
574
585
 
575
586
                is_junk_folder = vtrash && camel_vtrash_folder_get_folder_type (vtrash) == CAMEL_VTRASH_FOLDER_JUNK;
576
587
                is_trash_folder = vtrash && camel_vtrash_folder_get_folder_type (vtrash) == CAMEL_VTRASH_FOLDER_TRASH;
 
588
        } else if (summary->priv->folder) {
 
589
                guint32 folder_flags;
 
590
 
 
591
                folder_flags = camel_folder_get_flags (summary->priv->folder);
 
592
 
 
593
                is_junk_folder = (folder_flags & CAMEL_FOLDER_IS_JUNK) != 0;
 
594
                is_trash_folder = (folder_flags & CAMEL_FOLDER_IS_TRASH) != 0;
577
595
        }
578
596
 
579
597
        added_flags = new_flags & (~(old_flags & new_flags));