← Back to branch summary

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

« back to all changes in this revision

Viewing changes to camel/providers/local/camel-spool-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
https://launchpad.net/bugs/42199
https://launchpad.net/bugs/229669
https://launchpad.net/bugs/173703
https://launchpad.net/bugs/360344
https://launchpad.net/bugs/508494
* 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:
camel/providers/local/camel-spool-store.c
38
38
 
39
39
#include <glib/gi18n-lib.h>
40
40
 
41
 
#include <libedataserver/e-data-server-util.h>
42
 
 
43
41
#include "camel-exception.h"
44
42
#include "camel-file-utils.h"
45
43
#include "camel-private.h"
352
350
                parent = fi;
353
351
        }
354
352
 
355
 
        while ( (d = readdir(dir)) ) {
 
353
        while ((d = readdir(dir))) {
356
354
                if (strcmp(d->d_name, ".") == 0
357
355
                    || strcmp(d->d_name, "..") == 0)
358
356
                        continue;
495
493
        if (root == NULL)
496
494
                return NULL;
497
495
 
498
 
        g_mkdir_with_parents(root, 0777);
 
496
        g_mkdir_with_parents(root, 0700);
499
497
        key = camel_file_util_safe_filename(full_name);
500
498
        path = g_strdup_printf("%s/%s%s", root, key, ext);
501
499
        g_free(key);