From 9b42432844100e4951546201a6726f865803845e Mon Sep 17 00:00:00 2001
From: Benny Malengier <benny.malengier@gramps-project.org>
Date: Sun, 2 Sep 2012 09:08:31 +0000
Subject: [PATCH] Correct query for osmgpsmap. glib import removed, is not used

svn: r20310
---
 src/gramps.py                 | 15 ++++++++++-----
 src/plugins/view/geoperson.py |  1 -
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/gramps.py b/src/gramps.py
index 9280c8543..00d670852 100644
--- a/src/gramps.py
+++ b/src/gramps.py
@@ -241,11 +241,16 @@ def show_settings():
         cairover_str = 'not found'
 
     try:
-        from gi.repository import OsmGpsMap as osmgpsmap
-        try:
-            osmgpsmap_str = osmgpsmap._version
-        except :# any failure to 'get' the version
-            osmgpsmap_str = 'unknown version'
+        from gi import Repository
+        repository = Repository.get_default()
+        if repository.enumerate_versions("OsmGpsMap"):
+            from gi.repository import OsmGpsMap as osmgpsmap
+            try:
+                osmgpsmap_str = osmgpsmap._version
+            except :# any failure to 'get' the version
+                osmgpsmap_str = 'unknown version'
+        else:
+            osmgpsmap_str = 'not found'
 
     except ImportError:
         osmgpsmap_str = 'not found'
diff --git a/src/plugins/view/geoperson.py b/src/plugins/view/geoperson.py
index fa13d9ec4..432f8ce3b 100644
--- a/src/plugins/view/geoperson.py
+++ b/src/plugins/view/geoperson.py
@@ -40,7 +40,6 @@ from gi.repository import Gdk
 KEY_TAB = Gdk.KEY_Tab
 import socket
 from gi.repository import Gtk
-import glib
 
 #-------------------------------------------------------------------------
 #