[evolution-data-server] CamelStoreInfo: Removed unused 'uri' member.



commit 66eeb500b08c36af1e913cd41d9fbab51ae67100
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sun Sep 25 12:29:02 2011 -0400

    CamelStoreInfo: Removed unused 'uri' member.

 camel/camel-store-summary.c                        |    5 -----
 camel/camel-store-summary.h                        |    1 -
 camel/providers/nntp/camel-nntp-store.c            |    7 -------
 docs/reference/camel/tmpl/camel-store-summary.sgml |    1 -
 4 files changed, 0 insertions(+), 14 deletions(-)
---
diff --git a/camel/camel-store-summary.c b/camel/camel-store-summary.c
index 53a55b7..5a90759 100644
--- a/camel/camel-store-summary.c
+++ b/camel/camel-store-summary.c
@@ -203,7 +203,6 @@ store_summary_store_info_free (CamelStoreSummary *summary,
                                CamelStoreInfo *info)
 {
 	g_free (info->path);
-	g_free (info->uri);
 	g_slice_free1 (summary->store_info_size, info);
 }
 
@@ -249,8 +248,6 @@ store_summary_store_info_set_string (CamelStoreSummary *summary,
 		camel_store_summary_lock (summary, CAMEL_STORE_SUMMARY_SUMMARY_LOCK);
 		g_hash_table_remove (summary->folders_path, (gchar *) camel_store_info_path (summary, info));
 		g_free (info->path);
-		g_free (info->uri);
-		info->uri = NULL;
 		info->path = g_strdup (str);
 		g_hash_table_insert (summary->folders_path, (gchar *) camel_store_info_path (summary, info), info);
 		summary->flags |= CAMEL_STORE_SUMMARY_DIRTY;
@@ -270,8 +267,6 @@ store_summary_store_info_set_string (CamelStoreSummary *summary,
 		}
 		g_free (info->path);
 		info->path = v;
-		g_free (info->uri);
-		info->uri = NULL;
 		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;
diff --git a/camel/camel-store-summary.h b/camel/camel-store-summary.h
index 992a66b..7a2babf 100644
--- a/camel/camel-store-summary.h
+++ b/camel/camel-store-summary.h
@@ -70,7 +70,6 @@ enum {
 
 struct _CamelStoreInfo {
 	guint32 refcount;
-	gchar *uri;
 	gchar *path;
 	guint32 flags;
 	guint32 unread;
diff --git a/camel/providers/nntp/camel-nntp-store.c b/camel/providers/nntp/camel-nntp-store.c
index ccb1fd0..444e5d0 100644
--- a/camel/providers/nntp/camel-nntp-store.c
+++ b/camel/providers/nntp/camel-nntp-store.c
@@ -645,14 +645,10 @@ nntp_store_info_update (CamelNNTPStore *store,
                         gchar *line)
 {
 	CamelStoreSummary *summ = (CamelStoreSummary *) store->summary;
-	CamelURL *base_url;
 	CamelNNTPStoreInfo *si, *fsi;
-	CamelURL *url;
 	gchar *relpath, *tmp;
 	guint32 last = 0, first = 0, new = 0;
 
-	base_url = camel_service_get_camel_url (CAMEL_SERVICE (store));
-
 	tmp = strchr (line, ' ');
 	if (tmp)
 		*tmp++ = 0;
@@ -663,9 +659,6 @@ nntp_store_info_update (CamelNNTPStore *store,
 
 		relpath = g_alloca (strlen (line) + 2);
 		sprintf(relpath, "/%s", line);
-		url = camel_url_new_with_base (base_url, relpath);
-		si->info.uri = camel_url_to_string (url, CAMEL_URL_HIDE_ALL);
-		camel_url_free (url);
 
 		si->info.path = g_strdup (line);
 		si->full_name = g_strdup (line); /* why do we keep this? */
diff --git a/docs/reference/camel/tmpl/camel-store-summary.sgml b/docs/reference/camel/tmpl/camel-store-summary.sgml
index 17382ca..c32c874 100644
--- a/docs/reference/camel/tmpl/camel-store-summary.sgml
+++ b/docs/reference/camel/tmpl/camel-store-summary.sgml
@@ -26,7 +26,6 @@ CamelStoreSummary
 </para>
 
 @refcount: 
- uri: 
 @path: 
 @flags: 
 @unread: 



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