[gnome-terminal] prefs: Remove extra frames when using headerbars

[Christian Persch <chpe src gnome org>]

commit 4ad1bb9725e783ebcd2b746d492f5f9d499ce1dc
Author: Christian Persch <chpe src gnome org>
Date:   Tue Dec 11 01:05:51 2018 +0100

    prefs: Remove extra frames when using headerbars

 src/preferences.ui   | 4 ++--
 src/terminal-prefs.c | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/src/preferences.ui b/src/preferences.ui
index 6259aac0..4788959a 100644
--- a/src/preferences.ui
+++ b/src/preferences.ui
@@ -283,7 +283,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <child>
-                      <object class="GtkFrame" id="general">
+                      <object class="GtkFrame" id="general-frame">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
@@ -434,7 +434,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <child>
-                      <object class="GtkFrame" id="keybindings">
+                      <object class="GtkFrame" id="keybindings-frame">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
diff --git a/src/terminal-prefs.c b/src/terminal-prefs.c
index 38cb61a7..53715232 100644
--- a/src/terminal-prefs.c
+++ b/src/terminal-prefs.c
@@ -751,7 +751,7 @@ terminal_prefs_show_preferences (GSettings *profile, const char *widget_name)
   GtkWidget *theme_variant_label, *theme_variant_combo;
   GtkWidget *new_terminal_mode_label, *new_terminal_mode_combo;
   GtkWidget *close_button, *help_button;
-  GtkWidget *content_box;
+  GtkWidget *content_box, *general_frame, *keybindings_frame;
   GSettings *settings;
 
   const GActionEntry action_entries[] = {
@@ -773,6 +773,8 @@ terminal_prefs_show_preferences (GSettings *profile, const char *widget_name)
                                        "preferences-dialog",
                                        "preferences-dialog", &dialog,
                                        "dialogue-content-box", &content_box,
+                                       "general-frame", &general_frame,
+                                       "keybindings-frame", &keybindings_frame,
                                        "close-button", &close_button,
                                        "help-button", &help_button,
                                        "default-show-menubar-checkbutton", &show_menubar_button,
@@ -916,8 +918,10 @@ terminal_prefs_show_preferences (GSettings *profile, const char *widget_name)
 
     gtk_window_set_titlebar (GTK_WINDOW (dialog), headerbar);
 
-    /* Remove extra spacing around the content */
+    /* Remove extra spacing around the content, and extra frames */
     g_object_set (G_OBJECT (content_box), "margin", 0, NULL);
+    gtk_frame_set_shadow_type (GTK_FRAME (general_frame), GTK_SHADOW_NONE);
+    gtk_frame_set_shadow_type (GTK_FRAME (keybindings_frame), GTK_SHADOW_NONE);
   }
 
   /* misc */