Commit 0dc252d6 authored by Robert Schroll's avatar Robert Schroll Committed by Jim Nelson

"Cancel" means two things when closing composer: Closes #6830

parent 1dbcd495
......@@ -136,7 +136,7 @@ public class ComposerWindow : Gtk.Window {
private EmailEntry cc_entry;
private EmailEntry bcc_entry;
private Gtk.Entry subject_entry;
private Gtk.Button cancel_button;
private Gtk.Button discard_button;
private Gtk.Button send_button;
private Gtk.ToggleToolButton font_button;
private Gtk.ToggleToolButton font_size_button;
......@@ -188,8 +188,8 @@ public class ComposerWindow : Gtk.Window {
button_area.get_style_context().add_class("content-view");
Gtk.Box box = builder.get_object("composer") as Gtk.Box;
cancel_button = builder.get_object("Cancel") as Gtk.Button;
cancel_button.clicked.connect(on_cancel);
discard_button = builder.get_object("Discard") as Gtk.Button;
discard_button.clicked.connect(on_discard);
send_button = builder.get_object("Send") as Gtk.Button;
send_button.clicked.connect(on_send);
add_attachment_button = builder.get_object("add_attachment_button") as Gtk.Button;
......@@ -626,7 +626,7 @@ public class ComposerWindow : Gtk.Window {
return !should_close();
}
private void on_cancel() {
private void on_discard() {
if (should_close())
destroy();
}
......
......@@ -694,8 +694,8 @@
</packing>
</child>
<child>
<object class="GtkButton" id="Cancel">
<property name="label">gtk-cancel</property>
<object class="GtkButton" id="Discard">
<property name="label">gtk-discard</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment