Merge lp:~purejava/pantheon-mail/detach-button-side into lp:~elementary-apps/pantheon-mail/trunk

[Ralph Plawetzki]

Initialize decoration_layout correctly

for details please see linked bug report https://bugs.launchpad.net/pantheon-mail/+bug/1528602

[Ralph Plawetzki (purejava)]

Analyzing the code shows that PillHeaderbar#close_button_at_end() is called in two cases:
- from MainToolbar when composing new e-mail
- from ComposerHeaderbar when replying to / forwarding e-mail

The former call works, as decoration_layout is initialized where the latter fails, as decoration_layout is not initialized.

This fix initializes decoration_layout correctly.
The fix is tested changing the button-layout with elementary-tweaks. Now, the detach button is displayed on the correct side when composing new mail and when replying inline.

=== modified file 'src/client/components/pill-toolbar.vala'
--- src/client/components/pill-toolbar.vala	2015-12-02 18:29:22 +0000
+++ src/client/components/pill-toolbar.vala	2015-12-22 15:16:41 +0000
@@ -97,7 +97,7 @@
     public bool close_button_at_end() {
         string layout;
         bool at_end = false;
-        layout = decoration_layout;
+        layout = Gtk.Settings.get_default().gtk_decoration_layout;
         // Based on logic of close_button_at_end in gtkheaderbar.c: Close button appears
         // at end iff "close" follows a colon in the layout string.
         if (layout != null) {