From bf99e3be93172f352708d784748cb498c19506f8 Mon Sep 17 00:00:00 2001 From: Tristan Chabredier Date: Thu, 9 Aug 2007 09:03:54 +0000 Subject: [PATCH 1/1] 2007-08-09 [wwp] 2.10.0cvs108 * src/folder.c Fix tags DB path in Windows (thanks to Colin): '/' is a valid path divider in Windows, but Glib uses '\' as G_DIR_SEPARATOR. --- ChangeLog | 7 +++++++ PATCHSETS | 1 + configure.ac | 2 +- src/folder.c | 7 ++++++- 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 48426953d..869a7481c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-08-09 [wwp] 2.10.0cvs108 + + * src/folder.c + Fix tags DB path in Windows (thanks to Colin): '/' is a valid + path divider in Windows, but Glib uses '\' as G_DIR_SEPARATOR. + + 2007-08-09 [colin] 2.10.0cvs107 * src/folderview.c diff --git a/PATCHSETS b/PATCHSETS index e829a0111..9d1993fb2 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2761,3 +2761,4 @@ ( cvs diff -u -r 1.52.2.46 -r 1.52.2.47 src/prefs_folder_item.c; ) > 2.10.0cvs105.patchset ( cvs diff -u -r 1.105.2.106 -r 1.105.2.107 src/prefs_account.c; ) > 2.10.0cvs106.patchset ( cvs diff -u -r 1.207.2.171 -r 1.207.2.172 src/folderview.c; cvs diff -u -r 1.395.2.317 -r 1.395.2.318 src/summaryview.c; cvs diff -u -r 1.12.2.39 -r 1.12.2.40 src/gtk/prefswindow.c; ) > 2.10.0cvs107.patchset +( cvs diff -u -r 1.213.2.153 -r 1.213.2.154 src/folder.c; ) > 2.10.0cvs108.patchset diff --git a/configure.ac b/configure.ac index c2a52e635..527c05aed 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=10 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=107 +EXTRA_VERSION=108 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/folder.c b/src/folder.c index 4e3eb253b..869cdc716 100644 --- a/src/folder.c +++ b/src/folder.c @@ -3559,7 +3559,12 @@ static gchar *folder_item_get_tags_file(FolderItem *item) identifier = folder_item_get_identifier(item); g_return_val_if_fail(identifier != NULL, NULL); - + +#ifdef G_OS_WIN32 + while (strchr(identifier, '/')) + *strchr(identifier, '/') = '\\'; +#endif + path = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, "tagsdb", G_DIR_SEPARATOR_S, identifier, NULL); -- 2.25.1