~ubuntu-branches/ubuntu/maverick/evolution-data-server/maverick-proposed

« back to all changes in this revision

Viewing changes to camel/providers/local/camel-maildir-store.c

  • Committer: Bazaar Package Importer
  • Author(s): Didier Roche
  • Date: 2010-05-17 17:02:06 UTC
  • mfrom: (1.1.79 upstream) (1.6.12 experimental)
  • Revision ID: james.westby@ubuntu.com-20100517170206-4ufr52vwrhh26yh0
Tags: 2.30.1-1ubuntu1
* Merge from debian experimental. Remaining change:
  (LP: #42199, #229669, #173703, #360344, #508494)
  + debian/control:
    - add Vcs-Bzr tag
    - don't use libgnome
    - Use Breaks instead of Conflicts against evolution 2.25 and earlier.
  + debian/evolution-data-server.install,
    debian/patches/45_libcamel_providers_version.patch:
    - use the upstream versioning, not a Debian-specific one 
  + debian/libedata-book1.2-dev.install, debian/libebackend-1.2-dev.install,
    debian/libcamel1.2-dev.install, debian/libedataserverui1.2-dev.install:
    - install html documentation
  + debian/rules:
    - don't build documentation it's shipped with the tarball

Show diffs side-by-side

added added

removed removed

Lines of Context:
247
247
                        /* for tmp (only), its contents is irrelevant */
248
248
                        dir = opendir(tmp);
249
249
                        if (dir) {
250
 
                                while ( (d=readdir(dir)) ) {
 
250
                                while ((d=readdir(dir))) {
251
251
                                        gchar *name = d->d_name, *file;
252
252
 
253
253
                                        if (!strcmp(name, ".") || !strcmp(name, ".."))
442
442
                        goto fail;
443
443
                }
444
444
 
445
 
                while ( (d = readdir(dir)) ) {
 
445
                while ((d = readdir(dir))) {
446
446
                        if (strcmp(d->d_name, "tmp") == 0
447
447
                            || strcmp(d->d_name, "cur") == 0
448
448
                            || strcmp(d->d_name, "new") == 0