[evolution/wip/webkit2] Bug 683695 - Use the same font in the mail vertical view

[Milan Crha <mcrha src gnome org>]

commit f6f2d3a703d7f736599ab99dd6cd76472df701c1
Author: Milan Crha <mcrha redhat com>
Date:   Wed Aug 12 16:09:34 2015 +0200

    Bug 683695 - Use the same font in the mail vertical view

 data/evolution.convert                       |    1 -
 data/org.gnome.evolution.mail.gschema.xml.in |    5 -----
 mail/message-list.c                          |   12 +-----------
 3 files changed, 1 insertions(+), 17 deletions(-)
---
diff --git a/data/evolution.convert b/data/evolution.convert
index 1f72b8e..c434d52 100644
--- a/data/evolution.convert
+++ b/data/evolution.convert
@@ -195,7 +195,6 @@ trash-empty-on-exit = /apps/evolution/mail/trash/empty_on_exit
 trash-empty-on-exit-days = /apps/evolution/mail/trash/empty_on_exit_days
 use-custom-font = /apps/evolution/mail/display/fonts/use_custom
 variable-width-font = /apps/evolution/mail/display/fonts/variable
-vertical-view-fonts = /apps/evolution/mail/display/vertical_view_fonts
 
 [org.gnome.evolution.window:/org/gnome/evolution/mail/browser-window/]
 height = /apps/evolution/mail/mail_browser_height
diff --git a/data/org.gnome.evolution.mail.gschema.xml.in b/data/org.gnome.evolution.mail.gschema.xml.in
index 0865277..56ac0a4 100644
--- a/data/org.gnome.evolution.mail.gschema.xml.in
+++ b/data/org.gnome.evolution.mail.gschema.xml.in
@@ -289,11 +289,6 @@
       <_summary>Sender email-address column in the message list</_summary>
       <_description>Show the email-address of the sender in a separate column in the message 
list.</_description>
     </key>
-    <key name="vertical-view-fonts" type="b">
-      <default>false</default>
-      <_summary>Determines whether to use the same fonts for both "From" and "Subject" lines in the 
"Messages" column in vertical view</_summary>
-      <_description>Determines whether to use the same fonts for both "From" and "Subject" lines in the 
"Messages" column in vertical view.</_description>
-    </key>
     <key name="show-deleted" type="b">
       <default>false</default>
       <_summary>Show deleted messages in the message-list</_summary>
diff --git a/mail/message-list.c b/mail/message-list.c
index b87f63f..e89a865 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -2080,20 +2080,12 @@ static ECell * create_composite_cell (gint col)
 {
        ECell *cell_vbox, *cell_hbox, *cell_sub, *cell_date, *cell_from, *cell_tree, *cell_attach;
        GSettings *settings;
-       gchar *fixed_name = NULL;
        gboolean show_email;
        gint alt_col = (col == COL_FROM) ? COL_SENDER : COL_RECIPIENTS;
-       gboolean same_font = FALSE;
 
        settings = e_util_ref_settings ("org.gnome.evolution.mail");
        show_email = g_settings_get_boolean (settings, "show-email");
-       same_font = g_settings_get_boolean (settings, "vertical-view-fonts");
        g_object_unref (settings);
-       if (!same_font) {
-               settings = e_util_ref_settings ("org.gnome.desktop.interface");
-               fixed_name = g_settings_get_string (settings, "monospace-font-name");
-               g_object_unref (settings);
-       }
 
        cell_vbox = e_cell_vbox_new ();
 
@@ -2126,7 +2118,7 @@ static ECell * create_composite_cell (gint col)
        g_object_unref (cell_attach);
        g_object_unref (cell_date);
 
-       cell_sub = e_cell_text_new (fixed_name? fixed_name : NULL, GTK_JUSTIFY_LEFT);
+       cell_sub = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT);
        g_object_set (
                cell_sub,
                "color_column", COL_COLOUR,
@@ -2142,8 +2134,6 @@ static ECell * create_composite_cell (gint col)
        g_object_set_data (G_OBJECT (cell_vbox), "cell_sub", cell_sub);
        g_object_set_data (G_OBJECT (cell_vbox), "cell_from", cell_from);
 
-       g_free (fixed_name);
-
        return cell_vbox;
 }