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

Revert "8572: gramps crashes if gtk < 3.10"

Browse Source 
This reverts commit 6b929e9c7e.
This commit is contained in:
Paul Franklin 2015-07-14 15:58:38 -07:00
parent 6b929e9c7e
commit 6e69cbcb04
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gramps/gui/grampsgui.py
View File

@ -48,7 +48,6 @@ _ = glocale.translation.gettext
MIN_PYGOBJECT_VERSION = (3, 3, 2) MIN_PYGOBJECT_VERSION = (3, 3, 2)
PYGOBJ_ERR = False PYGOBJ_ERR = False
MIN_GTK_VERSION = "3.10"
try: try:
#import gnome introspection, part of pygobject #import gnome introspection, part of pygobject
@ -81,7 +80,7 @@ if PYGOBJ_ERR:
try: try:
gi.require_version('Pango', '1.0') gi.require_version('Pango', '1.0')
gi.require_version('PangoCairo', '1.0') gi.require_version('PangoCairo', '1.0')
gi.require_version('Gtk', MIN_GTK_VERSION) gi.require_version('Gtk', '3.0')
#It is important to import Pango before Gtk, or some things start to go #It is important to import Pango before Gtk, or some things start to go
#wrong in GTK3 ! #wrong in GTK3 !
from gi.repository import Pango, PangoCairo from gi.repository import Pango, PangoCairo
@ -93,10 +92,6 @@ except (ImportError, ValueError):
"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.")))
try: # be explicit
gi.require_version('Gtk', MIN_GTK_VERSION)
except (ImportError, ValueError):
print(_("\n(Gtk must be %s or later)" % MIN_GTK_VERSION))
sys.exit(0) sys.exit(0)
try: try: