From bf2b46a27db85b08e906404dce4e5261e523fdf3 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Sat, 11 Jun 2016 16:16:34 +0200 Subject: [PATCH] profile-editor: render text in color scheme combobox As we use gtk3 only code we can remove that in UI file, finaly fix for https://github.com/mate-desktop/mate-terminal/issues/103 --- src/profile-editor.c | 9 ++++----- src/profile-preferences.ui | 6 ------ 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/profile-editor.c b/src/profile-editor.c index c22522b..48b3632 100644 --- a/src/profile-editor.c +++ b/src/profile-editor.c @@ -519,7 +519,7 @@ reset_compat_defaults_cb (GtkWidget *button, */ static void -init_color_scheme_menu (GtkWidget *combo_box) +init_color_scheme_menu (GtkWidget *widget) { GtkCellRenderer *renderer; GtkTreeIter iter; @@ -535,13 +535,12 @@ init_color_scheme_menu (GtkWidget *combo_box) 0, _("Custom"), -1); - gtk_combo_box_set_model (GTK_COMBO_BOX (combo_box), GTK_TREE_MODEL (store)); + gtk_combo_box_set_model (GTK_COMBO_BOX (widget), GTK_TREE_MODEL (store)); g_object_unref (store); renderer = gtk_cell_renderer_text_new (); -/*FIXME, avoid double loading of color schemes names from UI file */ -/* gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_box), renderer, TRUE); - gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_box), renderer, "text", 0, NULL);*/ + gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (widget), renderer, TRUE); + gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (widget), renderer, "text", 0, NULL); } static char* diff --git a/src/profile-preferences.ui b/src/profile-preferences.ui index fb8de34..4f4b542 100644 --- a/src/profile-preferences.ui +++ b/src/profile-preferences.ui @@ -1398,12 +1398,6 @@ False True model4 - - - - 0 - - 0