diff options
| author | Jeffrey Stedfast <fejj@ximian.com> | 2003-11-15 02:11:11 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2003-11-15 02:11:11 +0800 |
| commit | d182d3473e17421d7eafb2b4817dace196cec757 (patch) | |
| tree | 50190658a40cfdd7db3733cf91c390912274ff8e /camel/providers/local/camel-mbox-folder.c | |
| parent | d9a3bd550f45df85d896a695596e57bb57b1177d (diff) | |
| download | gsoc2013-evolution-d182d3473e17421d7eafb2b4817dace196cec757.tar gsoc2013-evolution-d182d3473e17421d7eafb2b4817dace196cec757.tar.gz gsoc2013-evolution-d182d3473e17421d7eafb2b4817dace196cec757.tar.bz2 gsoc2013-evolution-d182d3473e17421d7eafb2b4817dace196cec757.tar.lz gsoc2013-evolution-d182d3473e17421d7eafb2b4817dace196cec757.tar.xz gsoc2013-evolution-d182d3473e17421d7eafb2b4817dace196cec757.tar.zst gsoc2013-evolution-d182d3473e17421d7eafb2b4817dace196cec757.zip | |
Handle "" as a request for a full dirscan as well (not just NULL). Makes
2003-11-14 Jeffrey Stedfast <fejj@ximian.com>
* providers/local/camel-mbox-store.c (get_folder_info): Handle ""
as a request for a full dirscan as well (not just NULL). Makes it
consistant with other stores.
(scan_dir): Set the fi->flags appropriately.
* providers/local/camel-mbox-folder.c
(camel_mbox_folder_get_full_path): Removed temporary hack.
svn path=/trunk/; revision=23356
Diffstat (limited to 'camel/providers/local/camel-mbox-folder.c')
| -rw-r--r-- | camel/providers/local/camel-mbox-folder.c | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/camel/providers/local/camel-mbox-folder.c b/camel/providers/local/camel-mbox-folder.c index b2a74ef2b8..9c3a7036f2 100644 --- a/camel/providers/local/camel-mbox-folder.c +++ b/camel/providers/local/camel-mbox-folder.c @@ -162,23 +162,18 @@ camel_mbox_folder_get_full_path (const char *toplevel_dir, const char *full_name path = g_malloc (strlen (toplevel_dir) + (inptr - full_name) + (4 * subdirs) + 1); p = g_stpcpy (path, toplevel_dir); - if (strcmp (toplevel_dir, "/") == 0) { - /* FIXME: temporary hack until we merge new-ui-branch into trunk */ - p = g_stpcpy (p, full_name); - } else { - inptr = full_name; - while (*inptr != '\0') { - while (*inptr != '/' && *inptr != '\0') - *p++ = *inptr++; + inptr = full_name; + while (*inptr != '\0') { + while (*inptr != '/' && *inptr != '\0') + *p++ = *inptr++; + + if (*inptr == '/') { + p = g_stpcpy (p, ".sbd/"); + inptr++; - if (*inptr == '/') { - p = g_stpcpy (p, ".sbd/"); + /* strip extranaeous '/'s */ + while (*inptr == '/') inptr++; - - /* strip extranaeous '/'s */ - while (*inptr == '/') - inptr++; - } } } |