[gnome-builder] preferences: fix setting for overwrite-braces

[Christian Hergert <chergert src gnome org>]

commit adc95865710f8a4ac07190524c3afc64c1b4b00f
Author: Christian Hergert <christian hergert me>
Date:   Sun Feb 21 18:40:16 2016 -0800

    preferences: fix setting for overwrite-braces
    
    This setting was being ignored due to the introduction of IdeFileSettings.
    This plumbs the setting through and implements it in the GSettings
    backend.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=755815

 data/ui/ide-editor-frame.ui                    |    2 +-
 libide/gsettings/ide-gsettings-file-settings.c |    1 +
 libide/ide-file-settings.defs                  |   11 +++++++++++
 libide/ide-source-view.c                       |    2 ++
 libide/preferences/ide-preferences-builtin.c   |    1 +
 5 files changed, 16 insertions(+), 1 deletions(-)
---
diff --git a/data/ui/ide-editor-frame.ui b/data/ui/ide-editor-frame.ui
index 1290dbf..dd30de3 100644
--- a/data/ui/ide-editor-frame.ui
+++ b/data/ui/ide-editor-frame.ui
@@ -118,7 +118,7 @@
                         <property name="enable-word-completion">true</property>
                         <property name="highlight-current-line">true</property>
                         <property name="insert-matching-brace">true</property>
-                        <property name="overwrite-braces">true</property>
+                        <property name="overwrite-braces">false</property>
                         <property name="scroll-offset">0</property>
                         <property name="show-grid-lines">true</property>
                         <property name="show-line-changes">true</property>
diff --git a/libide/gsettings/ide-gsettings-file-settings.c b/libide/gsettings/ide-gsettings-file-settings.c
index 51120bc..8443708 100644
--- a/libide/gsettings/ide-gsettings-file-settings.c
+++ b/libide/gsettings/ide-gsettings-file-settings.c
@@ -65,6 +65,7 @@ static SettingsMapping language_mappings [] = {
   { "show-right-margin",             "show-right-margin",        NULL             },
   { "tab-width",                     "tab-width",                NULL             },
   { "trim-trailing-whitespace",      "trim-trailing-whitespace", NULL             },
+  { "overwrite-braces",              "overwrite-braces",         NULL             },
 };
 
 static void
diff --git a/libide/ide-file-settings.defs b/libide/ide-file-settings.defs
index d277fd9..19e3fe5 100644
--- a/libide/ide-file-settings.defs
+++ b/libide/ide-file-settings.defs
@@ -45,6 +45,17 @@ IDE_FILE_SETTINGS_PROPERTY (INSERT_TRAILING_NEWLINE, insert_trailing_newline,
                             priv->insert_trailing_newline = !!insert_trailing_newline;,
                             boolean)
 
+IDE_FILE_SETTINGS_PROPERTY (OVERWRITE_BRACES, overwrite_braces,
+                            gboolean, gboolean,
+                            "overwrite-braces",
+                            g_param_spec_boolean ("overwrite-braces",
+                                                  "Overwrite Braces",
+                                                  "Type over existing braces",
+                                                  FALSE,
+                                                  (G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)),
+                            priv->overwrite_braces = !!overwrite_braces;,
+                            boolean)
+
 IDE_FILE_SETTINGS_PROPERTY (NEWLINE_TYPE, newline_type,
                             GtkSourceNewlineType, GtkSourceNewlineType,
                             "newline-type",
diff --git a/libide/ide-source-view.c b/libide/ide-source-view.c
index 3fa2a27..525832f 100644
--- a/libide/ide-source-view.c
+++ b/libide/ide-source-view.c
@@ -6531,6 +6531,8 @@ ide_source_view_init (IdeSourceView *self)
                           self, "indent-style", G_BINDING_SYNC_CREATE);
   egg_binding_group_bind (priv->file_setting_bindings, "show-right-margin",
                           self, "show-right-margin", G_BINDING_SYNC_CREATE);
+  egg_binding_group_bind (priv->file_setting_bindings, "overwrite-braces",
+                          self, "overwrite-braces", G_BINDING_SYNC_CREATE);
 
   priv->buffer_signals = egg_signal_group_new (IDE_TYPE_BUFFER);
 
diff --git a/libide/preferences/ide-preferences-builtin.c b/libide/preferences/ide-preferences-builtin.c
index 1082170..a9784f4 100644
--- a/libide/preferences/ide-preferences-builtin.c
+++ b/libide/preferences/ide-preferences-builtin.c
@@ -225,6 +225,7 @@ ide_preferences_builtin_register_languages (IdePreferences *preferences)
 
   ide_preferences_add_list_group (preferences, "languages.id", "basic", NULL, 0);
   ide_preferences_add_switch (preferences, "languages.id", "basic", "org.gnome.builder.editor.language", 
"trim-trailing-whitespace", "/org/gnome/builder/editor/language/{id}/", NULL, _("Trim trailing whitespace"), 
_("Upon saving, trailing whitespace from modified lines will be trimmed."), NULL, 10);
+  ide_preferences_add_switch (preferences, "languages.id", "basic", "org.gnome.builder.editor.language", 
"overwrite-braces", "/org/gnome/builder/editor/language/{id}/", NULL, _("Overwrite Braces"), _("Overwrite 
closing braces"), NULL, 20);
 
   ide_preferences_add_list_group (preferences, "languages.id", "margin", _("Margins"), 0);
   ide_preferences_add_radio (preferences, "languages.id", "margin", "org.gnome.builder.editor.language", 
"show-right-margin", "/org/gnome/builder/editor/language/{id}/", NULL, _("Show right margin"), NULL, NULL, 0);