aboutsummaryrefslogtreecommitdiffstats
path: root/camel
diff options
context:
space:
mode:
Diffstat (limited to 'camel')
-rw-r--r--camel/ChangeLog4
-rw-r--r--camel/camel-folder.c31
-rw-r--r--camel/camel-folder.h4
3 files changed, 4 insertions, 35 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index effc29b5d2..215486f828 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-17 Jeffrey Stedfast <fejj@ximian.com>
+
+ * camel-folder.c: Reverted previous changes.
+
2001-09-17 JP Rosevear <jpr@ximian.com>
* Makefile.am: Helpful install-exec-hook debugging output
diff --git a/camel/camel-folder.c b/camel/camel-folder.c
index 3bbd8437e6..dc93443c7c 100644
--- a/camel/camel-folder.c
+++ b/camel/camel-folder.c
@@ -108,8 +108,6 @@ static void move_messages_to (CamelFolder *source,
CamelFolder *dest,
CamelException *ex);
-static char *get_uri (CamelFolder *folder);
-
static void freeze (CamelFolder *folder);
static void thaw (CamelFolder *folder);
static gboolean is_frozen (CamelFolder *folder);
@@ -156,7 +154,6 @@ camel_folder_class_init (CamelFolderClass *camel_folder_class)
camel_folder_class->free_message_info = free_message_info;
camel_folder_class->copy_messages_to = copy_messages_to;
camel_folder_class->move_messages_to = move_messages_to;
- camel_folder_class->get_uri = get_uri;
camel_folder_class->freeze = freeze;
camel_folder_class->thaw = thaw;
camel_folder_class->is_frozen = is_frozen;
@@ -1253,34 +1250,6 @@ camel_folder_move_messages_to (CamelFolder *source, GPtrArray *uids,
CAMEL_FOLDER_UNLOCK(source, lock);
}
-
-static char *
-get_uri (CamelFolder *folder)
-{
- /* default implementation */
- CamelService *service = CAMEL_SERVICE (folder->parent_store);
- char *service_url, *url;
-
- service_url = camel_url_to_string (service->url, CAMEL_URL_HIDE_ALL);
- url = g_strdup_printf ("%s/%s", service_url, folder->full_name);
- g_free (service_url);
-
- return url;
-}
-
-
-/**
- * camel_folder_get_uri:
- * @folder:
- *
- * Returns the uri for the given folder.
- **/
-char *
-camel_folder_get_uri (CamelFolder *folder)
-{
- return CF_CLASS (folder)->get_uri (folder);
-}
-
static void
freeze (CamelFolder *folder)
{
diff --git a/camel/camel-folder.h b/camel/camel-folder.h
index b869ee1264..af86a9c5ed 100644
--- a/camel/camel-folder.h
+++ b/camel/camel-folder.h
@@ -151,8 +151,6 @@ typedef struct {
CamelFolder *destination,
CamelException *ex);
- char *(*get_uri) (CamelFolder *folder);
-
void (*freeze) (CamelFolder *folder);
void (*thaw) (CamelFolder *folder);
gboolean (*is_frozen) (CamelFolder *folder);
@@ -269,8 +267,6 @@ void camel_folder_move_messages_to (CamelFolder *source,
CamelFolder *dest,
CamelException *ex);
-char *camel_folder_get_uri (CamelFolder *folder);
-
/* stop/restart getting events */
void camel_folder_freeze (CamelFolder *folder);
void camel_folder_thaw (CamelFolder *folder);