EMailFormatter: Remove "only-local-photos" property.

EPhotoCache already handles this setting.

4 files changed, 4 insertions, 65 deletions

diff --git a/em-format/e-mail-formatter-headers.c b/em-format/e-mail-formatter-headers.c
index af51758135..7a3a7232fe 100644
--- a/em-format/e-mail-formatter-headers.c
+++ b/em-format/e-mail-formatter-headers.c
@@ -432,18 +432,16 @@ format_full_headers (EMailFormatter *formatter,
 	g_string_append (buffer, "</table></td>");
 
 	if (photo_name) {
-		gboolean only_local_photo;
 		gchar *name;
 
 		name = g_uri_escape_string (photo_name, NULL, FALSE);
-		only_local_photo = e_mail_formatter_get_only_local_photos (formatter);
 		g_string_append (buffer, "<td align=\"right\" valign=\"top\">");
 
 		g_string_append_printf (
 			buffer,
-			"<img src=\"mail://contact-photo?mailaddr=&only-local-photo=1\" "
-			"data-mailaddr=\"%s\" %s id=\"__evo-contact-photo\"/>",
-			name, only_local_photo ? "data-onlylocal=1" : "");
+			"<img src=\"mail://contact-photo?mailaddr=\" "
+			"data-mailaddr=\"%s\" id=\"__evo-contact-photo\"/>",
+			name);
 		g_string_append (buffer, "</td>");
 
 		g_free (name);
diff --git a/em-format/e-mail-formatter.c b/em-format/e-mail-formatter.c
index c959a24b02..dc3cb89694 100644
--- a/em-format/e-mail-formatter.c
+++ b/em-format/e-mail-formatter.c
@@ -47,7 +47,6 @@ void e_mail_formatter_internal_extensions_load (EMailExtensionRegistry *ereg);
 struct _EMailFormatterPrivate {
 	EMailImageLoadingPolicy image_loading_policy;
 
-	guint only_local_photos	: 1;
 	guint show_sender_photo	: 1;
 	guint show_real_date	: 1;
         guint animate_images    : 1;
@@ -75,7 +74,6 @@ enum {
 	PROP_IMAGE_LOADING_POLICY,
 	PROP_FORCE_IMAGE_LOADING,
 	PROP_MARK_CITATIONS,
-	PROP_ONLY_LOCAL_PHOTOS,
 	PROP_SHOW_SENDER_PHOTO,
 	PROP_SHOW_REAL_DATE,
         PROP_ANIMATE_IMAGES,
@@ -174,12 +172,6 @@ e_mail_formatter_set_property (GObject *object,
 				g_value_get_boolean (value));
 			return;
 
-		case PROP_ONLY_LOCAL_PHOTOS:
-			e_mail_formatter_set_only_local_photos (
-				E_MAIL_FORMATTER (object),
-				g_value_get_boolean (value));
-			return;
-
 		case PROP_SHOW_SENDER_PHOTO:
 			e_mail_formatter_set_show_sender_photo (
 				E_MAIL_FORMATTER (object),
@@ -282,13 +274,6 @@ e_mail_formatter_get_property (GObject *object,
 				E_MAIL_FORMATTER (object)));
 			return;
 
-		case PROP_ONLY_LOCAL_PHOTOS:
-			g_value_set_boolean (
-				value,
-				e_mail_formatter_get_only_local_photos (
-				E_MAIL_FORMATTER (object)));
-			return;
-
 		case PROP_SHOW_SENDER_PHOTO:
 			g_value_set_boolean (
 				value,
@@ -656,17 +641,6 @@ e_mail_formatter_class_init (EMailFormatterClass *class)
 
 	g_object_class_install_property (
 		object_class,
-		PROP_ONLY_LOCAL_PHOTOS,
-		g_param_spec_boolean (
-			"only-local-photos",
-			"Only Local Photos",
-			NULL,
-			TRUE,
-			G_PARAM_READWRITE |
-			G_PARAM_CONSTRUCT));
-
-	g_object_class_install_property (
-		object_class,
 		PROP_SHOW_SENDER_PHOTO,
 		g_param_spec_boolean (
 			"show-sender-photo",
@@ -1242,28 +1216,6 @@ e_mail_formatter_set_mark_citations (EMailFormatter *formatter,
 }
 
 gboolean
-e_mail_formatter_get_only_local_photos (EMailFormatter *formatter)
-{
-	g_return_val_if_fail (E_IS_MAIL_FORMATTER (formatter), FALSE);
-
-	return formatter->priv->only_local_photos;
-}
-
-void
-e_mail_formatter_set_only_local_photos (EMailFormatter *formatter,
-                                        gboolean only_local_photos)
-{
-	g_return_if_fail (E_IS_MAIL_FORMATTER (formatter));
-
-	if (formatter->priv->only_local_photos == only_local_photos)
-		return;
-
-	formatter->priv->only_local_photos = only_local_photos;
-
-	g_object_notify (G_OBJECT (formatter), "only-local-photos");
-}
-
-gboolean
 e_mail_formatter_get_show_sender_photo (EMailFormatter *formatter)
 {
 	g_return_val_if_fail (E_IS_MAIL_FORMATTER (formatter), FALSE);
diff --git a/em-format/e-mail-formatter.h b/em-format/e-mail-formatter.h
index fd207662d5..c85096912e 100644
--- a/em-format/e-mail-formatter.h
+++ b/em-format/e-mail-formatter.h
@@ -198,12 +198,6 @@ void		e_mail_formatter_set_mark_citations
 						(EMailFormatter *formatter,
 						 gboolean mark_citations);
 
-gboolean	e_mail_formatter_get_only_local_photos
-						(EMailFormatter *formatter);
-void		e_mail_formatter_set_only_local_photos
-						(EMailFormatter *formatter,
-						 gboolean only_local_photos);
-
 gboolean	e_mail_formatter_get_show_sender_photo
 						(EMailFormatter *formatter);
 void		e_mail_formatter_set_show_sender_photo
diff --git a/em-format/e-mail-parser-headers.c b/em-format/e-mail-parser-headers.c
index 49b7509484..900b64c35e 100644
--- a/em-format/e-mail-parser-headers.c
+++ b/em-format/e-mail-parser-headers.c
@@ -50,7 +50,6 @@ empe_headers_bind_dom (EMailPart *part,
 	WebKitDOMDocument *document;
 	WebKitDOMElement *photo;
 	gchar *addr, *uri;
-	gboolean only_local;
 
 	document = webkit_dom_node_get_owner_document (WEBKIT_DOM_NODE (element));
 	photo = webkit_dom_document_get_element_by_id (document, "__evo-contact-photo");
@@ -60,11 +59,7 @@ empe_headers_bind_dom (EMailPart *part,
 		return;
 
 	addr = webkit_dom_element_get_attribute (photo, "data-mailaddr");
-	only_local = webkit_dom_element_has_attribute (photo, "data-onlylocal");
-
-	uri = g_strdup_printf (
-		"mail://contact-photo?mailaddr=%s%s",
-		addr, only_local ? "&only-local-photo=1" : "");
+	uri = g_strdup_printf ("mail://contact-photo?mailaddr=%s", addr);
 
 	webkit_dom_html_image_element_set_src (
 		WEBKIT_DOM_HTML_IMAGE_ELEMENT (photo), uri);