diff --git a/gramps/plugins/lib/maps/geography.py b/gramps/plugins/lib/maps/geography.py index 386335ba8..aa4b89c96 100644 --- a/gramps/plugins/lib/maps/geography.py +++ b/gramps/plugins/lib/maps/geography.py @@ -34,6 +34,7 @@ import sys import re from gi.repository import GObject import time +import glib from math import pi #------------------------------------------------------------------------- @@ -599,10 +600,10 @@ class GeoGraphyView(OsmGps, NavigationView): and lvl < 18 ): lvl += 1 self.osm.set_zoom(lvl) - GObject.timeout_add(50, self._autozoom_in, lvl, + glib.timeout_add(50, self._autozoom_in, lvl, p1lat, p1lon, p2lat, p2lon) else: - GObject.timeout_add(50, self._autozoom_out, lvl, + glib.timeout_add(50, self._autozoom_out, lvl, p1lat, p1lon, p2lat, p2lon) def _autozoom_out(self, lvl, p1lat, p1lon, p2lat, p2lon): @@ -614,7 +615,7 @@ class GeoGraphyView(OsmGps, NavigationView): and lvl > 1 ): lvl -= 1 self.osm.set_zoom(lvl) - GObject.timeout_add(50, self._autozoom_out, lvl, + glib.timeout_add(50, self._autozoom_out, lvl, p1lat, p1lon, p2lat, p2lon) else: layer = self.get_selection_layer() @@ -641,7 +642,7 @@ class GeoGraphyView(OsmGps, NavigationView): p2lat = self.end_selection.rlat p2lon = self.end_selection.rlon # We zoom in until at least one marker missing. - GObject.timeout_add(50, self._autozoom_in, level_start, + glib.timeout_add(50, self._autozoom_in, level_start, p1lat, p1lon, p2lat, p2lon) def _set_center_and_zoom(self): diff --git a/gramps/plugins/view/geomoves.py b/gramps/plugins/view/geomoves.py index 8e0138e7f..235ce9579 100644 --- a/gramps/plugins/view/geomoves.py +++ b/gramps/plugins/view/geomoves.py @@ -39,6 +39,7 @@ from gi.repository import GObject import time import threading from math import * +import glib #------------------------------------------------------------------------- # @@ -465,7 +466,7 @@ class GeoMoves(GeoGraphyView): return self.message_layer.add_message(_("All descendance for %s" % _nd.display(person))) color = Gdk.color_parse(self._config.get('geography.color_base')) - GObject.timeout_add(int(self._config.get("geography.generation_interval")), + glib.timeout_add(int(self._config.get("geography.generation_interval")), self.animate_moves, 0, person, color) def animate_moves(self, index, person, color): @@ -533,7 +534,7 @@ class GeoMoves(GeoGraphyView): time_to_wait = int(self._config.get("geography.generation_interval")) self._create_markers() # process next generation in a few milliseconds - GObject.timeout_add(time_to_wait, self.animate_moves, + glib.timeout_add(time_to_wait, self.animate_moves, index+1, person, color) else: self.started = False diff --git a/gramps/plugins/view/geoperson.py b/gramps/plugins/view/geoperson.py index cd4103b2a..95d19ddc2 100644 --- a/gramps/plugins/view/geoperson.py +++ b/gramps/plugins/view/geoperson.py @@ -41,6 +41,7 @@ KEY_TAB = Gdk.KEY_Tab import socket from gi.repository import Gtk from gi.repository import GObject +import glib #------------------------------------------------------------------------- # @@ -276,7 +277,7 @@ class GeoPerson(GeoGraphyView): # in this case, stepyear is >= 9000 # large move means longitude or latitude differences greater than geography.maximum_lon_lat # degrees. - GObject.timeout_add(self._config.get("geography.speed"), self.animate, + glib.timeout_add(self._config.get("geography.speed"), self.animate, menu, marks, i, stepyear) return False