From dbfa640e762cef8bfee01012a22d7c9daf45e69e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Daase?= <bjoern@daase.net>
Date: Sat, 28 Mar 2020 12:07:16 +0100
Subject: [PATCH] Composer.Widget: Do not set double dot after 'From' label

We do not set double dots after the other labels so remove it for the
'From' label as well.
Therefore, adjust the .ui file to have the right label (with the
mnemonic underscore) and remove the adjustment of it in code.
---
 src/client/composer/composer-widget.vala | 3 ---
 ui/composer-widget.ui                    | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/client/composer/composer-widget.vala b/src/client/composer/composer-widget.vala
index 6c5c3d59..f59638d1 100644
--- a/src/client/composer/composer-widget.vala
+++ b/src/client/composer/composer-widget.vala
@@ -2496,9 +2496,6 @@ public class Composer.Widget : Gtk.EventBox, Geary.BaseInterface {
 
         this.from_row.visible = true;
         this.from_label.set_mnemonic_widget(this.from_multiple);
-        // Composer label (with mnemonic underscore) for the account selector
-        // when choosing what address to send a message from.
-        this.from_label.set_text_with_mnemonic(_("_From:"));
 
         this.from_multiple.visible = true;
         this.from_multiple.remove_all();
diff --git a/ui/composer-widget.ui b/ui/composer-widget.ui
index be5f37ff..bad90d35 100644
--- a/ui/composer-widget.ui
+++ b/ui/composer-widget.ui
@@ -57,7 +57,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="halign">end</property>
-                            <property name="label" translatable="yes" comments="Geary account mail will be sent from">From</property>
+                            <property name="label" translatable="yes" comments="Geary account mail will be sent from">_From</property>
                             <property name="use_underline">True</property>
                             <property name="justify">right</property>
                             <property name="mnemonic_widget">to_box</property>