[evolution] EMailFormatter: Remove "only-local-photos" property.

[Matthew Barnes <mbarnes src gnome org>]

commit 26e1f45bf399a43b407c40af418232425e24e827
Author: Matthew Barnes <mbarnes redhat com>
Date:   Tue Feb 26 17:53:27 2013 -0500

    EMailFormatter: Remove "only-local-photos" property.
    
    EPhotoCache already handles this setting.

 em-format/e-mail-formatter-headers.c         |    8 ++---
 em-format/e-mail-formatter.c                 |   48 --------------------------
 em-format/e-mail-formatter.h                 |    6 ---
 em-format/e-mail-parser-headers.c            |    7 +---
 mail/e-mail-display.c                        |    2 -
 modules/settings/e-settings-mail-formatter.c |    5 ---
 6 files changed, 4 insertions(+), 72 deletions(-)
---
diff --git a/em-format/e-mail-formatter-headers.c b/em-format/e-mail-formatter-headers.c
index af51758..7a3a723 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 c959a24..dc3cb89 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 fd20766..c850969 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 49b7509..900b64c 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);
diff --git a/mail/e-mail-display.c b/mail/e-mail-display.c
index 33f1f1d..29d4d73 100644
--- a/mail/e-mail-display.c
+++ b/mail/e-mail-display.c
@@ -1690,8 +1690,6 @@ e_mail_display_set_mode (EMailDisplay *display,
                        G_CALLBACK (e_mail_display_reload), display,
                "swapped-object-signal::notify::mark-citations",
                        G_CALLBACK (e_mail_display_reload), display,
-               "swapped-object-signal::notify::only-local-photos",
-                       G_CALLBACK (e_mail_display_reload), display,
                "swapped-object-signal::notify::show-sender-photo",
                        G_CALLBACK (e_mail_display_reload), display,
                "swapped-object-signal::notify::show-real-date",
diff --git a/modules/settings/e-settings-mail-formatter.c b/modules/settings/e-settings-mail-formatter.c
index d81d4fb..1efd290 100644
--- a/modules/settings/e-settings-mail-formatter.c
+++ b/modules/settings/e-settings-mail-formatter.c
@@ -136,11 +136,6 @@ settings_mail_formatter_constructed (GObject *object)
                G_BINDING_SYNC_CREATE);
 
        g_object_bind_property (
-               shell_settings, "mail-only-local-photos",
-               formatter, "only-local-photos",
-               G_BINDING_SYNC_CREATE);
-
-       g_object_bind_property (
                shell_settings, "mail-show-sender-photo",
                formatter, "show-sender-photo",
                G_BINDING_SYNC_CREATE);