From 0ec63fc00e7b9fb136777846312c5fe878067a13 Mon Sep 17 00:00:00 2001 From: Clement Lefebvre Date: Mon, 19 Nov 2018 11:25:31 +0000 Subject: [PATCH] Fix merge issues POTFILES.in and xed-window.c required a couple of changes after the status selector PR was merged. --- po/POTFILES.in | 7 ++++++- xed/xed-window.c | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index a3c2433..ba1a34c 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -22,6 +22,8 @@ xed/xed-documents-panel.c xed/xed-encodings-combo-box.c xed/xed-encodings-dialog.c xed/xed-file-chooser-dialog.c +xed/xed-highlight-mode-dialog.c +xed/xed-highlight-mode-selector.c xed/xed-history-entry.c xed/xed-io-error-info-bar.c xed/xed-message-bus.c @@ -37,6 +39,9 @@ xed/xed-preferences-dialog.c xed/xed-print-job.c xed/xed-print-preview.c xed/xed-progress-info-bar.c +[type: gettext/glade]xed/resources/ui/xed-highlight-mode-dialog.ui +[type: gettext/glade]xed/resources/ui/xed-highlight-mode-selector.ui +[type: gettext/glade]xed/resources/ui/xed-status-menu-button.ui [type: gettext/glade]xed/resources/ui/xed-encodings-dialog.ui [type: gettext/glade]xed/resources/ui/xed-preferences-dialog.ui [type: gettext/glade]xed/resources/ui/xed-print-preferences.ui @@ -47,7 +52,7 @@ xed/resources/ui/xed-ui.xml xed/xed-searchbar.c xed/xed-searchbar.c xed/xed-settings.c -xed/xed-status-combo-box.c +xed/xed-status-menu-button.c xed/xed-statusbar.c xed/xed-statusbar.c xed/xed-tab-label.c diff --git a/xed/xed-window.c b/xed/xed-window.c index 273f9bd..df141b0 100644 --- a/xed/xed-window.c +++ b/xed/xed-window.c @@ -1321,11 +1321,11 @@ set_tab_spaces_label (XedWindow *window, { if (use_spaces) { - xed_status_combo_box_set_label (XED_STATUS_COMBO_BOX (window->priv->tab_width_combo), _("Spaces")); + xed_status_menu_button_set_label (XED_STATUS_MENU_BUTTON (window->priv->tab_width_button), _("Spaces")); } else { - xed_status_combo_box_set_label (XED_STATUS_COMBO_BOX (window->priv->tab_width_combo), _("Tabs")); + xed_status_menu_button_set_label (XED_STATUS_MENU_BUTTON (window->priv->tab_width_button), _("Tabs")); } }