From 017f36d86eab75469f4149c00f9a413177e78b94 Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Thu, 11 Dec 2003 20:27:34 +0000 Subject: [PATCH] Oops, reverting last change svn: r2504 --- ChangeLog | 4 ---- src/GrampsCfg.py | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 62c267852..fa6d80121 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,3 @@ -2003-12-11 Alex Roitman - * src/GrampsCfg.py (loadConfig, on_propertybox_apply): - Gracefully handle broken gnome keys for the toolbar style. - 2003-12-10 Don Allingham * src/GrampsCfg.py: Make sure to return "BOTH" if the gnome toolbar gconf entry is not set. Appears that this can happen diff --git a/src/GrampsCfg.py b/src/GrampsCfg.py index db8530eb5..9223021e2 100644 --- a/src/GrampsCfg.py +++ b/src/GrampsCfg.py @@ -248,9 +248,9 @@ def loadConfig(call): id_edit = get_bool("/apps/gramps/id-edit") index_visible = get_bool("/apps/gramps/index-visible") status_bar = get_int("/apps/gramps/statusbar") + gnome_toolbar_str = get_string("/desktop/gnome/interface/toolbar_style","BOTH") try: - gnome_toolbar_str = get_string("/desktop/gnome/interface/toolbar_style","BOTH") gnome_toolbar = eval("gtk.TOOLBAR_%s" % gnome_toolbar_str.upper()) except: gnome_toolbar = 2 @@ -869,8 +869,8 @@ class GrampsPreferences: status_bar = 2 save_toolbar = self.top.get_widget("tooloptmenu").get_history() + gnome_toolbar_str = get_string("/desktop/gnome/interface/toolbar_style",'BOTH') try: - gnome_toolbar_str = get_string("/desktop/gnome/interface/toolbar_style",'BOTH') gnome_toolbar = eval("gtk.TOOLBAR_%s" % gnome_toolbar_str.upper()) except: gnome_toolbar = 2