gnome-terminal r2954 - trunk/src

[chpe svn gnome org]

Author: chpe
Date: Fri Jul 11 10:35:10 2008
New Revision: 2954
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=2954&view=rev

Log:
Write backward compatible values for the terminal erase bindings preferences.


Modified:
   trunk/src/terminal-profile.c

Modified: trunk/src/terminal-profile.c
==============================================================================
--- trunk/src/terminal-profile.c	(original)
+++ trunk/src/terminal-profile.c	Fri Jul 11 10:35:10 2008
@@ -745,17 +745,18 @@
       const char *string;
 
       eval = g_enum_get_value (G_PARAM_SPEC_ENUM (pspec)->enum_class, g_value_get_enum (value));
-      if (eval)
-        string = eval->value_nick;
-      else if (G_PARAM_SPEC_VALUE_TYPE (pspec) == vte_terminal_erase_binding_get_type ())
+
+      if (G_PARAM_SPEC_VALUE_TYPE (pspec) == vte_terminal_erase_binding_get_type ())
         {
           /* Backward compatibility */
           string = gconf_enum_to_string ((GConfEnumStringPair*) erase_bindings, g_value_get_enum (value));
           if (!string)
             goto cleanup;
         }
+      else if (eval)
+        string = eval->value_nick;
       else
-        return;
+        goto cleanup;
 
       gconf_change_set_set_string (changeset, key, string);
     }