* src/GrampsCfg.py: Fix toolbar prefs.

* src/intl.py: Import intl22.so for both 2.2 and 2.3 python versions.


svn: r2010

gramps2/ChangeLog

@@ -6,6 +6,8 @@
 	* src/FamilyView.py: Likewise. 
 	* src/SelectChild.py: Likewise.
 	* src/plugins/rel_ru.py: Likewise.
+	* src/GrampsCfg.py: Fix toolbar prefs. 
+	* src/intl.py: Import intl22.so for both 2.2 and 2.3 python versions.
 
 2003-08-14  Don Allingham  <dallingham@users.sourceforge.net>
 	* src/DbPrompter.py: removed #! at top of file

gramps2/src/GrampsCfg.py

@@ -312,17 +312,17 @@ def get_string(value,defval=""):
 
 def get_bool(key,defval=0):
     v = client.get_bool(key)
-    if v:
-        return v
-    else:
+    if v == None:
         return defval
+    else:
+        return v
 
 def get_int(key,defval=0):
     v = client.get_int(key)
-    if v:
-        return v
-    else:
+    if v == None:
         return defval
+    else:
+        return v
 
 def set_int(key,value):
     client.set_int(key,value)
@@ -905,7 +905,7 @@ class GrampsPreferences:
         set_bool("/apps/gramps/capitalize",capitalize)
         set_bool("/apps/gramps/index-visible",index_visible)
         set_int("/apps/gramps/statusbar",status_bar)
-        set_int("/apps/gramps/toolbar",toolbar+1)
+        set_int("/apps/gramps/toolbar",toolbar)
         set_int("/apps/gramps/defaultview",defaultview)
         set_string("/apps/gramps/paper-preference",paper_preference)
         set_string("/apps/gramps/output-preference",output_preference)

gramps2/src/intl.py

@@ -1,7 +1,7 @@
 #
 # Gramps - a GTK+/GNOME based genealogy program
 #
-# Copyright (C) 2000  Donald N. Allingham
+# Copyright (C) 2000-2003  Donald N. Allingham
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -29,7 +29,7 @@ ver = sys.version[0:3]
 _trans = None
 
 try:
-    if ver == "2.2":
+    if ver in ["2.2","2.3"]:
         from intl22 import *
         status = None
     else: