diff options
| author | Brian Cameron <Brian.Cameron@sun.com> | 2005-11-23 01:59:04 +0000 |
|---|---|---|
| committer | Brian Cameron <bcameron@src.gnome.org> | 2005-11-23 01:59:04 +0000 |
| commit | 327cb0d4a9d243ea49fbc8178f2932881a91d5c3 (patch) | |
| tree | 42a0c83f972c1e4c3d747e9c0ba53e7856d42934 | |
| parent | 897dd2856dd9ba30a64b7f45ab08ef7f2078aedb (diff) | |
| download | gdm-327cb0d4a9d243ea49fbc8178f2932881a91d5c3.tar.gz | |
Remove value_set_hash since it isn't really needed. Further cleanup.
2005-11-22 Brian Cameron <Brian.Cameron@sun.com>
* gui/gdmconfig.c: Remove value_set_hash
since it isn't really needed. Further
cleanup.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | gui/gdmconfig.c | 14 |
2 files changed, 7 insertions, 13 deletions
@@ -1,5 +1,11 @@ 2005-11-22 Brian Cameron <Brian.Cameron@sun.com> + * gui/gdmconfig.c: Remove value_set_hash + since it isn't really needed. Further + cleanup. + +2005-11-22 Brian Cameron <Brian.Cameron@sun.com> + * daemon/gdmconfig.c, gui/gdmconfig.c: Minor tweaks. Honor doing_update when doing translations and don't translate Welcome diff --git a/gui/gdmconfig.c b/gui/gdmconfig.c index 3b04b777..db36c1f8 100644 --- a/gui/gdmconfig.c +++ b/gui/gdmconfig.c @@ -36,9 +36,6 @@ static GHashTable *int_hash = NULL; static GHashTable *bool_hash = NULL; static GHashTable *string_hash = NULL; -static GHashTable *value_set_hash = NULL; - -static gboolean value_set = TRUE; /* * Hack to keep track if config functions should be printing error messages @@ -140,18 +137,10 @@ _gdm_config_get_string (gchar *key, gboolean reload, gboolean *changed, gboolean if (string_hash == NULL) string_hash = g_hash_table_new (g_str_hash, g_str_equal); - if (value_set_hash == NULL) - value_set_hash = g_hash_table_new (g_str_hash, g_str_equal); hashretval = gdm_config_hash_lookup (string_hash, key); - /* - * In the case of strings, the value can be NULL, so check the - * value_set_hash to see if the value has already been set. - */ - valueset = gdm_config_hash_lookup (value_set_hash, key); - - if (reload == FALSE && valueset != NULL && hashretval != NULL) + if (reload == FALSE && hashretval != NULL) return *hashretval; result = gdm_config_get_result (key); @@ -179,7 +168,6 @@ _gdm_config_get_string (gchar *key, gboolean reload, gboolean *changed, gboolean gchar** charval = g_new0 (gchar *, 1); *charval = temp; gdm_config_add_hash (string_hash, key, charval); - gdm_config_add_hash (value_set_hash, key, &value_set); if (changed != NULL) *changed = TRUE; |