callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

I#2087 - Composer: Extra separators shown on the toolbar

Browse Source 
Closes https://gitlab.gnome.org/GNOME/evolution/-/issues/2087
This commit is contained in:
Milan Crha
2022-10-19 09:05:40 +02:00
parent 083e9cb567
commit cfbcd0e2e3
2 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/composer/e-composer-private.c
View File

@ -309,21 +309,24 @@ e_composer_private_constructed (EMsgComposer *composer)
gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
if (e_util_get_use_header_bar ()) {
const gchar *items[] = {
"/main-toolbar/pre-main-toolbar/send",
"/main-toolbar/pre-main-toolbar/send-separator",
"/main-toolbar/pre-main-toolbar/save-draft",
"/main-toolbar/pre-main-toolbar/save-draft-separator",
"/main-toolbar/prioritize-message-separator",
"/main-toolbar/toolbar-prioritize-message",
"/main-toolbar/toolbar-request-read-receipt"
};
guint ii;
widget = composer_construct_header_bar (composer, menu_button);
gtk_window_set_titlebar (window, widget);
/* Destroy items from the toolbar, which are in the header bar */
widget = gtk_ui_manager_get_widget (ui_manager, "/main-toolbar/pre-main-toolbar/send");
gtk_widget_destroy (widget);
widget = gtk_ui_manager_get_widget (ui_manager, "/main-toolbar/pre-main-toolbar/save-draft");
gtk_widget_destroy (widget);
widget = gtk_ui_manager_get_widget (ui_manager, "/main-toolbar/toolbar-prioritize-message");
gtk_widget_destroy (widget);
widget = gtk_ui_manager_get_widget (ui_manager, "/main-toolbar/toolbar-request-read-receipt");
gtk_widget_destroy (widget);
for (ii = 0; ii < G_N_ELEMENTS (items); ii++) {
widget = gtk_ui_manager_get_widget (ui_manager, items[ii]);
gtk_widget_destroy (widget);
}
} else {
/* We set the send button as important to have a label */
widget = gtk_ui_manager_get_widget (ui_manager, "/main-toolbar/pre-main-toolbar/send");

6
src/composer/evolution-composer.ui
View File

@ -62,11 +62,11 @@
<toolbar name='main-toolbar'>
<placeholder name='pre-main-toolbar'>
<toolitem action='send'/>
<separator/>
<separator name='send-separator'/>
<toolitem action='save-draft'/>
<separator/>
<separator name='save-draft-separator'/>
</placeholder>
<separator/>
<separator name='prioritize-message-separator'/>
<toolitem action='toolbar-prioritize-message'/>
<toolitem action='toolbar-request-read-receipt'/>
<separator/>