gnome-terminal r2648 - trunk/src

[chpe svn gnome org]

Author: chpe
Date: Thu May 29 19:41:46 2008
New Revision: 2648
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=2648&view=rev

Log:
Fix the backspace and delete bindings in the compatibility tab of the profile preferences to adapt to the change from TerminalEraseBinding to VteTerminalEraseBinding with its changed order.


Modified:
   trunk/src/profile-editor.c
   trunk/src/profile-preferences.ui
   trunk/src/terminal-profile.c

Modified: trunk/src/profile-editor.c
==============================================================================
--- trunk/src/profile-editor.c	(original)
+++ trunk/src/profile-editor.c	Thu May 29 19:41:46 2008
@@ -1892,7 +1892,7 @@
   GtkWidget *w;
 
   w = profile_editor_get_widget (editor, "delete-binding-combobox");
-  
+
   gtk_combo_box_set_active (GTK_COMBO_BOX (w),
                             terminal_profile_get_delete_binding (profile));
 }

Modified: trunk/src/profile-preferences.ui
==============================================================================
--- trunk/src/profile-preferences.ui	(original)
+++ trunk/src/profile-preferences.ui	Thu May 29 19:41:46 2008
@@ -96,36 +96,23 @@
       </row>
     </data>
   </object>
-  <object class="GtkListStore" id="model6">
+  <object class="GtkListStore" id="erase-binding-model">
     <columns>
       <column type="gchararray"/>
     </columns>
     <data>
       <row>
-        <col id="0">ASCII DEL</col>
-      </row>
-      <row>
-        <col id="0">Escape sequence</col>
+        <col id="0">Automatic</col>
       </row>
       <row>
         <col id="0">Control-H</col>
       </row>
-    </data>
-  </object>
-  <object class="GtkListStore" id="model7">
-    <columns>
-      <column type="gchararray"/>
-    </columns>
-    <data>
       <row>
         <col id="0">ASCII DEL</col>
       </row>
       <row>
         <col id="0">Escape sequence</col>
       </row>
-      <row>
-        <col id="0">Control-H</col>
-      </row>
     </data>
   </object>
   <object class="GtkDialog" id="profile-editor-dialog">
@@ -2479,7 +2466,7 @@
                         <property name="visible">True</property>
                         <property name="add_tearoffs">False</property>
                         <property name="focus_on_click">True</property>
-                        <property name="model">model6</property>
+                        <property name="model">erase-binding-model</property>
                         <child>
                           <object class="GtkCellRendererText" id="renderer6"/>
                           <attributes>
@@ -2501,7 +2488,7 @@
                         <property name="visible">True</property>
                         <property name="add_tearoffs">False</property>
                         <property name="focus_on_click">True</property>
-                        <property name="model">model7</property>
+                        <property name="model">erase-binding-model</property>
                         <child>
                           <object class="GtkCellRendererText" id="renderer7"/>
                           <attributes>

Modified: trunk/src/terminal-profile.c
==============================================================================
--- trunk/src/terminal-profile.c	(original)
+++ trunk/src/terminal-profile.c	Thu May 29 19:41:46 2008
@@ -254,9 +254,10 @@
 
 /* FIXMEchpe make these use the same strings as vte */
 static const GConfEnumStringPair erase_bindings[] = {
+  { VTE_ERASE_AUTO, "auto" },
   { VTE_ERASE_ASCII_BACKSPACE, "control-h" },
-  { VTE_ERASE_DELETE_SEQUENCE, "escape-sequence" },
   { VTE_ERASE_ASCII_DELETE, "ascii-del" },
+  { VTE_ERASE_DELETE_SEQUENCE, "escape-sequence" },
   { -1, NULL }
 };
 
@@ -2485,7 +2486,7 @@
 {
   TerminalProfilePrivate *priv = profile->priv;
   int binding; /* VteTerminalEraseBinding */
-  
+
   if (str_val &&
       gconf_string_to_enum (erase_bindings, str_val, &binding) &&
       binding != priv->delete_binding)