[gnome-terminal] profile: editor: Remove the word-chars setting

[Debarshi Ray <debarshir src gnome org>]

commit e63cbcf64d2fde5bc4a8cb8ae0e3ef8c95a6d889
Author: Debarshi Ray <debarshir gnome org>
Date:   Mon Apr 7 15:31:11 2014 +0200

    profile: editor: Remove the word-chars setting
    
    https://bugzilla.gnome.org/show_bug.cgi?id=724110

 src/migration.c                    |    3 --
 src/org.gnome.Terminal.gschema.xml |    5 ----
 src/profile-editor.c               |    3 --
 src/profile-preferences.ui         |   39 ------------------------------------
 src/terminal-schemas.h             |    1 -
 src/terminal-screen.c              |    6 -----
 6 files changed, 0 insertions(+), 57 deletions(-)
---
diff --git a/src/migration.c b/src/migration.c
index 2332259..2011ac0 100644
--- a/src/migration.c
+++ b/src/migration.c
@@ -93,7 +93,6 @@ enum {
 #define KEY_USE_SYSTEM_FONT "use_system_font"
 #define KEY_USE_THEME_COLORS "use_theme_colors"
 #define KEY_VISIBLE_NAME "visible_name"
-#define KEY_WORD_CHARS "word_chars"
 
 static const GConfEnumStringPair erase_binding_pairs[] = {
   { VTE_ERASE_AUTO, "auto" },
@@ -404,8 +403,6 @@ migrate_profile (TerminalSettingsList *list,
   migrate_bool (client, path, KEY_SILENT_BELL,
                 settings, TERMINAL_PROFILE_AUDIBLE_BELL_KEY,
                 TRUE);
-  migrate_string (client, path, KEY_WORD_CHARS,
-                 settings, TERMINAL_PROFILE_WORD_CHARS_KEY);
   migrate_bool (client, path, KEY_USE_CUSTOM_DEFAULT_SIZE,
                 settings, TERMINAL_PROFILE_USE_CUSTOM_DEFAULT_SIZE_KEY,
                 FALSE);
diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml
index f1e398c..1b926a6 100644
--- a/src/org.gnome.Terminal.gschema.xml
+++ b/src/org.gnome.Terminal.gschema.xml
@@ -130,11 +130,6 @@
       <default>true</default>
       <summary>Whether to ring the terminal bell</summary>
     </key>
-    <key name="word-chars" type="s">
-      <default>'-A-Za-z0-9,./?%&amp;#:_=+ ~'</default>
-      <summary>Characters that are considered "part of a word"</summary>
-      <description>When selecting text by word, sequences of these characters are considered single words. 
Ranges can be given as "A-Z". Literal hyphen (not expressing a range) should be the first character 
given.</description>
-    </key>
     <key name="default-show-menubar" type="b">
       <default>true</default>
       <summary>Whether to show menubar in new windows/tabs</summary>
diff --git a/src/profile-editor.c b/src/profile-editor.c
index e15cf9a..ceef4e6 100644
--- a/src/profile-editor.c
+++ b/src/profile-editor.c
@@ -1033,9 +1033,6 @@ terminal_profile_edit (GSettings  *profile,
                    gtk_builder_get_object (builder,
                                            "use-theme-colors-checkbutton"),
                    "active", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
-  g_settings_bind (profile, TERMINAL_PROFILE_WORD_CHARS_KEY,
-                   gtk_builder_get_object (builder, "word-chars-entry"),
-                   "text", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
   g_settings_bind (profile, TERMINAL_PROFILE_AUDIBLE_BELL_KEY,
                    gtk_builder_get_object (builder, "bell-checkbutton"),
                    "active",
diff --git a/src/profile-preferences.ui b/src/profile-preferences.ui
index 1e6f084..02889a3 100644
--- a/src/profile-preferences.ui
+++ b/src/profile-preferences.ui
@@ -422,45 +422,6 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkHBox" id="hbox136">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="spacing">12</property>
-                    <child>
-                      <object class="GtkLabel" id="word-chars-entry-label">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Select-by-_word characters:</property>
-                        <property name="use_underline">True</property>
-                        <property name="justify">center</property>
-                        <property name="mnemonic_widget">word-chars-entry</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkEntry" id="word-chars-entry">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">7</property>
-                  </packing>
-                </child>
-                <child>
                   <object class="GtkCheckButton" id="use-custom-default-size-checkbutton">
                     <property name="label" translatable="yes">Use custom default terminal si_ze</property>
                     <property name="visible">True</property>
diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h
index d88bf07..7673da1 100644
--- a/src/terminal-schemas.h
+++ b/src/terminal-schemas.h
@@ -64,7 +64,6 @@ G_BEGIN_DECLS
 #define TERMINAL_PROFILE_USE_SYSTEM_FONT_KEY            "use-system-font"
 #define TERMINAL_PROFILE_USE_THEME_COLORS_KEY           "use-theme-colors"
 #define TERMINAL_PROFILE_VISIBLE_NAME_KEY               "visible-name"
-#define TERMINAL_PROFILE_WORD_CHARS_KEY                 "word-chars"
 
 #define TERMINAL_SETTING_CONFIRM_CLOSE_KEY              "confirm-close"
 #define TERMINAL_SETTING_DEFAULT_SHOW_MENUBAR_KEY       "default-show-menubar"
diff --git a/src/terminal-screen.c b/src/terminal-screen.c
index cb858b2..c504881 100644
--- a/src/terminal-screen.c
+++ b/src/terminal-screen.c
@@ -800,12 +800,6 @@ terminal_screen_profile_changed_cb (GSettings     *profile,
   if (!prop_name || prop_name == I_(TERMINAL_PROFILE_AUDIBLE_BELL_KEY))
       vte_terminal_set_audible_bell (vte_terminal, g_settings_get_boolean (profile, 
TERMINAL_PROFILE_AUDIBLE_BELL_KEY));
 
-  if (!prop_name || prop_name == I_(TERMINAL_PROFILE_WORD_CHARS_KEY))
-    {
-      gs_free char *word_chars;
-      word_chars = g_settings_get_string (profile, TERMINAL_PROFILE_WORD_CHARS_KEY);
-      vte_terminal_set_word_chars (vte_terminal, word_chars);
-    }
   if (!prop_name || prop_name == I_(TERMINAL_PROFILE_SCROLL_ON_KEYSTROKE_KEY))
     vte_terminal_set_scroll_on_keystroke (vte_terminal,
                                           g_settings_get_boolean (profile, 
TERMINAL_PROFILE_SCROLL_ON_KEYSTROKE_KEY));