From: Tristan Chabredier <wwp@claws-mail.org>
Date: Tue, 12 Feb 2008 11:38:19 +0000 (+0000)
Subject: 2008-02-12 [wwp]	3.3.0cvs8
X-Git-Tag: rel_3_4_0~79
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=3c75f0d70030390d7079a67943b9d11b17d02e33

2008-02-12 [wwp]	3.3.0cvs8

	* src/folder.h
		Remove duplicate func declaration and restore the one
		a missing one.
---

diff --git a/ChangeLog b/ChangeLog
index 7638c40fb..75a38f34c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-12 [wwp]	3.3.0cvs8
+
+	* src/folder.h
+		Remove duplicate func declaration and restore the one
+		a missing one.
+
 2008-02-12 [wwp]	3.3.0cvs7
 
 	* src/compose.c
diff --git a/PATCHSETS b/PATCHSETS
index 4f63f7d0a..596a3c720 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3221,3 +3221,4 @@
 ( cvs diff -u -r 1.115.2.185 -r 1.115.2.186 src/main.c;  ) > 3.3.0cvs5.patchset
 ( cvs diff -u -r 1.42.2.35 -r 1.42.2.36 po/fr.po;  ) > 3.3.0cvs6.patchset
 ( cvs diff -u -r 1.382.2.436 -r 1.382.2.437 src/compose.c;  cvs diff -u -r 1.8.2.25 -r 1.8.2.26 src/export.c;  cvs diff -u -r 1.213.2.176 -r 1.213.2.177 src/folder.c;  cvs diff -u -r 1.87.2.53 -r 1.87.2.54 src/folder.h;  cvs diff -u -r 1.26.2.34 -r 1.26.2.35 src/foldersel.c;  cvs diff -u -r 1.4.12.5 -r 1.4.12.6 src/foldersel.h;  cvs diff -u -r 1.1.2.53 -r 1.1.2.54 src/imap_gtk.c;  cvs diff -u -r 1.13.2.24 -r 1.13.2.25 src/import.c;  cvs diff -u -r 1.274.2.232 -r 1.274.2.233 src/mainwindow.c;  cvs diff -u -r 1.94.2.170 -r 1.94.2.171 src/messageview.c;  cvs diff -u -r 1.2.2.29 -r 1.2.2.30 src/mh_gtk.c;  cvs diff -u -r 1.105.2.123 -r 1.105.2.124 src/prefs_account.c;  cvs diff -u -r 1.1.4.48 -r 1.1.4.49 src/prefs_filtering_action.c;  cvs diff -u -r 1.395.2.354 -r 1.395.2.355 src/summaryview.c;  cvs diff -u -r 1.1.2.29 -r 1.1.2.30 src/plugins/bogofilter/bogofilter_gtk.c;  cvs diff -u -r 1.23.2.46 -r 1.23.2.47 src/plugins/spamassassin/spamassassin_gtk.c;  ) > 3.3.0cvs7.patchset
+( cvs diff -u -r 1.87.2.54 -r 1.87.2.55 src/folder.h;  ) > 3.3.0cvs8.patchset
diff --git a/configure.ac b/configure.ac
index 5ca3a4d93..5a493ec42 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=3
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=7
+EXTRA_VERSION=8
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/folder.h b/src/folder.h
index 8ea108958..b6947a335 100644
--- a/src/folder.h
+++ b/src/folder.h
@@ -780,7 +780,9 @@ FolderItem *folder_find_item_from_real_path	(const gchar 	*path);
 FolderClass *folder_get_class_from_string	(const gchar 	*str);
 FolderItem *folder_find_child_item_by_name	(FolderItem	*item,
 						 const gchar	*name);
+/* return value is locale charset */
 gchar 	   *folder_get_identifier		(Folder *folder);
+/* return value is locale charset */
 gchar      *folder_item_get_identifier		(FolderItem	*item);
 FolderItem *folder_find_item_from_identifier	(const gchar	*identifier);
 gchar 	   *folder_item_get_name		(FolderItem 	*item);
@@ -799,6 +801,9 @@ FolderItem *folder_get_default_processing (void);
 void folder_set_missing_folders		(void);
 void folder_unref_account_all		(PrefsAccount	*account);
 
+/* return value is locale encoded file name */
+gchar *folder_item_get_path		(FolderItem	*item);
+
 gint   folder_item_open			(FolderItem	*item);
 gint   folder_item_close		(FolderItem	*item);
 gint   folder_item_scan			(FolderItem	*item);
@@ -845,8 +850,6 @@ void 	folder_item_change_msg_flags	(FolderItem 	*item,
 					 MsgPermFlags 	 newflags);
 gboolean folder_item_is_msg_changed	(FolderItem	*item,
 					 MsgInfo	*msginfo);
-/* return value is locale charset */
-gchar * folder_item_get_identifier	(FolderItem * item);
 
 void folder_clean_cache_memory		(FolderItem *protected_item);
 void folder_clean_cache_memory_force	(void);