diff --git a/gramps/gui/merge/mergecitation.py b/gramps/gui/merge/mergecitation.py index 38ede9a24..4f8a69600 100644 --- a/gramps/gui/merge/mergecitation.py +++ b/gramps/gui/merge/mergecitation.py @@ -154,8 +154,7 @@ class MergeCitation(ManagedWindow): titanic = self.citation1 # Add second handle to history so that when merge is complete, # phoenix is the selected row. - self.uistate.viewmanager.active_page.get_history().push( - phoenix.get_handle()) + self.uistate.set_active(phoenix.get_handle(), 'Citation') if self.get_widget("page_btn1").get_active() ^ use_handle1: phoenix.set_page(titanic.get_page()) diff --git a/gramps/gui/merge/mergeevent.py b/gramps/gui/merge/mergeevent.py index 4a0ed2936..1405e06d7 100644 --- a/gramps/gui/merge/mergeevent.py +++ b/gramps/gui/merge/mergeevent.py @@ -169,8 +169,7 @@ class MergeEvent(ManagedWindow): titanic = self.ev1 # Add second handle to history so that when merge is complete, # phoenix is the selected row. - self.uistate.viewmanager.active_page.get_history().push( - phoenix.get_handle()) + self.uistate.set_active(phoenix.get_handle(), 'Event') if self.get_widget("type_btn1").get_active() ^ use_handle1: phoenix.set_type(titanic.get_type()) diff --git a/gramps/gui/merge/mergefamily.py b/gramps/gui/merge/mergefamily.py index a896ab78a..25f6806ec 100644 --- a/gramps/gui/merge/mergefamily.py +++ b/gramps/gui/merge/mergefamily.py @@ -202,8 +202,7 @@ class MergeFamily(ManagedWindow): titanic = self.fy1 # Add second handle to history so that when merge is complete, # phoenix is the selected row. - self.uistate.viewmanager.active_page.get_history().push( - phoenix.get_handle()) + self.uistate.set_active(phoenix.get_handle(), 'Family') phoenix_fh = phoenix.get_father_handle() phoenix_mh = phoenix.get_mother_handle() diff --git a/gramps/gui/merge/mergemedia.py b/gramps/gui/merge/mergemedia.py index c3e7d8434..3c0a014ba 100644 --- a/gramps/gui/merge/mergemedia.py +++ b/gramps/gui/merge/mergemedia.py @@ -151,8 +151,7 @@ class MergeMedia(ManagedWindow): titanic = self.mo1 # Add second handle to history so that when merge is complete, # phoenix is the selected row. - self.uistate.viewmanager.active_page.get_history().push( - phoenix.get_handle()) + self.uistate.set_active(phoenix.get_handle(), 'Media') if self.get_widget("path_btn1").get_active() ^ use_handle1: phoenix.set_path(titanic.get_path()) diff --git a/gramps/gui/merge/mergenote.py b/gramps/gui/merge/mergenote.py index 6262b93ba..9cace7e77 100644 --- a/gramps/gui/merge/mergenote.py +++ b/gramps/gui/merge/mergenote.py @@ -163,8 +163,7 @@ class MergeNote(ManagedWindow): titanic = self.no1 # Add second handle to history so that when merge is complete, # phoenix is the selected row. - self.uistate.viewmanager.active_page.get_history().push( - phoenix.get_handle()) + self.uistate.set_active(phoenix.get_handle(), 'Note') if self.get_widget("text_btn1").get_active() ^ use_handle1: phoenix.set_styledtext(titanic.get_styledtext()) diff --git a/gramps/gui/merge/mergeperson.py b/gramps/gui/merge/mergeperson.py index 52cc2d128..b3f32a045 100644 --- a/gramps/gui/merge/mergeperson.py +++ b/gramps/gui/merge/mergeperson.py @@ -319,8 +319,7 @@ class MergePerson(ManagedWindow): titanic = self.pr1 # Add second handle to history so that when merge is complete, # phoenix is the selected row. - self.uistate.viewmanager.active_page.get_history().push( - phoenix.get_handle()) + self.uistate.set_active(phoenix.get_handle(), 'Person') if self.get_widget("name_btn1").get_active() ^ use_handle1: swapname = phoenix.get_primary_name() diff --git a/gramps/gui/merge/mergeplace.py b/gramps/gui/merge/mergeplace.py index dc212bc26..44550d8de 100644 --- a/gramps/gui/merge/mergeplace.py +++ b/gramps/gui/merge/mergeplace.py @@ -191,9 +191,7 @@ class MergePlace(ManagedWindow): titanic = self.pl1 # Add second handle to history so that when merge is complete, # phoenix is the selected row. - self.uistate.viewmanager.active_page.get_history().push( - phoenix.get_handle()) - + self.uistate.set_active(phoenix.get_handle(), 'Place') if self.get_widget("title_btn1").get_active() ^ use_handle1: phoenix.set_title(titanic.get_title()) diff --git a/gramps/gui/merge/mergerepository.py b/gramps/gui/merge/mergerepository.py index 9184d5941..9b2d96caa 100644 --- a/gramps/gui/merge/mergerepository.py +++ b/gramps/gui/merge/mergerepository.py @@ -142,8 +142,7 @@ class MergeRepository(ManagedWindow): titanic = self.rp1 # Add second handle to history so that when merge is complete, # phoenix is the selected row. - self.uistate.viewmanager.active_page.get_history().push( - phoenix.get_handle()) + self.uistate.set_active(phoenix.get_handle(), 'Repository') if self.get_widget("name_btn1").get_active() ^ use_handle1: phoenix.set_name(titanic.get_name()) diff --git a/gramps/gui/merge/mergesource.py b/gramps/gui/merge/mergesource.py index 5362b9155..feaa0ceb2 100644 --- a/gramps/gui/merge/mergesource.py +++ b/gramps/gui/merge/mergesource.py @@ -163,8 +163,7 @@ class MergeSource(ManagedWindow): titanic = self.src1 # Add second handle to history so that when merge is complete, # phoenix is the selected row. - self.uistate.viewmanager.active_page.get_history().push( - phoenix.get_handle()) + self.uistate.set_active(phoenix.get_handle(), 'Source') if self.get_widget("title_btn1").get_active() ^ use_handle1: phoenix.set_title(titanic.get_title())