Increase minimum pygobject version required to 3.12

This commit is contained in:
Nick Hall 2015-07-29 14:22:36 +01:00
parent c9e23628d7
commit d190e4419b
2 changed files with 3 additions and 6 deletions

2
README
View File

@ -7,7 +7,7 @@ Requirements
The following packages *MUST* be installed in order for Gramps to work: The following packages *MUST* be installed in order for Gramps to work:
Python 3.2 or greater Python 3.2 or greater
GTK 3.10 or greater GTK 3.10 or greater
pygobject 3.3.2 or greater pygobject 3.12 or greater
cairo, pango, pangocairo with introspection bindings (the gi packages) cairo, pango, pangocairo with introspection bindings (the gi packages)
librsvg2 (svg icon view) librsvg2 (svg icon view)
xdg-utils xdg-utils

View File

@ -46,7 +46,7 @@ _ = glocale.translation.gettext
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
MIN_PYGOBJECT_VERSION = (3, 3, 2) MIN_PYGOBJECT_VERSION = (3, 12, 0)
PYGOBJ_ERR = False PYGOBJ_ERR = False
MIN_GTK_VERSION = (3, 10) MIN_GTK_VERSION = (3, 10)
@ -89,7 +89,7 @@ try:
except (ImportError, ValueError): except (ImportError, ValueError):
print((_("Gdk, Gtk, Pango or PangoCairo typelib not installed.\n" print((_("Gdk, Gtk, Pango or PangoCairo typelib not installed.\n"
"Install Gnome Introspection, and " "Install Gnome Introspection, and "
"pygobject version 3.3.2 or later.\n" "pygobject version 3.12 or later.\n"
"Then install introspection data for Gdk, Gtk, Pango and " "Then install introspection data for Gdk, Gtk, Pango and "
"PangoCairo\n\n" "PangoCairo\n\n"
"Gramps will terminate now."))) "Gramps will terminate now.")))
@ -333,9 +333,6 @@ def __startgramps(errors, argparser):
def startgtkloop(errors, argparser): def startgtkloop(errors, argparser):
""" We start the gtk loop and run the function to start up Gramps """ We start the gtk loop and run the function to start up Gramps
""" """
if GObject.pygobject_version < (3, 10, 2):
GObject.threads_init()
GLib.timeout_add(100, __startgramps, errors, argparser, priority=100) GLib.timeout_add(100, __startgramps, errors, argparser, priority=100)
if os.path.exists(os.path.join(DATA_DIR, "gramps.accel")): if os.path.exists(os.path.join(DATA_DIR, "gramps.accel")):
Gtk.AccelMap.load(os.path.join(DATA_DIR, "gramps.accel")) Gtk.AccelMap.load(os.path.join(DATA_DIR, "gramps.accel"))