* src/StartupDialog.py: handle SuSE 9.0's broken handling of

gconf
* src/gramps.py: handle SuSE 9.0's broken handling of gconf


svn: r2309
This commit is contained in:
Don Allingham 2003-11-02 00:23:35 +00:00
parent 7c0b8f9db9
commit 9efdcef0fe
2 changed files with 19 additions and 12 deletions

View File

@ -22,7 +22,12 @@ import const
import gtk.glade import gtk.glade
import gnome import gnome
import gnome.ui import gnome.ui
try:
import gconf import gconf
except ImportError:
import gnome.gconf
gconf = gnome.gconf
from gettext import gettext as _ from gettext import gettext as _

View File

@ -18,19 +18,31 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
#-------------------------------------------------------------------------
#
# Python modules
#
#-------------------------------------------------------------------------
import sys import sys
import os import os
import locale import locale
import signal import signal
import gettext
#-------------------------------------------------------------------------
#
# pygtk
#
#-------------------------------------------------------------------------
try: try:
import pygtk import pygtk
pygtk.require('2.0') pygtk.require('2.0')
except ImportError: except ImportError:
pass pass
import gtk.gdk
import gtk
import gtk.glade import gtk.glade
import gettext
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -52,17 +64,8 @@ except:
pass pass
gettext.textdomain("gramps") gettext.textdomain("gramps")
gettext.install("gramps",loc,unicode=1) gettext.install("gramps",loc,unicode=1)
#-------------------------------------------------------------------------
#
# Cope with versioned pygtk installation.
#
#-------------------------------------------------------------------------
import gtk
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
# gramps libraries # gramps libraries
@ -70,7 +73,6 @@ import gtk
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import gramps_main import gramps_main
signal.signal(signal.SIGCHLD, signal.SIG_DFL) signal.signal(signal.SIGCHLD, signal.SIG_DFL)
args = sys.argv[1:] args = sys.argv[1:]