From c5cf35edf3b0982389da1dce3166d3a342b9386f Mon Sep 17 00:00:00 2001
From: Mike Massonnet <mmassonnet@gmail.com>
Date: Sat, 10 Apr 2010 19:40:39 +0200
Subject: [PATCH] Add Reset button for word-chars.

---
 Terminal.glade                         |   30 ++++++++++++++++++++++++++----
 terminal/terminal-preferences-dialog.c |   27 +++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/Terminal.glade b/Terminal.glade
index 0091a0c..badc96e 100644
--- a/Terminal.glade
+++ b/Terminal.glade
@@ -1771,17 +1771,39 @@ different terminal behavior.</property>
                                 <property name="label" translatable="yes">Consider the following characters part of a _word
 when double clicking:</property>
                                 <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">word-chars</property>
                               </object>
                               <packing>
                                 <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkEntry" id="word-chars">
+                              <object class="GtkHBox" id="hbox5">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="invisible_char">&#x2022;</property>
+                                <property name="spacing">6</property>
+                                <child>
+                                  <object class="GtkEntry" id="word-chars">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="invisible_char">&#x2022;</property>
+                                  </object>
+                                  <packing>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkButton" id="reset-word-chars">
+                                    <property name="label" translatable="yes">R_eset</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">True</property>
+                                    <property name="use_underline">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
                               </object>
                               <packing>
                                 <property name="position">1</property>
diff --git a/terminal/terminal-preferences-dialog.c b/terminal/terminal-preferences-dialog.c
index 5be77c9..135f211 100644
--- a/terminal/terminal-preferences-dialog.c
+++ b/terminal/terminal-preferences-dialog.c
@@ -38,6 +38,8 @@ static void terminal_preferences_dialog_response          (GtkWidget
                                                            TerminalPreferencesDialog *dialog);
 static void terminal_preferences_dialog_reset_compat      (GtkWidget                 *button,
                                                            TerminalPreferencesDialog *dialog);
+static void terminal_preferences_dialog_reset_word_chars  (GtkWidget                 *button,
+                                                           TerminalPreferencesDialog *dialog);
 static void terminal_preferences_dialog_background_mode   (GtkWidget                 *combobox,
                                                            TerminalPreferencesDialog *dialog);
 static void terminal_preferences_dialog_background_notify (GObject                   *object,
@@ -173,6 +175,12 @@ error:
   g_signal_connect (G_OBJECT (object), "clicked",
       G_CALLBACK (terminal_preferences_dialog_reset_compat), dialog);
 
+  /* reset word-chars button */
+  object = gtk_builder_get_object (GTK_BUILDER (dialog), "reset-word-chars");
+  terminal_return_if_fail (G_IS_OBJECT (object));
+  g_signal_connect (G_OBJECT (object), "clicked",
+      G_CALLBACK (terminal_preferences_dialog_reset_word_chars), dialog);
+
   /* add shortcuts editor */
   editor = g_object_new (TERMINAL_TYPE_SHORTCUT_EDITOR, NULL);
   object = gtk_builder_get_object (GTK_BUILDER (dialog), "editor-container");
@@ -288,6 +296,25 @@ terminal_preferences_dialog_reset_compat (GtkWidget                 *button,
 
 
 static void
+terminal_preferences_dialog_reset_word_chars (GtkWidget                 *button,
+                                              TerminalPreferencesDialog *dialog)
+{
+  GParamSpec  *spec;
+  GValue       value = { 0, };
+
+  spec = g_object_class_find_property (G_OBJECT_GET_CLASS (dialog->preferences), "word-chars");
+  if (G_LIKELY (spec != NULL))
+    {
+      g_value_init (&value, spec->value_type);
+      g_param_value_set_default (spec, &value);
+      g_object_set_property (G_OBJECT (dialog->preferences), "word-chars", &value);
+      g_value_unset (&value);
+    }
+}
+
+
+
+static void
 terminal_preferences_dialog_background_mode (GtkWidget                 *combobox,
                                              TerminalPreferencesDialog *dialog)
 {
-- 
1.7.0.3