From 747c4f2960c1c1f1e152510ffc02a752a1e5caf3 Mon Sep 17 00:00:00 2001
From: Benny Malengier <benny.malengier@gramps-project.org>
Date: Tue, 26 Jun 2012 16:22:46 +0000
Subject: [PATCH] import of osmgpsmap crashes in GTK3, so we deactivate it

svn: r19925
---
 src/plugins/lib/maps/messagelayer.py  |  4 ++--
 src/plugins/tool/TestcaseGenerator.py |  2 +-
 src/plugins/view/geography.gpr.py     | 20 ++++++++++++++------
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/plugins/lib/maps/messagelayer.py b/src/plugins/lib/maps/messagelayer.py
index 344fb4a22..f7e754a06 100644
--- a/src/plugins/lib/maps/messagelayer.py
+++ b/src/plugins/lib/maps/messagelayer.py
@@ -45,7 +45,7 @@ _LOG = logging.getLogger("maps.messagelayer")
 # GTK/Gnome modules
 #
 #-------------------------------------------------------------------------
-from gi.repository import Gtk
+from gi.repository import Gdk
 from gi.repository import Cairo
 
 #-------------------------------------------------------------------------
@@ -121,7 +121,7 @@ class MessageLayer(gobject.GObject, osmgpsmap.GpsMapLayer):
                              cairo.FONT_SLANT_NORMAL,
                              cairo.FONT_WEIGHT_NORMAL)
         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),
                             float(color.green / 65535.0),
                             float(color.blue / 65535.0),
diff --git a/src/plugins/tool/TestcaseGenerator.py b/src/plugins/tool/TestcaseGenerator.py
index 7dfd840d5..91872bd44 100644
--- a/src/plugins/tool/TestcaseGenerator.py
+++ b/src/plugins/tool/TestcaseGenerator.py
@@ -40,7 +40,7 @@ import time
 # GNOME libraries
 #
 #-------------------------------------------------------------------------
-import gtk 
+from gi.repository import Gtk
 
 #-------------------------------------------------------------------------
 #
diff --git a/src/plugins/view/geography.gpr.py b/src/plugins/view/geography.gpr.py
index ac5990b19..9bdc816c9 100644
--- a/src/plugins/view/geography.gpr.py
+++ b/src/plugins/view/geography.gpr.py
@@ -32,14 +32,22 @@
 from const import VERSION_TUPLE
 MODULE_VERSION="%1d.%1d" % (VERSION_TUPLE[0], VERSION_TUPLE[1])
 
+
 try :
-    import osmgpsmap
-    OSMGPSMAP = True
-    if osmgpsmap.__version__ < '0.7.0':
+    NEWGTK = False
+    from gi.repository import Gtk
+    if Gtk.get_major_version() >= 3:
         OSMGPSMAP = False
-        import sys
-        print >> sys.stderr, _("WARNING: osmgpsmap module not loaded. "
-                "osmgpsmap must be >= 0.7.0. yours is %s") % osmgpsmap.__version__
+        NEWGTK = True
+    if not NEWGTK:
+        # 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:
     OSMGPSMAP = False
     import sys