From 0221743ce0df9c1130c3abeb0cbd7821ccb98a3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corentin=20No=C3=ABl?= Date: Sat, 25 Jan 2025 16:05:39 +0100 Subject: [PATCH] Replace margin-left/right with margin-start/end left-right margins have been replaced by start-end margins. --- .../e-contact-editor-dyntable.c | 4 +- .../gui/widgets/eab-contact-merging.c | 2 +- .../gui/e-comp-editor-page-attachments.c | 4 +- src/e-util/e-attachment-paned.c | 4 +- src/e-util/e-collection-account-wizard.c | 2 +- src/e-util/e-html-editor-cell-dialog.c | 8 ++-- src/e-util/e-html-editor-hrule-dialog.c | 4 +- src/e-util/e-html-editor-image-dialog.c | 6 +-- src/e-util/e-html-editor-page-dialog.c | 6 +-- src/e-util/e-html-editor-paragraph-dialog.c | 4 +- src/e-util/e-html-editor-table-dialog.c | 6 +-- src/e-util/e-proxy-preferences.c | 4 +- src/e-util/e-source-config.c | 2 +- src/e-util/evolution-source-viewer.c | 2 +- src/e-util/test-mail-signatures.c | 4 +- src/mail/e-mail-config-composing-page.c | 18 ++++---- src/mail/e-mail-config-defaults-page.c | 8 ++-- src/mail/e-mail-config-identity-page.c | 14 +++---- src/mail/e-mail-config-provider-page.c | 20 ++++----- src/mail/e-mail-config-security-page.c | 24 +++++------ src/mail/e-mail-config-service-page.c | 4 +- src/mail/e-mail-config-summary-page.c | 14 +++---- src/mail/e-mail-junk-options.c | 2 +- src/mail/em-composer-utils.c | 2 +- src/mail/em-folder-properties.c | 6 +-- src/mail/mail-config.ui | 42 +++++++++---------- src/modules/bogofilter/evolution-bogofilter.c | 2 +- .../calendar/e-calendar-preferences.ui | 4 +- .../e-mail-config-google-summary.c | 6 +-- .../e-mail-config-remote-accounts.c | 6 +-- .../e-mail-config-sendmail-backend.c | 6 +-- .../mail-config/e-mail-config-smtp-backend.c | 6 +-- .../mail-config/e-mail-config-yahoo-summary.c | 4 +- .../spamassassin/evolution-spamassassin.c | 4 +- src/shell/e-shell-searchbar.c | 2 +- src/smime/gui/certificate-manager.c | 2 +- 36 files changed, 129 insertions(+), 129 deletions(-) diff --git a/src/addressbook/gui/contact-editor/e-contact-editor-dyntable.c b/src/addressbook/gui/contact-editor/e-contact-editor-dyntable.c index 52a525e3fa..a96b02fff9 100644 --- a/src/addressbook/gui/contact-editor/e-contact-editor-dyntable.c +++ b/src/addressbook/gui/contact-editor/e-contact-editor-dyntable.c @@ -270,8 +270,8 @@ add_empty_entry (EContactEditorDynTable *dyntable) gtk_widget_show (box); entry = class->widget_create (dyntable); - g_object_set (entry, "margin-left", 2, NULL); - g_object_set (entry, "margin-right", 5, NULL); + g_object_set (entry, "margin-start", 2, NULL); + g_object_set (entry, "margin-end", 5, NULL); gtk_widget_set_hexpand (entry, GTK_EXPAND); gtk_grid_attach (grid, entry, col + 1, row, 1, 1); gtk_widget_show (entry); diff --git a/src/addressbook/gui/widgets/eab-contact-merging.c b/src/addressbook/gui/widgets/eab-contact-merging.c index 5b72067125..671f6fd240 100644 --- a/src/addressbook/gui/widgets/eab-contact-merging.c +++ b/src/addressbook/gui/widgets/eab-contact-merging.c @@ -838,7 +838,7 @@ create_duplicate_contact_detected_dialog (EContact *old_contact, "halign", GTK_ALIGN_START, "vexpand", FALSE, "valign", GTK_ALIGN_START, - "margin-right", 12, + "margin-end", 12, NULL); gtk_container_add (container, widget); diff --git a/src/calendar/gui/e-comp-editor-page-attachments.c b/src/calendar/gui/e-comp-editor-page-attachments.c index 2326e55332..5f13ed7f65 100644 --- a/src/calendar/gui/e-comp-editor-page-attachments.c +++ b/src/calendar/gui/e-comp-editor-page-attachments.c @@ -919,8 +919,8 @@ ecep_attachments_constructed (GObject *object) container = widget; widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); - gtk_widget_set_margin_right (widget, 6); - gtk_widget_set_margin_left (widget, 6); + gtk_widget_set_margin_end (widget, 6); + gtk_widget_set_margin_start (widget, 6); gtk_box_pack_end (GTK_BOX (container), widget, FALSE, FALSE, 0); gtk_widget_show (widget); diff --git a/src/e-util/e-attachment-paned.c b/src/e-util/e-attachment-paned.c index 9c5a2c1e01..341a4a39f3 100644 --- a/src/e-util/e-attachment-paned.c +++ b/src/e-util/e-attachment-paned.c @@ -633,8 +633,8 @@ e_attachment_paned_init (EAttachmentPaned *paned) container = widget; widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); - gtk_widget_set_margin_right (widget, 6); - gtk_widget_set_margin_left (widget, 6); + gtk_widget_set_margin_end (widget, 6); + gtk_widget_set_margin_start (widget, 6); gtk_widget_set_margin_bottom (widget, 6); gtk_box_pack_end (GTK_BOX (container), widget, FALSE, FALSE, 0); paned->priv->controls_container = widget; diff --git a/src/e-util/e-collection-account-wizard.c b/src/e-util/e-collection-account-wizard.c index 7944a79f65..37ce8175cf 100644 --- a/src/e-util/e-collection-account-wizard.c +++ b/src/e-util/e-collection-account-wizard.c @@ -2111,7 +2111,7 @@ collection_account_wizard_constructed (GObject *object) g_free (markup); label = gtk_label_new_with_mnemonic (_("_Name:")); - gtk_widget_set_margin_left (label, 12); + gtk_widget_set_margin_start (label, 12); gtk_label_set_xalign (GTK_LABEL (label), 1.0); gtk_grid_attach (grid, label, 0, 1, 1, 1); gtk_widget_show (label); diff --git a/src/e-util/e-html-editor-cell-dialog.c b/src/e-util/e-html-editor-cell-dialog.c index 7b03f34479..83d6f9aff9 100644 --- a/src/e-util/e-html-editor-cell-dialog.c +++ b/src/e-util/e-html-editor-cell-dialog.c @@ -404,7 +404,7 @@ e_html_editor_cell_dialog_init (EHTMLEditorCellDialog *dialog) gtk_grid_set_row_spacing (grid, 5); gtk_grid_set_column_spacing (grid, 5); gtk_grid_attach (main_layout, GTK_WIDGET (grid), 0, 1, 1, 1); - gtk_widget_set_margin_left (GTK_WIDGET (grid), 10); + gtk_widget_set_margin_start (GTK_WIDGET (grid), 10); /* Scope: cell */ widget = gtk_radio_button_new_with_mnemonic (NULL, _("C_ell")); @@ -455,7 +455,7 @@ e_html_editor_cell_dialog_init (EHTMLEditorCellDialog *dialog) gtk_grid_set_row_spacing (grid, 5); gtk_grid_set_column_spacing (grid, 5); gtk_grid_attach (main_layout, GTK_WIDGET (grid), 0, 3, 1, 1); - gtk_widget_set_margin_left (GTK_WIDGET (grid), 10); + gtk_widget_set_margin_start (GTK_WIDGET (grid), 10); /* Horizontal */ widget = gtk_combo_box_text_new (); @@ -524,7 +524,7 @@ e_html_editor_cell_dialog_init (EHTMLEditorCellDialog *dialog) gtk_grid_set_row_spacing (grid, 5); gtk_grid_set_column_spacing (grid, 5); gtk_grid_attach (main_layout, GTK_WIDGET (grid), 0, 5, 1, 1); - gtk_widget_set_margin_left (GTK_WIDGET (grid), 10); + gtk_widget_set_margin_start (GTK_WIDGET (grid), 10); /* Width */ widget = gtk_check_button_new_with_mnemonic (_("_Width")); @@ -596,7 +596,7 @@ e_html_editor_cell_dialog_init (EHTMLEditorCellDialog *dialog) gtk_grid_set_row_spacing (grid, 5); gtk_grid_set_column_spacing (grid, 5); gtk_grid_attach (main_layout, GTK_WIDGET (grid), 0, 7, 1, 1); - gtk_widget_set_margin_left (GTK_WIDGET (grid), 10); + gtk_widget_set_margin_start (GTK_WIDGET (grid), 10); /* Color */ widget = e_color_combo_new (); diff --git a/src/e-util/e-html-editor-hrule-dialog.c b/src/e-util/e-html-editor-hrule-dialog.c index 57c8ddb81b..ba75881117 100644 --- a/src/e-util/e-html-editor-hrule-dialog.c +++ b/src/e-util/e-html-editor-hrule-dialog.c @@ -236,7 +236,7 @@ e_html_editor_hrule_dialog_init (EHTMLEditorHRuleDialog *dialog) grid = GTK_GRID (gtk_grid_new ()); gtk_grid_set_column_spacing (grid, 5); gtk_grid_set_row_spacing (grid, 5); - gtk_widget_set_margin_left (GTK_WIDGET (grid), 10); + gtk_widget_set_margin_start (GTK_WIDGET (grid), 10); gtk_grid_attach (main_layout, GTK_WIDGET (grid), 0, 1, 1, 1); /* Width */ @@ -288,7 +288,7 @@ e_html_editor_hrule_dialog_init (EHTMLEditorHRuleDialog *dialog) grid = GTK_GRID (gtk_grid_new ()); gtk_grid_set_column_spacing (grid, 5); gtk_grid_set_row_spacing (grid, 5); - gtk_widget_set_margin_left (GTK_WIDGET (grid), 10); + gtk_widget_set_margin_start (GTK_WIDGET (grid), 10); gtk_grid_attach (main_layout, GTK_WIDGET (grid), 0, 3, 1, 1); /* Alignment */ diff --git a/src/e-util/e-html-editor-image-dialog.c b/src/e-util/e-html-editor-image-dialog.c index b9f43d52b7..cd2b30b3ca 100644 --- a/src/e-util/e-html-editor-image-dialog.c +++ b/src/e-util/e-html-editor-image-dialog.c @@ -550,7 +550,7 @@ e_html_editor_image_dialog_init (EHTMLEditorImageDialog *dialog) gtk_grid_set_row_spacing (grid, 5); gtk_grid_set_column_spacing (grid, 5); gtk_grid_attach (main_layout, GTK_WIDGET (grid), 0, 1, 1, 1); - gtk_widget_set_margin_left (GTK_WIDGET (grid), 10); + gtk_widget_set_margin_start (GTK_WIDGET (grid), 10); file_filter = gtk_file_filter_new (); gtk_file_filter_set_name (file_filter, _("Images")); @@ -605,7 +605,7 @@ e_html_editor_image_dialog_init (EHTMLEditorImageDialog *dialog) gtk_grid_set_row_spacing (grid, 5); gtk_grid_set_column_spacing (grid, 5); gtk_grid_attach (main_layout, GTK_WIDGET (grid), 0, 3, 1, 1); - gtk_widget_set_margin_left (GTK_WIDGET (grid), 10); + gtk_widget_set_margin_start (GTK_WIDGET (grid), 10); /* Width */ widget = gtk_spin_button_new_with_range (1, G_MAXUINT, 1); @@ -729,7 +729,7 @@ e_html_editor_image_dialog_init (EHTMLEditorImageDialog *dialog) gtk_grid_set_row_spacing (grid, 5); gtk_grid_set_column_spacing (grid, 5); gtk_grid_attach (main_layout, GTK_WIDGET (grid), 0, 6, 1, 1); - gtk_widget_set_margin_left (GTK_WIDGET (grid), 10); + gtk_widget_set_margin_start (GTK_WIDGET (grid), 10); widget = gtk_entry_new (); gtk_grid_attach (grid, widget, 1 ,0, 1, 1); diff --git a/src/e-util/e-html-editor-page-dialog.c b/src/e-util/e-html-editor-page-dialog.c index 3363bd23c1..0b65e08a7d 100644 --- a/src/e-util/e-html-editor-page-dialog.c +++ b/src/e-util/e-html-editor-page-dialog.c @@ -399,7 +399,7 @@ e_html_editor_page_dialog_init (EHTMLEditorPageDialog *dialog) gtk_grid_set_row_spacing (grid, 5); gtk_grid_set_column_spacing (grid, 5); gtk_grid_attach (main_layout, GTK_WIDGET (grid), 0, 1, 1, 1); - gtk_widget_set_margin_left (GTK_WIDGET (grid), 10); + gtk_widget_set_margin_start (GTK_WIDGET (grid), 10); /* Text */ widget = e_color_combo_new (); @@ -472,7 +472,7 @@ e_html_editor_page_dialog_init (EHTMLEditorPageDialog *dialog) gtk_grid_set_row_spacing (grid, 5); gtk_grid_set_column_spacing (grid, 5); gtk_grid_attach (main_layout, GTK_WIDGET (grid), 0, 3, 1, 1); - gtk_widget_set_margin_left (GTK_WIDGET (grid), 10); + gtk_widget_set_margin_start (GTK_WIDGET (grid), 10); widget = e_html_editor_util_create_font_name_combo (); g_signal_connect_swapped ( @@ -497,7 +497,7 @@ e_html_editor_page_dialog_init (EHTMLEditorPageDialog *dialog) gtk_grid_set_row_spacing (grid, 5); gtk_grid_set_column_spacing (grid, 5); gtk_grid_attach (main_layout, GTK_WIDGET (grid), 0, 5, 1, 1); - gtk_widget_set_margin_left (GTK_WIDGET (grid), 10); + gtk_widget_set_margin_start (GTK_WIDGET (grid), 10); /* Template */ widget = gtk_combo_box_text_new (); diff --git a/src/e-util/e-html-editor-paragraph-dialog.c b/src/e-util/e-html-editor-paragraph-dialog.c index 7cea3c1c3d..9fb85b8962 100644 --- a/src/e-util/e-html-editor-paragraph-dialog.c +++ b/src/e-util/e-html-editor-paragraph-dialog.c @@ -65,7 +65,7 @@ html_editor_paragraph_dialog_constructed (GObject *object) gtk_grid_set_row_spacing (grid, 5); gtk_grid_set_column_spacing (grid, 5); gtk_grid_attach (main_layout, GTK_WIDGET (grid), 0, 1, 1, 1); - gtk_widget_set_margin_left (GTK_WIDGET (grid), 10); + gtk_widget_set_margin_start (GTK_WIDGET (grid), 10); /* Style */ widget = e_action_combo_box_new_with_action (e_html_editor_get_action (editor, "style-normal")); @@ -88,7 +88,7 @@ html_editor_paragraph_dialog_constructed (GObject *object) gtk_grid_set_row_spacing (grid, 5); gtk_grid_set_column_spacing (grid, 5); gtk_grid_attach (main_layout, GTK_WIDGET (grid), 0, 3, 1, 1); - gtk_widget_set_margin_left (GTK_WIDGET (grid), 10); + gtk_widget_set_margin_start (GTK_WIDGET (grid), 10); /* Left */ widget = gtk_toggle_button_new_with_label (_("_Left")); diff --git a/src/e-util/e-html-editor-table-dialog.c b/src/e-util/e-html-editor-table-dialog.c index ec09788095..f98e4dc0b3 100644 --- a/src/e-util/e-html-editor-table-dialog.c +++ b/src/e-util/e-html-editor-table-dialog.c @@ -501,7 +501,7 @@ e_html_editor_table_dialog_init (EHTMLEditorTableDialog *dialog) gtk_grid_set_row_spacing (grid, 5); gtk_grid_set_column_spacing (grid, 5); gtk_grid_attach (main_layout, GTK_WIDGET (grid), 0, 1, 1, 1); - gtk_widget_set_margin_left (GTK_WIDGET (grid), 10); + gtk_widget_set_margin_start (GTK_WIDGET (grid), 10); /* Rows */ widget = gtk_spin_button_new_with_range (1, G_MAXINT, 1); @@ -541,7 +541,7 @@ e_html_editor_table_dialog_init (EHTMLEditorTableDialog *dialog) gtk_grid_set_row_spacing (grid, 5); gtk_grid_set_column_spacing (grid, 5); gtk_grid_attach (main_layout, GTK_WIDGET (grid), 0, 3, 1, 1); - gtk_widget_set_margin_left (GTK_WIDGET (grid), 10); + gtk_widget_set_margin_start (GTK_WIDGET (grid), 10); /* Width */ widget = gtk_check_button_new_with_mnemonic (_("_Width:")); @@ -645,7 +645,7 @@ e_html_editor_table_dialog_init (EHTMLEditorTableDialog *dialog) gtk_grid_set_row_spacing (grid, 5); gtk_grid_set_column_spacing (grid, 5); gtk_grid_attach (main_layout, GTK_WIDGET (grid), 0, 5, 1, 1); - gtk_widget_set_margin_left (GTK_WIDGET (grid), 10); + gtk_widget_set_margin_start (GTK_WIDGET (grid), 10); /* Color */ widget = e_color_combo_new (); diff --git a/src/e-util/e-proxy-preferences.c b/src/e-util/e-proxy-preferences.c index 365658ea8d..485c426a12 100644 --- a/src/e-util/e-proxy-preferences.c +++ b/src/e-util/e-proxy-preferences.c @@ -475,7 +475,7 @@ proxy_preferences_constructed (GObject *object) pango_attr_list_unref (attr_list); widget = e_proxy_editor_new (registry); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_widget_set_valign (widget, GTK_ALIGN_START); gtk_grid_attach (GTK_GRID (container), widget, 1, 1, 1, 1); preferences->priv->proxy_editor = widget; /* do not reference */ @@ -488,7 +488,7 @@ proxy_preferences_constructed (GObject *object) widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); gtk_widget_set_halign (widget, GTK_ALIGN_START); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_widget_set_vexpand (widget, TRUE); gtk_grid_attach (GTK_GRID (container), widget, 1, 2, 1, 1); diff --git a/src/e-util/e-source-config.c b/src/e-util/e-source-config.c index 5ed63c725d..4c5729a39a 100644 --- a/src/e-util/e-source-config.c +++ b/src/e-util/e-source-config.c @@ -1509,7 +1509,7 @@ e_source_config_add_secure_connection_for_webdav (ESourceConfig *config, widget = gtk_button_new_with_mnemonic ( _("Unset _trust for SSL/TLS certificate")); - gtk_widget_set_margin_left (widget, collection_source ? 0 : 24); + gtk_widget_set_margin_start (widget, collection_source ? 0 : 24); e_source_config_insert_widget (config, scratch_source, NULL, widget); gtk_widget_show (widget); diff --git a/src/e-util/evolution-source-viewer.c b/src/e-util/evolution-source-viewer.c index 9e16dad59f..2cba53a3c3 100644 --- a/src/e-util/evolution-source-viewer.c +++ b/src/e-util/evolution-source-viewer.c @@ -740,7 +740,7 @@ source_viewer_constructed (GObject *object) widget = gtk_notebook_new (); gtk_widget_set_margin_top (widget, 3); - gtk_widget_set_margin_right (widget, 3); + gtk_widget_set_margin_end (widget, 3); gtk_widget_set_margin_bottom (widget, 3); /* leave left margin at zero */ gtk_notebook_set_show_tabs (GTK_NOTEBOOK (widget), FALSE); diff --git a/src/e-util/test-mail-signatures.c b/src/e-util/test-mail-signatures.c index e0deae999f..d6ef5dcd5e 100644 --- a/src/e-util/test-mail-signatures.c +++ b/src/e-util/test-mail-signatures.c @@ -145,7 +145,7 @@ main (gint argc, gtk_widget_show (widget); widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0); gtk_widget_show (widget); @@ -189,7 +189,7 @@ main (gint argc, gtk_widget_show (widget); widget = e_mail_signature_manager_new (registry); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0); gtk_widget_show (widget); diff --git a/src/mail/e-mail-config-composing-page.c b/src/mail/e-mail-config-composing-page.c index 5aa29c0bd2..08dbe72b14 100644 --- a/src/mail/e-mail-config-composing-page.c +++ b/src/mail/e-mail-config-composing-page.c @@ -417,7 +417,7 @@ mail_config_composing_page_constructed (GObject *object) text = _("Alway_s carbon-copy (cc) to:"); widget = gtk_label_new_with_mnemonic (text); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_label_set_xalign (GTK_LABEL (widget), 0); gtk_grid_attach (GTK_GRID (container), widget, 0, 1, 2, 1); gtk_widget_show (widget); @@ -426,7 +426,7 @@ mail_config_composing_page_constructed (GObject *object) widget = gtk_entry_new (); gtk_widget_set_hexpand (widget, TRUE); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_label_set_mnemonic_widget (label, widget); gtk_grid_attach (GTK_GRID (container), widget, 0, 2, 2, 1); gtk_widget_show (widget); @@ -442,7 +442,7 @@ mail_config_composing_page_constructed (GObject *object) text = _("Always _blind carbon-copy (bcc) to:"); widget = gtk_label_new_with_mnemonic (text); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_label_set_xalign (GTK_LABEL (widget), 0); gtk_grid_attach (GTK_GRID (container), widget, 0, 3, 2, 1); gtk_widget_show (widget); @@ -451,7 +451,7 @@ mail_config_composing_page_constructed (GObject *object) widget = gtk_entry_new (); gtk_widget_set_hexpand (widget, TRUE); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_label_set_mnemonic_widget (label, widget); gtk_grid_attach (GTK_GRID (container), widget, 0, 4, 2, 1); gtk_widget_show (widget); @@ -468,7 +468,7 @@ mail_config_composing_page_constructed (GObject *object) text = _("Re_ply style:"); widget = gtk_label_new_with_mnemonic (text); gtk_widget_set_hexpand (widget, FALSE); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_label_set_xalign (GTK_LABEL (widget), 0); gtk_grid_attach (GTK_GRID (container), widget, 0, 5, 1, 1); gtk_widget_show (widget); @@ -495,7 +495,7 @@ mail_config_composing_page_constructed (GObject *object) widget = gtk_label_new_with_mnemonic (_("Lang_uage:")); gtk_widget_set_hexpand (widget, FALSE); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_widget_set_tooltip_text (widget, _("Language for Reply and Forward attribution text")); gtk_label_set_xalign (GTK_LABEL (widget), 0); gtk_grid_attach (GTK_GRID (container), widget, 0, 6, 1, 1); @@ -523,14 +523,14 @@ mail_config_composing_page_constructed (GObject *object) gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0); widget = gtk_check_button_new_with_mnemonic (_("Start _typing at the bottom")); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_box_pack_start (GTK_BOX (main_box), widget, FALSE, FALSE, 0); gtk_widget_show (widget); mail_config_composing_page_setup_three_state_value (composition_ext, "start-bottom", widget); widget = gtk_check_button_new_with_mnemonic (_("_Keep signature above the original message")); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_box_pack_start (GTK_BOX (main_box), widget, FALSE, FALSE, 0); gtk_widget_show (widget); @@ -557,7 +557,7 @@ mail_config_composing_page_constructed (GObject *object) text = _("S_end message receipts:"); widget = gtk_label_new_with_mnemonic (text); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_size_group_add_widget (size_group, widget); gtk_label_set_xalign (GTK_LABEL (widget), 1.0); gtk_grid_attach (GTK_GRID (container), widget, 0, 1, 1, 1); diff --git a/src/mail/e-mail-config-defaults-page.c b/src/mail/e-mail-config-defaults-page.c index 116db843a8..fbb3e90d4a 100644 --- a/src/mail/e-mail-config-defaults-page.c +++ b/src/mail/e-mail-config-defaults-page.c @@ -660,7 +660,7 @@ mail_config_defaults_page_constructed (GObject *object) text = _("Draft Messages _Folder:"); widget = gtk_label_new_with_mnemonic (text); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_size_group_add_widget (size_group, widget); gtk_label_set_xalign (GTK_LABEL (widget), 1.0); gtk_grid_attach (GTK_GRID (container), widget, 0, row, 1, 1); @@ -688,7 +688,7 @@ mail_config_defaults_page_constructed (GObject *object) text = _("Sent _Messages Folder:"); widget = gtk_label_new_with_mnemonic (text); gtk_label_set_xalign (GTK_LABEL (widget), 1.0); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_size_group_add_widget (size_group, widget); gtk_grid_attach (GTK_GRID (container), widget, 0, row, 1, 1); gtk_widget_show (widget); @@ -760,7 +760,7 @@ mail_config_defaults_page_constructed (GObject *object) text = _("Archi_ve Folder:"); widget = gtk_label_new_with_mnemonic (text); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_size_group_add_widget (size_group, widget); gtk_label_set_xalign (GTK_LABEL (widget), 1.0); gtk_grid_attach (GTK_GRID (container), widget, 0, row, 1, 1); @@ -786,7 +786,7 @@ mail_config_defaults_page_constructed (GObject *object) text = _("_Templates Folder:"); widget = gtk_label_new_with_mnemonic (text); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_size_group_add_widget (size_group, widget); gtk_label_set_xalign (GTK_LABEL (widget), 1.0); gtk_grid_attach (GTK_GRID (container), widget, 0, row, 1, 1); diff --git a/src/mail/e-mail-config-identity-page.c b/src/mail/e-mail-config-identity-page.c index 35576a9f49..6421349f09 100644 --- a/src/mail/e-mail-config-identity-page.c +++ b/src/mail/e-mail-config-identity-page.c @@ -539,7 +539,7 @@ mail_config_identity_page_constructed (GObject *object) text = _("_Name:"); widget = gtk_label_new_with_mnemonic (text); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_size_group_add_widget (size_group, widget); gtk_label_set_xalign (GTK_LABEL (widget), 1.0); gtk_grid_attach (GTK_GRID (container), widget, 0, 1, 1, 1); @@ -594,7 +594,7 @@ mail_config_identity_page_constructed (GObject *object) text = _("Full Nam_e:"); widget = gtk_label_new_with_mnemonic (text); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_size_group_add_widget (size_group, widget); gtk_label_set_xalign (GTK_LABEL (widget), 1.0); gtk_grid_attach (GTK_GRID (container), widget, 0, 1, 1, 1); @@ -623,7 +623,7 @@ mail_config_identity_page_constructed (GObject *object) text = _("Email _Address:"); widget = gtk_label_new_with_mnemonic (text); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_size_group_add_widget (size_group, widget); gtk_label_set_xalign (GTK_LABEL (widget), 1.0); gtk_grid_attach (GTK_GRID (container), widget, 0, 2, 1, 1); @@ -681,7 +681,7 @@ mail_config_identity_page_constructed (GObject *object) text = _("Re_ply-To:"); widget = gtk_label_new_with_mnemonic (text); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_size_group_add_widget (size_group, widget); gtk_label_set_xalign (GTK_LABEL (widget), 1.0); gtk_grid_attach (GTK_GRID (container), widget, 0, 1, 1, 1); @@ -710,7 +710,7 @@ mail_config_identity_page_constructed (GObject *object) text = _("Or_ganization:"); widget = gtk_label_new_with_mnemonic (text); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_size_group_add_widget (size_group, widget); gtk_label_set_xalign (GTK_LABEL (widget), 1.0); gtk_grid_attach (GTK_GRID (container), widget, 0, 2, 1, 1); @@ -732,7 +732,7 @@ mail_config_identity_page_constructed (GObject *object) text = _("Si_gnature:"); widget = gtk_label_new_with_mnemonic (text); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_size_group_add_widget (size_group, widget); gtk_label_set_xalign (GTK_LABEL (widget), 1.0); gtk_grid_attach (GTK_GRID (container), widget, 0, 3, 1, 1); @@ -778,7 +778,7 @@ mail_config_identity_page_constructed (GObject *object) G_CALLBACK (mail_config_identity_page_add_signature_cb), page); widget = gtk_label_new_with_mnemonic (_("A_liases:")); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_size_group_add_widget (size_group, widget); gtk_label_set_xalign (GTK_LABEL (widget), 1.0); gtk_label_set_yalign (GTK_LABEL (widget), 0); diff --git a/src/mail/e-mail-config-provider-page.c b/src/mail/e-mail-config-provider-page.c index 866aaceb83..d09135a23f 100644 --- a/src/mail/e-mail-config-provider-page.c +++ b/src/mail/e-mail-config-provider-page.c @@ -69,8 +69,8 @@ mail_config_provider_page_handle_dependency (CamelSettings *settings, binding_flags); /* Further indent the widget to show its dependency. */ - margin = gtk_widget_get_margin_left (widget); - gtk_widget_set_margin_left (widget, margin + DEPENDENCY_MARGIN); + margin = gtk_widget_get_margin_start (widget); + gtk_widget_set_margin_start (widget, margin + DEPENDENCY_MARGIN); } static void @@ -109,7 +109,7 @@ mail_config_provider_page_add_checkbox (GtkBox *main_box, g_return_if_fail (entry->text != NULL); widget = gtk_check_button_new_with_mnemonic (entry->text); - gtk_widget_set_margin_left (widget, STANDARD_MARGIN); + gtk_widget_set_margin_start (widget, STANDARD_MARGIN); gtk_box_pack_start (main_box, widget, FALSE, FALSE, 0); gtk_widget_show (widget); @@ -244,7 +244,7 @@ mail_config_provider_page_add_checkspin (GtkBox *main_box, } hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); - gtk_widget_set_margin_left (hbox, STANDARD_MARGIN); + gtk_widget_set_margin_start (hbox, STANDARD_MARGIN); gtk_box_pack_start (main_box, hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); @@ -304,7 +304,7 @@ mail_config_provider_page_add_entry (GtkBox *main_box, hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_box_set_spacing (GTK_BOX (hbox), 6); - gtk_widget_set_margin_left (hbox, STANDARD_MARGIN); + gtk_widget_set_margin_start (hbox, STANDARD_MARGIN); gtk_box_pack_start (main_box, hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); @@ -344,7 +344,7 @@ mail_config_provider_page_add_label (GtkBox *main_box, hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_box_set_spacing (GTK_BOX (hbox), 6); - gtk_widget_set_margin_left (hbox, STANDARD_MARGIN); + gtk_widget_set_margin_start (hbox, STANDARD_MARGIN); gtk_box_pack_start (main_box, hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); @@ -382,7 +382,7 @@ mail_config_provider_page_add_options (GtkBox *main_box, hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_box_set_spacing (GTK_BOX (hbox), 6); - gtk_widget_set_margin_left (hbox, STANDARD_MARGIN); + gtk_widget_set_margin_start (hbox, STANDARD_MARGIN); gtk_box_pack_start (main_box, hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); @@ -454,7 +454,7 @@ mail_config_provider_page_add_placeholder (GtkBox *main_box, hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_widget_set_name (hbox, entry->name); gtk_box_set_spacing (GTK_BOX (hbox), 6); - gtk_widget_set_margin_left (hbox, STANDARD_MARGIN); + gtk_widget_set_margin_start (hbox, STANDARD_MARGIN); gtk_box_pack_start (main_box, hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); @@ -471,7 +471,7 @@ mail_config_provider_page_add_advanced_section (GtkBox *main_box, vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_box_set_spacing (GTK_BOX (vbox), 6); - gtk_widget_set_margin_left (vbox, STANDARD_MARGIN); + gtk_widget_set_margin_start (vbox, STANDARD_MARGIN); gtk_widget_show (vbox); label = entry->text; @@ -651,7 +651,7 @@ mail_config_provider_page_add_widgets (EMailConfigProviderPage *page, g_free (markup); widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); - gtk_widget_set_margin_left (widget, STANDARD_MARGIN); + gtk_widget_set_margin_start (widget, STANDARD_MARGIN); gtk_box_pack_start (main_box, widget, FALSE, FALSE, 0); gtk_widget_show (widget); diff --git a/src/mail/e-mail-config-security-page.c b/src/mail/e-mail-config-security-page.c index e1b51ffb94..fc5c9eb2b7 100644 --- a/src/mail/e-mail-config-security-page.c +++ b/src/mail/e-mail-config-security-page.c @@ -459,7 +459,7 @@ mail_config_security_page_constructed (GObject *object) text = _("_Do not sign meeting requests (for Outlook compatibility)"); widget = gtk_check_button_new_with_mnemonic (text); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_grid_attach (GTK_GRID (container), widget, 0, 1, 1, 1); gtk_widget_show (widget); @@ -491,7 +491,7 @@ mail_config_security_page_constructed (GObject *object) text = _("OpenPGP _Key ID:"); widget = gtk_label_new_with_mnemonic (text); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_size_group_add_widget (size_group, widget); gtk_label_set_xalign (GTK_LABEL (widget), 1.0); gtk_grid_attach (GTK_GRID (container), widget, 0, 1, 1, 1); @@ -524,7 +524,7 @@ mail_config_security_page_constructed (GObject *object) text = _("Si_gning algorithm:"); widget = gtk_label_new_with_mnemonic (text); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_size_group_add_widget (size_group, widget); gtk_label_set_xalign (GTK_LABEL (widget), 1.0); gtk_grid_attach (GTK_GRID (container), widget, 0, 2, 1, 1); @@ -565,7 +565,7 @@ mail_config_security_page_constructed (GObject *object) text = _("Al_ways sign outgoing messages when using this account"); widget = gtk_check_button_new_with_mnemonic (text); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_grid_attach (GTK_GRID (container), widget, 0, 3, 2, 1); gtk_widget_show (widget); @@ -577,7 +577,7 @@ mail_config_security_page_constructed (GObject *object) text = _("Always enc_rypt outgoing messages when using this account"); widget = gtk_check_button_new_with_mnemonic (text); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_grid_attach (GTK_GRID (container), widget, 0, 4, 2, 1); gtk_widget_show (widget); @@ -589,7 +589,7 @@ mail_config_security_page_constructed (GObject *object) text = _("Always encrypt to _myself when sending encrypted messages"); widget = gtk_check_button_new_with_mnemonic (text); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_grid_attach (GTK_GRID (container), widget, 0, 5, 2, 1); gtk_widget_show (widget); @@ -732,7 +732,7 @@ mail_config_security_page_constructed (GObject *object) text = _("Sig_ning certificate:"); widget = gtk_label_new_with_mnemonic (text); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_size_group_add_widget (size_group, widget); gtk_label_set_xalign (GTK_LABEL (widget), 1.0); gtk_grid_attach (GTK_GRID (container), widget, 0, 1, 1, 1); @@ -774,7 +774,7 @@ mail_config_security_page_constructed (GObject *object) text = _("Signing _algorithm:"); widget = gtk_label_new_with_mnemonic (text); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_size_group_add_widget (size_group, widget); gtk_label_set_xalign (GTK_LABEL (widget), 1.0); gtk_grid_attach (GTK_GRID (container), widget, 0, 2, 1, 1); @@ -815,7 +815,7 @@ mail_config_security_page_constructed (GObject *object) text = _("Always sign outgoing messages when using this account"); widget = gtk_check_button_new_with_mnemonic (text); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_grid_attach (GTK_GRID (container), widget, 0, 3, 4, 1); gtk_widget_show (widget); @@ -830,7 +830,7 @@ mail_config_security_page_constructed (GObject *object) text = _("Encryption certificate:"); widget = gtk_label_new_with_mnemonic (text); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_size_group_add_widget (size_group, widget); gtk_label_set_xalign (GTK_LABEL (widget), 1.0); gtk_grid_attach (GTK_GRID (container), widget, 0, 4, 1, 1); @@ -872,7 +872,7 @@ mail_config_security_page_constructed (GObject *object) text = _("Always encrypt outgoing messages when using this account"); widget = gtk_check_button_new_with_mnemonic (text); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_grid_attach (GTK_GRID (container), widget, 0, 5, 4, 1); gtk_widget_show (widget); @@ -884,7 +884,7 @@ mail_config_security_page_constructed (GObject *object) text = _("Always encrypt to myself when sending encrypted messages"); widget = gtk_check_button_new_with_mnemonic (text); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_grid_attach (GTK_GRID (container), widget, 0, 6, 4, 1); gtk_widget_show (widget); diff --git a/src/mail/e-mail-config-service-page.c b/src/mail/e-mail-config-service-page.c index 7a5f8a95c0..3ad04d138b 100644 --- a/src/mail/e-mail-config-service-page.c +++ b/src/mail/e-mail-config-service-page.c @@ -476,7 +476,7 @@ mail_config_service_page_constructed (GObject *object) pango_attr_list_insert (attr_list, attr); widget = gtk_label_new_with_mnemonic (_("Server _Type:")); - gtk_widget_set_margin_right (widget, 12); + gtk_widget_set_margin_end (widget, 12); gtk_label_set_xalign (GTK_LABEL (widget), 1.0); gtk_grid_attach (GTK_GRID (container), widget, 0, 0, 1, 1); gtk_widget_show (widget); @@ -508,7 +508,7 @@ mail_config_service_page_constructed (GObject *object) gtk_widget_show (widget); widget = gtk_label_new (_("Description:")); - gtk_widget_set_margin_right (widget, 12); + gtk_widget_set_margin_end (widget, 12); gtk_label_set_xalign (GTK_LABEL (widget), 1.0); gtk_label_set_yalign (GTK_LABEL (widget), 0); gtk_grid_attach (GTK_GRID (container), widget, 0, 1, 1, 1); diff --git a/src/mail/e-mail-config-summary-page.c b/src/mail/e-mail-config-summary-page.c index 7e01caaaf5..d1e6d52320 100644 --- a/src/mail/e-mail-config-summary-page.c +++ b/src/mail/e-mail-config-summary-page.c @@ -311,7 +311,7 @@ mail_config_summary_page_constructed (GObject *object) text = _("_Name:"); widget = gtk_label_new_with_mnemonic (text); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_label_set_xalign (GTK_LABEL (widget), 1.0); gtk_grid_attach (GTK_GRID (container), widget, 0, 1, 1, 1); gtk_widget_show (widget); @@ -358,7 +358,7 @@ mail_config_summary_page_constructed (GObject *object) text = _("Full Name:"); widget = gtk_label_new (text); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_label_set_xalign (GTK_LABEL (widget), 1.0); gtk_grid_attach (GTK_GRID (container), widget, 0, 1, 1, 1); gtk_widget_show (widget); @@ -372,7 +372,7 @@ mail_config_summary_page_constructed (GObject *object) text = _("Email Address:"); widget = gtk_label_new (text); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_label_set_xalign (GTK_LABEL (widget), 1.0); gtk_grid_attach (GTK_GRID (container), widget, 0, 2, 1, 1); gtk_widget_show (widget); @@ -410,7 +410,7 @@ mail_config_summary_page_constructed (GObject *object) text = _("Server Type:"); widget = gtk_label_new (text); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_label_set_xalign (GTK_LABEL (widget), 1.0); gtk_grid_attach (GTK_GRID (container), widget, 0, 4, 1, 1); gtk_widget_show (widget); @@ -431,7 +431,7 @@ mail_config_summary_page_constructed (GObject *object) text = _("Server:"); widget = gtk_label_new (text); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_label_set_xalign (GTK_LABEL (widget), 1.0); gtk_grid_attach (GTK_GRID (container), widget, 0, 5, 1, 1); gtk_widget_show (widget); @@ -452,7 +452,7 @@ mail_config_summary_page_constructed (GObject *object) text = _("Username:"); widget = gtk_label_new (text); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_label_set_xalign (GTK_LABEL (widget), 1.0); gtk_grid_attach (GTK_GRID (container), widget, 0, 6, 1, 1); gtk_widget_show (widget); @@ -473,7 +473,7 @@ mail_config_summary_page_constructed (GObject *object) text = _("Security:"); widget = gtk_label_new (text); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_label_set_xalign (GTK_LABEL (widget), 1.0); gtk_grid_attach (GTK_GRID (container), widget, 0, 7, 1, 1); gtk_widget_show (widget); diff --git a/src/mail/e-mail-junk-options.c b/src/mail/e-mail-junk-options.c index ae0c66342d..f00d3a261c 100644 --- a/src/mail/e-mail-junk-options.c +++ b/src/mail/e-mail-junk-options.c @@ -276,7 +276,7 @@ mail_junk_options_constructed (GObject *object) widget = gtk_label_new (_("Junk filtering software:")); gtk_label_set_xalign (GTK_LABEL (widget), 0); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_grid_attach (GTK_GRID (object), widget, 0, 0, 1, 1); self->priv->label = widget; /* not referenced */ gtk_widget_show (widget); diff --git a/src/mail/em-composer-utils.c b/src/mail/em-composer-utils.c index 2637d5e359..272baff883 100644 --- a/src/mail/em-composer-utils.c +++ b/src/mail/em-composer-utils.c @@ -4544,7 +4544,7 @@ em_utils_reply_alternative (GtkWindow *parent, gtk_box_pack_start (vbox, GTK_WIDGET (grid), TRUE, TRUE, 0); #define add_with_indent(x, _cols) \ - gtk_widget_set_margin_left (GTK_WIDGET (x), 12); \ + gtk_widget_set_margin_start (GTK_WIDGET (x), 12); \ gtk_grid_attach (grid, GTK_WIDGET (x), 0, row, (_cols), 1); \ row++; diff --git a/src/mail/em-folder-properties.c b/src/mail/em-folder-properties.c index ef85148ec3..2fcbe5cafe 100644 --- a/src/mail/em-folder-properties.c +++ b/src/mail/em-folder-properties.c @@ -733,7 +733,7 @@ emfp_get_folder_item (EConfig *ec, "allow-aliases", TRUE, NULL); gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_widget_show (widget); gtk_table_attach ( GTK_TABLE (table), widget, @@ -965,7 +965,7 @@ emfp_get_autoarchive_item (EConfig *ec, NULL); label = gtk_label_new (""); - g_object_set (G_OBJECT (label), "margin-left", 12, NULL); + g_object_set (G_OBJECT (label), "margin-start", 12, NULL); gtk_grid_attach (grid, label, 0, 1, 1, 3); /* Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]" */ @@ -1401,7 +1401,7 @@ emfp_get_labels_item (EConfig *ec, widget = gtk_button_box_new (GTK_ORIENTATION_VERTICAL); gtk_button_box_set_layout (GTK_BUTTON_BOX (widget), GTK_BUTTONBOX_START); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_grid_attach (grid, widget, 1, 0, 1, 1); add_btn = e_dialog_button_new_with_icon ("list-add", _("_Add")); diff --git a/src/mail/mail-config.ui b/src/mail/mail-config.ui index 26e99e5977..163053978f 100644 --- a/src/mail/mail-config.ui +++ b/src/mail/mail-config.ui @@ -1397,8 +1397,8 @@ True False - 12 - 6 + 12 + 6 6 6 True @@ -1421,8 +1421,8 @@ True False - 30 - 30 + 30 + 30 2 center @@ -1494,8 +1494,8 @@ True False - 6 - 6 + 6 + 6 Use for Folders @@ -1509,8 +1509,8 @@ True False - 6 - 6 + 6 + 6 6 6 True @@ -1618,8 +1618,8 @@ True False - 6 - 6 + 6 + 6 Use for Recipients @@ -1633,8 +1633,8 @@ True False - 12 - 6 + 12 + 6 6 6 True @@ -1674,8 +1674,8 @@ True False - 6 - 6 + 6 + 6 Account @@ -1707,8 +1707,8 @@ True False - 12 - 6 + 12 + 6 6 6 Assign which account should be used as a send account for respective folders or recipients, an override for usual send account detection. List of recipients can contain partial addresses or names. The name and the address parts are compared separately. @@ -1727,7 +1727,7 @@ True True False - 12 + 12 True 0 True @@ -2773,7 +2773,7 @@ True False - 12 + 12 True True top @@ -2873,8 +2873,8 @@ True False - 2 - 2 + 2 + 2 False @@ -3172,7 +3172,7 @@ True 0 True - 12 + 12 False diff --git a/src/modules/bogofilter/evolution-bogofilter.c b/src/modules/bogofilter/evolution-bogofilter.c index 0c2e74f44b..1b5642a629 100644 --- a/src/modules/bogofilter/evolution-bogofilter.c +++ b/src/modules/bogofilter/evolution-bogofilter.c @@ -377,7 +377,7 @@ bogofilter_new_config_widget (EMailJunkFilter *junk_filter) widget = gtk_check_button_new_with_mnemonic ( _("Convert message text to _Unicode")); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_box_pack_start (GTK_BOX (box), widget, FALSE, FALSE, 0); gtk_widget_show (widget); diff --git a/src/modules/calendar/e-calendar-preferences.ui b/src/modules/calendar/e-calendar-preferences.ui index d209784dfc..96f6f100f0 100644 --- a/src/modules/calendar/e-calendar-preferences.ui +++ b/src/modules/calendar/e-calendar-preferences.ui @@ -821,7 +821,7 @@ True True False - 12 + 12 True True @@ -837,7 +837,7 @@ True True False - 12 + 12 True True diff --git a/src/modules/mail-config/e-mail-config-google-summary.c b/src/modules/mail-config/e-mail-config-google-summary.c index 8044498359..132411516e 100644 --- a/src/modules/mail-config/e-mail-config-google-summary.c +++ b/src/modules/mail-config/e-mail-config-google-summary.c @@ -298,7 +298,7 @@ mail_config_google_summary_constructed (GObject *object) text = _("Add Ca_lendar to this account"); widget = gtk_check_button_new_with_mnemonic (text); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_grid_attach (GTK_GRID (container), widget, 0, 1, 1, 1); extension->priv->calendar_toggle = widget; /* not referenced */ gtk_widget_show (widget); @@ -307,7 +307,7 @@ mail_config_google_summary_constructed (GObject *object) text = _("Add Con_tacts to this account"); widget = gtk_check_button_new_with_mnemonic (text); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_grid_attach (GTK_GRID (container), widget, 0, 2, 1, 1); extension->priv->contacts_toggle = widget; /* not referenced */ gtk_widget_show (widget); @@ -325,7 +325,7 @@ mail_config_google_summary_constructed (GObject *object) widget = gtk_label_new (markup); gtk_label_set_use_markup (GTK_LABEL (widget), TRUE); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_label_set_xalign (GTK_LABEL (widget), 0); if (mail_config_google_summary_is_oauth2_supported ()) gtk_grid_attach (GTK_GRID (container), widget, 0, 3, 1, 1); diff --git a/src/modules/mail-config/e-mail-config-remote-accounts.c b/src/modules/mail-config/e-mail-config-remote-accounts.c index fb4ee90e35..bc54cd4044 100644 --- a/src/modules/mail-config/e-mail-config-remote-accounts.c +++ b/src/modules/mail-config/e-mail-config-remote-accounts.c @@ -206,7 +206,7 @@ mail_config_remote_backend_insert_widgets (EMailConfigServiceBackend *backend, g_free (markup); widget = gtk_grid_new (); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_grid_set_row_spacing (GTK_GRID (widget), 6); gtk_grid_set_column_spacing (GTK_GRID (widget), 6); gtk_box_pack_start (GTK_BOX (parent), widget, FALSE, FALSE, 0); @@ -281,7 +281,7 @@ mail_config_remote_backend_insert_widgets (EMailConfigServiceBackend *backend, g_free (markup); widget = gtk_grid_new (); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_grid_set_row_spacing (GTK_GRID (widget), 6); gtk_grid_set_column_spacing (GTK_GRID (widget), 6); gtk_box_pack_start (GTK_BOX (parent), widget, FALSE, FALSE, 0); @@ -332,7 +332,7 @@ mail_config_remote_backend_insert_widgets (EMailConfigServiceBackend *backend, g_free (markup); widget = e_mail_config_auth_check_new (backend); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_box_pack_start (GTK_BOX (parent), widget, FALSE, FALSE, 0); remote_backend->auth_check = widget; /* do not reference */ gtk_widget_show (widget); diff --git a/src/modules/mail-config/e-mail-config-sendmail-backend.c b/src/modules/mail-config/e-mail-config-sendmail-backend.c index dc59b57cbf..13bc501bd8 100644 --- a/src/modules/mail-config/e-mail-config-sendmail-backend.c +++ b/src/modules/mail-config/e-mail-config-sendmail-backend.c @@ -63,7 +63,7 @@ mail_config_sendmail_backend_insert_widgets (EMailConfigServiceBackend *backend, g_free (markup); widget = gtk_grid_new (); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_grid_set_row_spacing (GTK_GRID (widget), 6); gtk_grid_set_column_spacing (GTK_GRID (widget), 6); gtk_box_pack_start (GTK_BOX (parent), widget, FALSE, FALSE, 0); @@ -75,7 +75,7 @@ mail_config_sendmail_backend_insert_widgets (EMailConfigServiceBackend *backend, use_custom_binary_check = widget; widget = gtk_label_new_with_mnemonic (_("_Custom binary:")); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_grid_attach (GTK_GRID (container), widget, 0, 1, 1, 1); label = GTK_LABEL (widget); @@ -98,7 +98,7 @@ mail_config_sendmail_backend_insert_widgets (EMailConfigServiceBackend *backend, use_custom_args_check = widget; widget = gtk_label_new_with_mnemonic (_("Cus_tom arguments:")); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_grid_attach (GTK_GRID (container), widget, 0, 3, 1, 1); label = GTK_LABEL (widget); diff --git a/src/modules/mail-config/e-mail-config-smtp-backend.c b/src/modules/mail-config/e-mail-config-smtp-backend.c index f30dec7fe2..ffa8b78764 100644 --- a/src/modules/mail-config/e-mail-config-smtp-backend.c +++ b/src/modules/mail-config/e-mail-config-smtp-backend.c @@ -155,7 +155,7 @@ mail_config_smtp_backend_insert_widgets (EMailConfigServiceBackend *backend, g_free (markup); widget = gtk_grid_new (); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_grid_set_row_spacing (GTK_GRID (widget), 6); gtk_grid_set_column_spacing (GTK_GRID (widget), 6); gtk_box_pack_start (GTK_BOX (parent), widget, FALSE, FALSE, 0); @@ -217,7 +217,7 @@ mail_config_smtp_backend_insert_widgets (EMailConfigServiceBackend *backend, g_free (markup); widget = gtk_grid_new (); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_grid_set_row_spacing (GTK_GRID (widget), 6); gtk_grid_set_column_spacing (GTK_GRID (widget), 6); gtk_box_pack_start (GTK_BOX (parent), widget, FALSE, FALSE, 0); @@ -273,7 +273,7 @@ mail_config_smtp_backend_insert_widgets (EMailConfigServiceBackend *backend, G_BINDING_SYNC_CREATE); widget = gtk_grid_new (); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_grid_set_row_spacing (GTK_GRID (widget), 6); gtk_grid_set_column_spacing (GTK_GRID (widget), 6); gtk_box_pack_start (GTK_BOX (parent), widget, FALSE, FALSE, 0); diff --git a/src/modules/mail-config/e-mail-config-yahoo-summary.c b/src/modules/mail-config/e-mail-config-yahoo-summary.c index d1840c3c3a..f54b059daf 100644 --- a/src/modules/mail-config/e-mail-config-yahoo-summary.c +++ b/src/modules/mail-config/e-mail-config-yahoo-summary.c @@ -269,14 +269,14 @@ mail_config_yahoo_summary_constructed (GObject *object) text = _("Add Ca_lendar and Tasks to this account"); widget = gtk_check_button_new_with_mnemonic (text); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_grid_attach (GTK_GRID (container), widget, 0, 1, 2, 1); extension->priv->calendar_toggle = widget; /* not referenced */ gtk_widget_show (widget); widget = gtk_check_button_new_with_mnemonic (_("Add Con_tacts to this account")); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_grid_attach (GTK_GRID (container), widget, 0, 2, 2, 1); extension->priv->contacts_toggle = widget; /* not referenced */ gtk_widget_show (widget); diff --git a/src/modules/spamassassin/evolution-spamassassin.c b/src/modules/spamassassin/evolution-spamassassin.c index 5cc81b3be6..2a929886a4 100644 --- a/src/modules/spamassassin/evolution-spamassassin.c +++ b/src/modules/spamassassin/evolution-spamassassin.c @@ -549,7 +549,7 @@ spam_assassin_new_config_widget (EMailJunkFilter *junk_filter) widget = gtk_check_button_new_with_mnemonic ( _("I_nclude remote tests")); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); gtk_widget_show (widget); @@ -564,7 +564,7 @@ spam_assassin_new_config_widget (EMailJunkFilter *junk_filter) "%s", _("This will make SpamAssassin more reliable, but slower.")); widget = gtk_label_new (markup); - gtk_widget_set_margin_left (widget, 36); + gtk_widget_set_margin_start (widget, 36); gtk_label_set_xalign (GTK_LABEL (widget), 0); gtk_label_set_use_markup (GTK_LABEL (widget), TRUE); gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); diff --git a/src/shell/e-shell-searchbar.c b/src/shell/e-shell-searchbar.c index 62bdbe8ce7..0ab38ff87a 100644 --- a/src/shell/e-shell-searchbar.c +++ b/src/shell/e-shell-searchbar.c @@ -916,7 +916,7 @@ e_shell_searchbar_init (EShellSearchbar *searchbar) box = GTK_BOX (searchbar); widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); - gtk_widget_set_margin_left (widget, 12); + gtk_widget_set_margin_start (widget, 12); gtk_box_pack_start (box, widget, TRUE, TRUE, 0); gtk_widget_show (widget); diff --git a/src/smime/gui/certificate-manager.c b/src/smime/gui/certificate-manager.c index fb20d6f254..4a1f63680b 100644 --- a/src/smime/gui/certificate-manager.c +++ b/src/smime/gui/certificate-manager.c @@ -1295,7 +1295,7 @@ mail_cert_edit_trust (GtkWidget *parent, #define add_radio(_radio, _title, _trust) G_STMT_START { \ _radio = gtk_radio_button_new_with_mnemonic (runknown ? gtk_radio_button_get_group (GTK_RADIO_BUTTON (runknown)) : NULL, _title); \ - gtk_widget_set_margin_left (_radio, 12); \ + gtk_widget_set_margin_start (_radio, 12); \ if (camel_cert->trust == (_trust)) \ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (_radio), TRUE); \ gtk_grid_attach (grid, _radio, 0, row, 1, 1); \ -- GitLab