[evolution/account-mgmt: 13/25] Temporarily disable the whole email/addressbook integration mess.



commit ac2941e867008d1327f3a379ac82a2d9cceaf487
Author: Matthew Barnes <mbarnes redhat com>
Date:   Wed Dec 8 00:27:23 2010 -0500

    Temporarily disable the whole email/addressbook integration mess.

 mail/em-utils.c |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)
---
diff --git a/mail/em-utils.c b/mail/em-utils.c
index 0753a75..9e48820 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -1573,6 +1573,8 @@ gchar *em_uri_to_camel (const gchar *euri)
 
 /* ********************************************************************** */
 
+#if 0  /* ACCOUNT_MGMT */
+
 /* runs sync, in main thread */
 static gpointer
 emu_addr_setup (gpointer user_data)
@@ -1858,10 +1860,12 @@ search_address_in_addressbooks (const gchar *address, gboolean local_only, gbool
 
 	return found_any;
 }
+#endif /* ACCOUNT_MGMT */
 
 gboolean
 em_utils_in_addressbook (CamelInternetAddress *iaddr, gboolean local_only)
 {
+#if 0  /* ACCOUNT_MGMT */
 	const gchar *addr;
 
 	/* TODO: check all addresses? */
@@ -1869,6 +1873,9 @@ em_utils_in_addressbook (CamelInternetAddress *iaddr, gboolean local_only)
 		return FALSE;
 
 	return search_address_in_addressbooks (addr, local_only, NULL, NULL);
+#endif  /* ACCOUNT_MGMT */
+
+	return FALSE;
 }
 
 static gboolean
@@ -1910,6 +1917,7 @@ static GSList *photos_cache = NULL; /* list of PhotoInfo-s */
 CamelMimePart *
 em_utils_contact_photo (CamelInternetAddress *cia, gboolean local_only)
 {
+#if 0  /* ACCOUNT_MGMT */
 	const gchar *addr = NULL;
 	CamelMimePart *part = NULL;
 	EContactPhoto *photo = NULL;
@@ -1978,6 +1986,9 @@ em_utils_contact_photo (CamelInternetAddress *cia, gboolean local_only)
 	G_UNLOCK (photos_cache);
 
 	return part;
+#endif /* ACCOUNT_MGMT */
+
+	return NULL;
 }
 
 /* list of email addresses (strings) to remove from local cache of photos and contacts,
@@ -1985,6 +1996,7 @@ em_utils_contact_photo (CamelInternetAddress *cia, gboolean local_only)
 void
 emu_remove_from_mail_cache (const GSList *addresses)
 {
+#if 0  /* ACCOUNT_MGMT */
 	const GSList *a;
 	GSList *p;
 	CamelInternetAddress *cia;
@@ -2023,6 +2035,7 @@ emu_remove_from_mail_cache (const GSList *addresses)
 	}
 
 	g_object_unref (cia);
+#endif /* ACCOUNT_MGMT */
 }
 
 void
@@ -2043,6 +2056,7 @@ emu_remove_from_mail_cache_1 (const gchar *address)
 void
 emu_free_mail_cache (void)
 {
+#if 0  /* ACCOUNT_MGMT */
 	G_LOCK (contact_cache);
 
 	if (emu_books_hash) {
@@ -2074,6 +2088,7 @@ emu_free_mail_cache (void)
 	photos_cache = NULL;
 
 	G_UNLOCK (photos_cache);
+#endif /* ACCOUNT_MGMT */
 }
 
 void



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