gdm r5630 - in branches/gnome-2-20: . gui

[bcameron svn gnome org]

Author: bcameron
Date: Thu Jan 24 03:00:26 2008
New Revision: 5630
URL: http://svn.gnome.org/viewvc/gdm?rev=5630&view=rev

Log:
Brian Cameron <brian cameron sun com>

        * gui/gdmsetup.c: Fix bug that was causing the Welcome message to not
          get saved properly.  Fixes bug #511018.  Also removed the bad code
          to delete translated strings if the user changes the value.  If
          user wants to change the translated strings, they should do it
          manually.


Modified:
   branches/gnome-2-20/ChangeLog
   branches/gnome-2-20/gui/gdmsetup.c

Modified: branches/gnome-2-20/gui/gdmsetup.c
==============================================================================
--- branches/gnome-2-20/gui/gdmsetup.c	(original)
+++ branches/gnome-2-20/gui/gdmsetup.c	Thu Jan 24 03:00:26 2008
@@ -3548,10 +3548,6 @@
 	gchar *key;
 } ImageData;
 
-/*
- * Do we really want to throw away the user's translations just because they
- * changed the non-translated value?
- */
 static gboolean
 greeter_entry_untranslate_timeout (GtkWidget *entry)
 {
@@ -3574,20 +3570,9 @@
 		goto out;
 	}
 
-	prefix = g_strdup_printf ("%s[", config_key);
-	keys = g_key_file_get_keys (custom_cfg, config_group, NULL, NULL);
-	for (i = 0; keys[i] != NULL; i++) {
-		if (g_str_has_prefix (keys[i], prefix)) {
-			g_key_file_remove_key (custom_cfg, config_group, keys[i], NULL);
-		}
-	}
-	g_strfreev (keys);
-
 	gdm_setup_config_set_string (key, (char *)ve_sure_string (text));
 	update_greeters ();
 
-	gdm_common_config_save (custom_cfg, custom_config_file, NULL);
-
  out:
 	g_key_file_free (custom_cfg);