aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2000-02-25 07:40:39 +0800
committerDan Winship <danw@src.gnome.org>2000-02-25 07:40:39 +0800
commitac659fe698a96a09477a2fdb2b783999f85df501 (patch)
tree3e75748292e9164092450469616fbbc53be243c8
parenta94bccd4e877b212adbbcf12239868760e93dbc7 (diff)
downloadgsoc2013-evolution-ac659fe698a96a09477a2fdb2b783999f85df501.tar
gsoc2013-evolution-ac659fe698a96a09477a2fdb2b783999f85df501.tar.gz
gsoc2013-evolution-ac659fe698a96a09477a2fdb2b783999f85df501.tar.bz2
gsoc2013-evolution-ac659fe698a96a09477a2fdb2b783999f85df501.tar.lz
gsoc2013-evolution-ac659fe698a96a09477a2fdb2b783999f85df501.tar.xz
gsoc2013-evolution-ac659fe698a96a09477a2fdb2b783999f85df501.tar.zst
gsoc2013-evolution-ac659fe698a96a09477a2fdb2b783999f85df501.zip
remove some camel_store_get_separators that I missed before
svn path=/trunk/; revision=1925
-rw-r--r--camel/camel-folder.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/camel/camel-folder.c b/camel/camel-folder.c
index 4b90328919..5097caa295 100644
--- a/camel/camel-folder.c
+++ b/camel/camel-folder.c
@@ -630,7 +630,6 @@ _get_subfolder (CamelFolder *folder,
CamelFolder *new_folder;
gchar *full_name;
const gchar *current_folder_full_name;
- gchar separator;
g_assert (folder->parent_store != NULL);
@@ -638,8 +637,8 @@ _get_subfolder (CamelFolder *folder,
if (camel_exception_get_id (ex)) return NULL;
- separator = camel_store_get_separator (folder->parent_store, ex);
- full_name = g_strdup_printf ("%s%d%s", current_folder_full_name, separator, folder_name);
+ full_name = g_strdup_printf ("%s%c%s", current_folder_full_name,
+ folder->separator, folder_name);
new_folder = camel_store_get_folder (folder->parent_store, full_name, ex);
return new_folder;
@@ -692,7 +691,6 @@ _create (CamelFolder *folder, CamelException *ex)
gchar *prefix;
gchar dich_result;
CamelFolder *parent;
- gchar sep;
g_assert (folder->parent_store != NULL);
g_assert (folder->name != NULL);
@@ -703,7 +701,6 @@ _create (CamelFolder *folder, CamelException *ex)
return TRUE;
- sep = camel_store_get_separator (folder->parent_store, ex);
if (folder->parent_folder) {
camel_folder_create (folder->parent_folder, ex);
if (camel_exception_get_id (ex)) return FALSE;
@@ -711,7 +708,9 @@ _create (CamelFolder *folder, CamelException *ex)
else {
if (folder->full_name) {
dich_result = string_dichotomy (
- folder->full_name, sep, &prefix, NULL,
+ folder->full_name,
+ folder->separator,
+ &prefix, NULL,
STRING_DICHOTOMY_STRIP_TRAILING | STRING_DICHOTOMY_RIGHT_DIR);
if (dich_result!='o') {
if (prefix == NULL) {