diff options
| author | Jeffrey Stedfast <fejj@ximian.com> | 2003-09-17 05:20:50 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2003-09-17 05:20:50 +0800 |
| commit | 1aeb854e50e8f70edd3a1879b627304ddaf1f060 (patch) | |
| tree | 77d787bfae1f2ccae392fae97908c5fa4501c792 | |
| parent | e8c9e32de84fd581b7fdb7584f7f360b8da946b7 (diff) | |
| download | gsoc2013-evolution-1aeb854e50e8f70edd3a1879b627304ddaf1f060.tar.gz gsoc2013-evolution-1aeb854e50e8f70edd3a1879b627304ddaf1f060.tar.zst gsoc2013-evolution-1aeb854e50e8f70edd3a1879b627304ddaf1f060.zip | |
Implement a temp hack so trunk works until we merge in new-ui-branch.
2003-09-16 Jeffrey Stedfast <fejj@ximian.com>
* providers/local/camel-mbox-folder.c
(camel_mbox_folder_get_full_path): Implement a temp hack so trunk
works until we merge in new-ui-branch.
svn path=/trunk/; revision=22594
| -rw-r--r-- | camel/ChangeLog | 4 | ||||
| -rw-r--r-- | camel/providers/local/camel-mbox-folder.c | 25 |
2 files changed, 19 insertions, 10 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index b1f422cf9d..be87be5a29 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,5 +1,9 @@ 2003-09-16 Jeffrey Stedfast <fejj@ximian.com> + * providers/local/camel-mbox-folder.c + (camel_mbox_folder_get_full_path): Implement a temp hack so trunk + works until we merge in new-ui-branch. + * camel-stream-filter.c (do_flush): Don't warning about how we haven't written anything to the stream, this is not an error. fflush() doesn't care if you try to fflush() a stream diff --git a/camel/providers/local/camel-mbox-folder.c b/camel/providers/local/camel-mbox-folder.c index 159ae353d7..3d8b040519 100644 --- a/camel/providers/local/camel-mbox-folder.c +++ b/camel/providers/local/camel-mbox-folder.c @@ -162,18 +162,23 @@ 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); - inptr = full_name; - while (*inptr != '\0') { - while (*inptr != '/' && *inptr != '\0') - *p++ = *inptr++; - - if (*inptr == '/') { - p = g_stpcpy (p, ".sbd/"); - inptr++; + 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++; - /* strip extranaeous '/'s */ - while (*inptr == '/') + if (*inptr == '/') { + p = g_stpcpy (p, ".sbd/"); inptr++; + + /* strip extranaeous '/'s */ + while (*inptr == '/') + inptr++; + } } } |