Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Oops, reverting last change

Browse Source 
svn: r2504
This commit is contained in:
Alex Roitman 2003-12-11 20:27:34 +00:00
parent 46fcf69881
commit 017f36d86e
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,7 +1,3 @@
2003-12-11 Alex Roitman <shura@alex.neuro.umn.edu>
* src/GrampsCfg.py (loadConfig, on_propertybox_apply):
Gracefully handle broken gnome keys for the toolbar style.
2003-12-10 Don Allingham <dallingham@users.sourceforge.net> 2003-12-10 Don Allingham <dallingham@users.sourceforge.net>
* src/GrampsCfg.py: Make sure to return "BOTH" if the gnome * src/GrampsCfg.py: Make sure to return "BOTH" if the gnome
toolbar gconf entry is not set. Appears that this can happen toolbar gconf entry is not set. Appears that this can happen

4
src/GrampsCfg.py
View File

@ -248,9 +248,9 @@ def loadConfig(call):
id_edit = get_bool("/apps/gramps/id-edit") id_edit = get_bool("/apps/gramps/id-edit")
index_visible = get_bool("/apps/gramps/index-visible") index_visible = get_bool("/apps/gramps/index-visible")
status_bar = get_int("/apps/gramps/statusbar") status_bar = get_int("/apps/gramps/statusbar")
gnome_toolbar_str = get_string("/desktop/gnome/interface/toolbar_style","BOTH")
try: try:
gnome_toolbar_str = get_string("/desktop/gnome/interface/toolbar_style","BOTH")
gnome_toolbar = eval("gtk.TOOLBAR_%s" % gnome_toolbar_str.upper()) gnome_toolbar = eval("gtk.TOOLBAR_%s" % gnome_toolbar_str.upper())
except: except:
gnome_toolbar = 2 gnome_toolbar = 2
@ -869,8 +869,8 @@ class GrampsPreferences:
status_bar = 2 status_bar = 2
save_toolbar = self.top.get_widget("tooloptmenu").get_history() save_toolbar = self.top.get_widget("tooloptmenu").get_history()
try:
gnome_toolbar_str = get_string("/desktop/gnome/interface/toolbar_style",'BOTH') gnome_toolbar_str = get_string("/desktop/gnome/interface/toolbar_style",'BOTH')
try:
gnome_toolbar = eval("gtk.TOOLBAR_%s" % gnome_toolbar_str.upper()) gnome_toolbar = eval("gtk.TOOLBAR_%s" % gnome_toolbar_str.upper())
except: except:
gnome_toolbar = 2 gnome_toolbar = 2