Remove camel_folder_get_message_uid, which was not used, and not

	* camel-folder.[ch]: Remove camel_folder_get_message_uid, which
	was not used, and not implemented by any provider.

	* providers/nntp/camel-nntp-folder.c: Remove get_message_uid
	non-implementation.

svn path=/trunk/; revision=4292

4 files changed, 6 insertions, 54 deletions

diff --git a/camel/ChangeLog b/camel/ChangeLog
index 390686a5c7..9e87b1ece4 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,5 +1,11 @@
 2000-07-24  Dan Winship  <danw@helixcode.com>
 
+	* camel-folder.[ch]: Remove camel_folder_get_message_uid, which
+	was not used, and not implemented by any provider.
+
+	* providers/nntp/camel-nntp-folder.c: Remove get_message_uid
+	non-implementation.
+
 	* camel-folder-pt-proxy.[ch], camel-arg-collector.c,
 	camel-marshal-utils.[ch]: Bye bye bye.
 
diff --git a/camel/camel-folder.c b/camel/camel-folder.c
index 0b1b92b982..5b8b87af57 100644
--- a/camel/camel-folder.c
+++ b/camel/camel-folder.c
@@ -109,9 +109,6 @@ static GPtrArray        *get_summary         (CamelFolder *folder,
 					      CamelException *ex);
 static void              free_summary        (CamelFolder *folder,
 					      GPtrArray *array);
-static const gchar      *get_message_uid     (CamelFolder *folder,
-					      CamelMimeMessage *message,
-					      CamelException *ex);
 static CamelMimeMessage *get_message         (CamelFolder *folder,
 					      const gchar *uid,
 					      CamelException *ex);
@@ -174,7 +171,6 @@ camel_folder_class_init (CamelFolderClass *camel_folder_class)
 	camel_folder_class->set_message_flags = set_message_flags;
 	camel_folder_class->get_message_user_flag = get_message_user_flag;
 	camel_folder_class->set_message_user_flag = set_message_user_flag;
-	camel_folder_class->get_message_uid = get_message_uid;
 	camel_folder_class->get_message = get_message;
 	camel_folder_class->delete_message = delete_message;
 	camel_folder_class->get_uids = get_uids;
@@ -838,39 +834,6 @@ camel_folder_has_summary_capability (CamelFolder *folder)
 
 /* UIDs stuff */
 
-static const gchar *
-get_message_uid (CamelFolder *folder, CamelMimeMessage *message,
-		 CamelException *ex)
-{
-	g_warning ("CamelFolder::get_message_uid not implemented for `%s'",
-		   gtk_type_name (GTK_OBJECT_TYPE (folder)));
-	return NULL;
-}
-
-/**
- * camel_folder_get_message_uid:
- * @folder: Folder in which the UID must refer to
- * @message: Message object
- * @ex: a CamelException
- *
- * Return the UID of a message relatively to a folder.
- * A message can have different UID, each one corresponding
- * to a different folder, if the message is referenced in
- * several folders.
- *
- * Return value: The UID of the message in the folder
- **/
-const gchar *
-camel_folder_get_message_uid (CamelFolder *folder, CamelMimeMessage *message,
-			      CamelException *ex)
-{
-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), NULL);
-	g_return_val_if_fail (CAMEL_IS_MIME_MESSAGE (message), NULL);
-
-	return CF_CLASS (folder)->get_message_uid (folder, message, ex);
-}
-
-
 static CamelMimeMessage *
 get_message (CamelFolder *folder, const gchar *uid, CamelException *ex)
 {
diff --git a/camel/camel-folder.h b/camel/camel-folder.h
index 392d4901ff..02808ee6e1 100644
--- a/camel/camel-folder.h
+++ b/camel/camel-folder.h
@@ -134,10 +134,6 @@ typedef struct {
 					   gboolean value,
 					   CamelException *ex);
 
-	const gchar * (*get_message_uid)  (CamelFolder *folder, 
-					   CamelMimeMessage *message, 
-					   CamelException *ex);
-
 	CamelMimeMessage * (*get_message)  (CamelFolder *folder, 
 					    const gchar *uid, 
 					    CamelException *ex);
@@ -275,9 +271,6 @@ void               camel_folder_free_subfolder_names  (CamelFolder *folder,
 
 
 /* uid based access operations */
-const gchar *      camel_folder_get_message_uid       (CamelFolder *folder, 
-						       CamelMimeMessage *message, 
-						       CamelException *ex);
 CamelMimeMessage * camel_folder_get_message           (CamelFolder *folder, 
 						       const gchar *uid, 
 						       CamelException *ex);
diff --git a/camel/providers/nntp/camel-nntp-folder.c b/camel/providers/nntp/camel-nntp-folder.c
index 677af03878..8384327cd9 100644
--- a/camel/providers/nntp/camel-nntp-folder.c
+++ b/camel/providers/nntp/camel-nntp-folder.c
@@ -205,15 +205,6 @@ nntp_folder_set_message_flags (CamelFolder *folder, const char *uid,
 	camel_folder_summary_touch (nntp_folder->summary);
 }
 
-static const gchar*
-nntp_folder_get_message_uid (CamelFolder *folder,
-			     CamelMimeMessage *message,
-			     CamelException *ex)
-{
-	g_assert (0);
-	return NULL;
-}
-
 static CamelMimeMessage *
 nntp_folder_get_message (CamelFolder *folder, const gchar *uid, CamelException *ex)
 {
@@ -412,7 +403,6 @@ camel_nntp_folder_class_init (CamelNNTPFolderClass *camel_nntp_folder_class)
 	camel_folder_class->get_message_count = nntp_folder_get_message_count;
 	camel_folder_class->set_message_flags = nntp_folder_set_message_flags;
 	camel_folder_class->get_message_flags = nntp_folder_get_message_flags;
-	camel_folder_class->get_message_uid = nntp_folder_get_message_uid;
 	camel_folder_class->get_message = nntp_folder_get_message;
 	camel_folder_class->delete_message = nntp_folder_delete_message;
 	camel_folder_class->get_uids = nntp_folder_get_uids;