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

import of osmgpsmap crashes in GTK3, so we deactivate it

Browse Source 
svn: r19925
This commit is contained in:
Benny Malengier
2012-06-26 16:22:46 +00:00
parent 063e6504c8
commit 747c4f2960
3 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/lib/maps/messagelayer.py
View File

@@ -45,7 +45,7 @@ _LOG = logging.getLogger("maps.messagelayer")
# GTK/Gnome modules # GTK/Gnome modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from gi.repository import Gtk from gi.repository import Gdk
from gi.repository import Cairo from gi.repository import Cairo
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@@ -121,7 +121,7 @@ class MessageLayer(gobject.GObject, osmgpsmap.GpsMapLayer):
cairo.FONT_SLANT_NORMAL, cairo.FONT_SLANT_NORMAL,
cairo.FONT_WEIGHT_NORMAL) cairo.FONT_WEIGHT_NORMAL)
ctx.set_font_size(int(self.size)) ctx.set_font_size(int(self.size))
color = gtk.gdk.color_parse(self.color) color = Gdk.color_parse(self.color)
ctx.set_source_rgba(float(color.red / 65535.0), ctx.set_source_rgba(float(color.red / 65535.0),
float(color.green / 65535.0), float(color.green / 65535.0),
float(color.blue / 65535.0), float(color.blue / 65535.0),

2
src/plugins/tool/TestcaseGenerator.py
View File

@@ -40,7 +40,7 @@ import time
# GNOME libraries # GNOME libraries
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import gtk from gi.repository import Gtk
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

20
src/plugins/view/geography.gpr.py
View File

@@ -32,14 +32,22 @@
from const import VERSION_TUPLE from const import VERSION_TUPLE
MODULE_VERSION="%1d.%1d" % (VERSION_TUPLE[0], VERSION_TUPLE[1]) MODULE_VERSION="%1d.%1d" % (VERSION_TUPLE[0], VERSION_TUPLE[1])
try : try :
import osmgpsmap NEWGTK = False
OSMGPSMAP = True from gi.repository import Gtk
if osmgpsmap.__version__ < '0.7.0': if Gtk.get_major_version() >= 3:
OSMGPSMAP = False OSMGPSMAP = False
import sys NEWGTK = True
print >> sys.stderr, _("WARNING: osmgpsmap module not loaded. " if not NEWGTK:
"osmgpsmap must be >= 0.7.0. yours is %s") % osmgpsmap.__version__ # current osmgpsmap does not support GTK3
import osmgpsmap
OSMGPSMAP = True
if osmgpsmap.__version__ < '0.7.0':
OSMGPSMAP = False
import sys
print >> sys.stderr, _("WARNING: osmgpsmap module not loaded. "
"osmgpsmap must be >= 0.7.0. yours is %s") % osmgpsmap.__version__
except: except:
OSMGPSMAP = False OSMGPSMAP = False
import sys import sys