[evolution/gnome-3-22] Revert "Add a Confirmation option 'prompt-on-composer-mode-switch' into Preferences"

[Milan Crha <mcrha src gnome org>]

commit 596dd9c553845445cc9f25b4cfe17bc44c38e62b
Author: Milan Crha <mcrha redhat com>
Date:   Tue Dec 6 19:18:04 2016 +0100

    Revert "Add a Confirmation option 'prompt-on-composer-mode-switch' into Preferences"
    
    This reverts commit 5b026c8e75714b6ee7cee7c5d4334974d3247abd, because
    it adds a new translatable string, which is not allowed for the stable
    branch.

 mail/mail-config.ui              |   16 ----------------
 modules/mail/em-composer-prefs.c |    6 ------
 2 files changed, 0 insertions(+), 22 deletions(-)
---
diff --git a/mail/mail-config.ui b/mail/mail-config.ui
index 7a54ec1..56f108d 100644
--- a/mail/mail-config.ui
+++ b/mail/mail-config.ui
@@ -1122,22 +1122,6 @@
                     <property name="position">7</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkCheckButton" id="chkPromptComposerModeSwitch">
-                    <property name="label" translatable="yes">Before composer mo_de changes from HTML to 
Plain Text</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
-                    <property name="xalign">0.5</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">8</property>
-                  </packing>
-                </child>
               </object>
             </child>
           </object>
diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c
index 0bc6385..ecdcf40 100644
--- a/modules/mail/em-composer-prefs.c
+++ b/modules/mail/em-composer-prefs.c
@@ -1156,12 +1156,6 @@ em_composer_prefs_construct (EMComposerPrefs *prefs,
                widget, "active",
                G_SETTINGS_BIND_DEFAULT);
 
-       widget = e_builder_get_widget (prefs->builder, "chkPromptComposerModeSwitch");
-       g_settings_bind (
-               settings, "prompt-on-composer-mode-switch",
-               widget, "active",
-               G_SETTINGS_BIND_DEFAULT);
-
        widget = e_builder_get_widget (prefs->builder, "chkAutoSmileys");
        g_settings_bind (
                settings, "composer-magic-smileys",