Merge lp:~fmos/zim/bugfixes into lp:~jaap.karssenberg/zim/pyzim

[Fabian Stanke]

Test covering GUI updates during a page move.
Bug fix for index update causing crash when trying to update the moved (and thus non-existing) row in PageTreeStore.select_page.

=== modified file 'tests/data/notebook-wiki.xml'
--- tests/data/notebook-wiki.xml	2012-02-09 03:38:46 +0000
+++ tests/data/notebook-wiki.xml	2012-05-18 05:32:28 +0000
@@ -370,4 +370,8 @@
 <page name="Parent:Daughter:SomeOne:Bar">For page.menu template variable test</page>
 <page name="Parent:Child:Grandchild">For page.menu template variable test</page>
 
+<page name="Movers">Subpages will be moved</page>
+<page name="Movers:Stator">Non-mover</page>
+<page name="Movers:Stator:Mover">Move me</page>
+
 </pagelist>
 
=== modified file 'tests/gui.py'
--- tests/gui.py	2012-05-17 17:14:44 +0000
+++ tests/gui.py	2012-05-18 05:32:28 +0000
@@ -579,7 +579,32 @@
 		self.ui.save_page()
 		self.assertFalse(self.ui.page.get_parsetree() is None)
 
-	# TODO notebook manipulation (new (sub)page, move, rename, delete ..)
+	def testPageMove(self):
+		oldpath, newpath = Path('Movers:Stator:Mover'), Path('Movers:Mover')
+
+		# Open page and process message queue to sync tree view
+		indexpath = self.ui.notebook.index.lookup_path(oldpath)
+		self.ui.open_page(indexpath)
+		while gtk.events_pending():
+			gtk.main_iteration(False)
+
+		# Test actual moving
+		page = self.ui.notebook.get_page(oldpath)
+		text = page.dump('wiki')
+		self.ui.notebook.index.ensure_update()
+		self.ui.notebook.move_page(oldpath, newpath)
+		self.ui.notebook.index.ensure_update()
+
+		# newpath should exist and look like the old one
+		page = self.ui.notebook.get_page(newpath)
+		self.assertEqual(page.dump('wiki'), text)
+
+		# oldpath should be deleted
+		page = self.ui.notebook.get_page(oldpath)
+		self.assertFalse(page.haschildren)
+		self.assertFalse(page.hascontent)
+
+	# TODO notebook manipulation (new (sub)page, rename, delete ..)
 	# merge with tests for dialogs (?)
 
 	def testClipboard(self):
 
=== modified file 'zim/gui/pageindex.py'
--- zim/gui/pageindex.py	2012-03-27 19:00:32 +0000
+++ zim/gui/pageindex.py	2012-05-18 05:32:28 +0000
@@ -204,7 +204,10 @@
 			if mypath:
 				treepath = self.get_treepath(mypath)
 				if treepath:
-					treeiter = self.get_iter(treepath)
+					try:
+						treeiter = self.get_iter(treepath)
+					except ValueError:
+						continue
 					self.emit('row-changed', treepath, treeiter)
 
 	def on_get_flags(self):