[evolution-data-server] Remove camel_store_summary_set_uri_base().



commit 4810cb6e4b4b0496e2db1459fea91e3931f6ef0f
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sun Sep 25 12:20:07 2011 -0400

    Remove camel_store_summary_set_uri_base().
    
    Not used for anything.  Unfortunately this alters the size of
    CamelStoreSummary, since 'uri_base' was a public struct member.

 camel/camel-store-summary.c                        |   22 --------------------
 camel/camel-store-summary.h                        |    3 --
 camel/providers/imap/camel-imap-store.c            |    4 ---
 camel/providers/imapx/camel-imapx-store.c          |    3 --
 camel/providers/nntp/camel-nntp-store.c            |    4 ---
 docs/reference/camel/tmpl/camel-store-summary.sgml |   18 ----------------
 docs/reference/camel/tmpl/camel-unused.sgml        |   16 ++++++++++++++
 7 files changed, 16 insertions(+), 54 deletions(-)
---
diff --git a/camel/camel-store-summary.c b/camel/camel-store-summary.c
index ced00f1..53a55b7 100644
--- a/camel/camel-store-summary.c
+++ b/camel/camel-store-summary.c
@@ -355,28 +355,6 @@ camel_store_summary_set_filename (CamelStoreSummary *summary,
 }
 
 /**
- * camel_store_summary_set_uri_base:
- * @summary: a #CamelStoreSummary object
- * @base: a #CamelURL
- *
- * Sets the base URI for the summary.
- **/
-void
-camel_store_summary_set_uri_base (CamelStoreSummary *summary,
-                                  CamelURL *base)
-{
-	g_return_if_fail (CAMEL_IS_STORE_SUMMARY (summary));
-
-	camel_store_summary_lock (summary, CAMEL_STORE_SUMMARY_SUMMARY_LOCK);
-
-	if (summary->uri_base)
-		camel_url_free (summary->uri_base);
-	summary->uri_base = camel_url_new_with_base (base, "");
-
-	camel_store_summary_unlock (summary, CAMEL_STORE_SUMMARY_SUMMARY_LOCK);
-}
-
-/**
  * camel_store_summary_count:
  * @summary: a #CamelStoreSummary object
  *
diff --git a/camel/camel-store-summary.h b/camel/camel-store-summary.h
index 221d9ba..992a66b 100644
--- a/camel/camel-store-summary.h
+++ b/camel/camel-store-summary.h
@@ -32,7 +32,6 @@
 #include <camel/camel-memchunk.h>
 #include <camel/camel-mime-parser.h>
 #include <camel/camel-object.h>
-#include <camel/camel-url.h>
 
 /* Standard GObject macros */
 #define CAMEL_TYPE_STORE_SUMMARY \
@@ -102,7 +101,6 @@ struct _CamelStoreSummary {
 	guint32 flags;		/* flags */
 	guint32 count;		/* how many were saved/loaded */
 	time_t time;		/* timestamp for this summary (for implementors to use) */
-	struct _CamelURL *uri_base;	/* url of base part of summary */
 
 	/* sizes of memory objects */
 	guint32 store_info_size;
@@ -138,7 +136,6 @@ GType			 camel_store_summary_get_type	(void);
 CamelStoreSummary      *camel_store_summary_new	(void);
 
 void camel_store_summary_set_filename (CamelStoreSummary *summary, const gchar *filename);
-void camel_store_summary_set_uri_base (CamelStoreSummary *summary, CamelURL *base);
 
 /* load/save the summary in its entirety */
 gint camel_store_summary_load (CamelStoreSummary *summary);
diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
index c46e575..f8291bb 100644
--- a/camel/providers/imap/camel-imap-store.c
+++ b/camel/providers/imap/camel-imap-store.c
@@ -1189,7 +1189,6 @@ imap_store_initable_init (GInitable *initable,
 	CamelImapStore *imap_store;
 	CamelService *service;
 	CamelSettings *settings;
-	CamelURL *summary_url;
 	CamelURL *url;
 	const gchar *user_data_dir;
 	const gchar *real_path;
@@ -1245,9 +1244,6 @@ imap_store_initable_init (GInitable *initable,
 	sprintf(tmp, "%s/.ev-store-summary", user_data_dir);
 	imap_store->summary = camel_imap_store_summary_new ();
 	camel_store_summary_set_filename ((CamelStoreSummary *) imap_store->summary, tmp);
-	summary_url = camel_url_new (imap_store->base_url, NULL);
-	camel_store_summary_set_uri_base ((CamelStoreSummary *) imap_store->summary, summary_url);
-	camel_url_free (summary_url);
 	if (camel_store_summary_load ((CamelStoreSummary *) imap_store->summary) == 0) {
 		CamelImapStoreSummary *is = imap_store->summary;
 
diff --git a/camel/providers/imapx/camel-imapx-store.c b/camel/providers/imapx/camel-imapx-store.c
index 4bcd552..75faab0 100644
--- a/camel/providers/imapx/camel-imapx-store.c
+++ b/camel/providers/imapx/camel-imapx-store.c
@@ -1538,9 +1538,6 @@ imapx_store_initable_init (GInitable *initable,
 
 	summary = g_build_filename (user_data_dir, ".ev-store-summary", NULL);
 	camel_store_summary_set_filename ((CamelStoreSummary *) store->summary, summary);
-	/* FIXME: need to remove params, passwords, etc */
-	camel_store_summary_set_uri_base (
-		(CamelStoreSummary *) store->summary, url);
 	camel_store_summary_load ((CamelStoreSummary *) store->summary);
 
 	g_free (summary);
diff --git a/camel/providers/nntp/camel-nntp-store.c b/camel/providers/nntp/camel-nntp-store.c
index c702b96..ccb1fd0 100644
--- a/camel/providers/nntp/camel-nntp-store.c
+++ b/camel/providers/nntp/camel-nntp-store.c
@@ -1211,7 +1211,6 @@ nntp_store_initable_init (GInitable *initable,
 {
 	CamelNNTPStore *nntp_store;
 	CamelService *service;
-	CamelURL *summary_url;
 	CamelURL *url;
 	const gchar *user_data_dir;
 	gchar *tmp;
@@ -1234,11 +1233,8 @@ nntp_store_initable_init (GInitable *initable,
 	tmp = g_build_filename (user_data_dir, ".ev-store-summary", NULL);
 	nntp_store->summary = camel_nntp_store_summary_new ();
 	camel_store_summary_set_filename ((CamelStoreSummary *) nntp_store->summary, tmp);
-	summary_url = camel_url_new (nntp_store->base_url, NULL);
-	camel_store_summary_set_uri_base ((CamelStoreSummary *) nntp_store->summary, summary_url);
 	g_free (tmp);
 
-	camel_url_free (summary_url);
 	camel_store_summary_load ((CamelStoreSummary *) nntp_store->summary);
 
 	/* setup store-wide cache */
diff --git a/docs/reference/camel/tmpl/camel-store-summary.sgml b/docs/reference/camel/tmpl/camel-store-summary.sgml
index d4be684..17382ca 100644
--- a/docs/reference/camel/tmpl/camel-store-summary.sgml
+++ b/docs/reference/camel/tmpl/camel-store-summary.sgml
@@ -90,15 +90,6 @@ CamelStoreSummary
 @filename: 
 
 
-<!-- ##### FUNCTION camel_store_summary_set_uri_base ##### -->
-<para>
-
-</para>
-
- summary: 
- base: 
-
-
 <!-- ##### FUNCTION camel_store_summary_load ##### -->
 <para>
 
@@ -303,15 +294,6 @@ CamelStoreSummary
 @i: 
 
 
-<!-- ##### MACRO camel_store_info_uri ##### -->
-<para>
-
-</para>
-
- s: 
- i: 
-
-
 <!-- ##### MACRO camel_store_info_name ##### -->
 <para>
 
diff --git a/docs/reference/camel/tmpl/camel-unused.sgml b/docs/reference/camel/tmpl/camel-unused.sgml
index c3a496e..65d0873 100644
--- a/docs/reference/camel/tmpl/camel-unused.sgml
+++ b/docs/reference/camel/tmpl/camel-unused.sgml
@@ -9105,6 +9105,14 @@ streams
 @error: 
 @Returns: 
 
+<!-- ##### MACRO camel_store_info_uri ##### -->
+<para>
+
+</para>
+
+ s: 
+ i: 
+
 <!-- ##### FUNCTION camel_store_set_filter_inbox ##### -->
 <para>
 
@@ -9146,6 +9154,14 @@ streams
 @error: 
 @Returns: 
 
+<!-- ##### FUNCTION camel_store_summary_set_uri_base ##### -->
+<para>
+
+</para>
+
+ summary: 
+ base: 
+
 <!-- ##### FUNCTION camel_store_supports_subscriptions ##### -->
 <para>
 



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