[evolution-data-server] CamelStoreSummary: Remove unused CAMEL_STORE_INFO_URI.



commit eb02743b137f959d9e3620c20d8be8ed97917c3f
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sun Sep 25 12:08:13 2011 -0400

    CamelStoreSummary: Remove unused CAMEL_STORE_INFO_URI.

 camel/camel-store-summary.c             |   13 -------------
 camel/camel-store-summary.h             |    2 --
 docs/reference/camel/camel-sections.txt |    1 -
 3 files changed, 0 insertions(+), 16 deletions(-)
---
diff --git a/camel/camel-store-summary.c b/camel/camel-store-summary.c
index 1c4678e..ced00f1 100644
--- a/camel/camel-store-summary.c
+++ b/camel/camel-store-summary.c
@@ -227,15 +227,6 @@ store_summary_store_info_string (CamelStoreSummary *summary,
 			return p + 1;
 		else
 			return info->path;
-	case CAMEL_STORE_INFO_URI:
-		if (info->uri == NULL) {
-			CamelURL *uri;
-
-			uri = camel_url_new_with_base (summary->uri_base, info->path);
-			((CamelStoreInfo *) info)->uri = camel_url_to_string (uri, 0);
-			camel_url_free (uri);
-		}
-		return info->uri;
 	}
 
 	return "";
@@ -284,10 +275,6 @@ store_summary_store_info_set_string (CamelStoreSummary *summary,
 		g_hash_table_insert (summary->folders_path, (gchar *) camel_store_info_path (summary, info), info);
 		camel_store_summary_unlock (summary, CAMEL_STORE_SUMMARY_SUMMARY_LOCK);
 		break;
-	case CAMEL_STORE_INFO_URI:
-		g_warning ("Cannot set store info uri, aborting");
-		abort ();
-		break;
 	}
 }
 
diff --git a/camel/camel-store-summary.h b/camel/camel-store-summary.h
index 01f686e..221d9ba 100644
--- a/camel/camel-store-summary.h
+++ b/camel/camel-store-summary.h
@@ -66,7 +66,6 @@ typedef struct _CamelStoreInfo CamelStoreInfo;
 enum {
 	CAMEL_STORE_INFO_PATH = 0,
 	CAMEL_STORE_INFO_NAME,
-	CAMEL_STORE_INFO_URI,
 	CAMEL_STORE_INFO_LAST
 };
 
@@ -184,7 +183,6 @@ void camel_store_info_set_string (CamelStoreSummary *summary, CamelStoreInfo *in
 
 /* helper macro's */
 #define camel_store_info_path(s, i) (camel_store_info_string((CamelStoreSummary *)s, (const CamelStoreInfo *)i, CAMEL_STORE_INFO_PATH))
-#define camel_store_info_uri(s, i) (camel_store_info_string((CamelStoreSummary *)s, (const CamelStoreInfo *)i, CAMEL_STORE_INFO_URI))
 #define camel_store_info_name(s, i) (camel_store_info_string((CamelStoreSummary *)s, (const CamelStoreInfo *)i, CAMEL_STORE_INFO_NAME))
 
 void camel_store_summary_lock   (CamelStoreSummary *summary, CamelStoreSummaryLock lock);
diff --git a/docs/reference/camel/camel-sections.txt b/docs/reference/camel/camel-sections.txt
index da47c76..14d69f3 100644
--- a/docs/reference/camel/camel-sections.txt
+++ b/docs/reference/camel/camel-sections.txt
@@ -2207,7 +2207,6 @@ camel_store_summary_array_free
 camel_store_info_string
 camel_store_info_set_string
 camel_store_info_path
-camel_store_info_uri
 camel_store_info_name
 CamelStoreSummaryLock
 camel_store_summary_lock



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]