New show toolbar button in editor (fixes NB#152559).

[modest] / src / hildon2 / modest-hildon2-window-mgr.c

diff --git a/src/hildon2/modest-hildon2-window-mgr.c b/src/hildon2/modest-hildon2-window-mgr.c
index 46db0f0..a24f2ad 100644 (file)
--- a/src/hildon2/modest-hildon2-window-mgr.c
+++ b/src/hildon2/modest-hildon2-window-mgr.c
@@ -592,7 +592,13 @@ modest_hildon2_window_mgr_register_window (ModestWindowMgr *self,
        }
 
        /* Show toolbar always */
        }
 
        /* Show toolbar always */

-       modest_window_show_toolbar (window, TRUE);
+       if (MODEST_MSG_EDIT_WINDOW (window)) {
+               gboolean show_toolbar;
+               show_toolbar = modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_EDIT_WINDOW_SHOW_TOOLBAR, NULL);
+               modest_window_show_toolbar (window, show_toolbar);
+       } else {
+               modest_window_show_toolbar (window, TRUE);
+       }

 
        return TRUE;
 fail:
 
        return TRUE;
 fail: