diff --git a/ChangeLog b/ChangeLog index b147438f5..a9f21174b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2007-11-25 Douglas S. Blank + * src/Config/_GrampsGconfKeys.py: fixed changes in gconf interface + 2007-11-25 Douglas S.Blank * src/gen/lib/test/date_test.py: turned each test into a case diff --git a/src/Config/_GrampsGconfKeys.py b/src/Config/_GrampsGconfKeys.py index cc4f89d75..978e8db47 100644 --- a/src/Config/_GrampsGconfKeys.py +++ b/src/Config/_GrampsGconfKeys.py @@ -98,10 +98,10 @@ def get(key): return val def get_bool(key): - try: - val = client.get_bool(key) - except gobject.GError: - val = None + val = client.get(key) + if val == None: + return None + val = client.get_bool(key) if val in (True, False): return val else: @@ -115,10 +115,10 @@ def set_bool(key, val): client.set_bool(key, val) def get_int(key, correct_tuple=None): - try: - val = client.get_int(key) - except gobject.GError: - val = None + val = client.get(key) + if val == None: + return None + val = client.get_int(key) if not correct_tuple or val in correct_tuple: return val else: @@ -132,10 +132,10 @@ def set_int(key, val, correct_tuple=None): client.set_int(key, val) def get_string(key, test_func=None): - try: - val = client.get_string(key) - except gobject.GError: - val = None + val = client.get(key) + if val == None: + return None + val = client.get_string(key) if not test_func or test_func(val): return val else: