gok r2600 - in trunk: . gok

[gerdk svn gnome org]

Author: gerdk
Date: Sat Nov 22 23:01:19 2008
New Revision: 2600
URL: http://svn.gnome.org/viewvc/gok?rev=2600&view=rev

Log:
2008-11-22  Gerd Kohlberger  <gerdk svn gnome org>

	* gok/gok-chunker.c:(gok_chunker_delete_chunks): don't try to
	unhighlight chunk items that are already freed.

	Fixes bug #561871.



Modified:
   trunk/ChangeLog
   trunk/gok/gok-chunker.c

Modified: trunk/gok/gok-chunker.c
==============================================================================
--- trunk/gok/gok-chunker.c	(original)
+++ trunk/gok/gok-chunker.c	Sat Nov 22 23:01:19 2008
@@ -2017,6 +2017,12 @@
 	gok_log_enter();
 	while (pChunk != NULL)
 	{
+		/* defensive */
+		if (pChunk == m_pChunkHighlighted) {
+			gok_chunker_unhighlight_chunk (m_pChunkHighlighted);
+			m_pChunkHighlighted = NULL;
+		}
+
 		/* delete all the chunk items */
 		pChunkitem = pChunk->pChunkitem;
 		while (pChunkitem != NULL)
@@ -2035,12 +2041,6 @@
 			gok_chunker_delete_chunks (pChunkTemp->pChunkChild, TRUE);
 		}
 		
-		/* defensive */
-		if (pChunkTemp == m_pChunkHighlighted) {
-			gok_chunker_unhighlight_chunk (m_pChunkHighlighted);
-			m_pChunkHighlighted = NULL;
-		}
-		
 		g_free (pChunkTemp);
 		
 		/* keep deleting the following chunks? */
@@ -2180,7 +2180,6 @@
 	GokKey* pKeyToTop;
 	GokKey* pKeyHighlighted;
 
-fprintf(stderr, "gok_chunker_keyup\n");
 	pKeyHighlighted = gok_feedback_get_highlighted_key();
 
 	pKeyboard = gok_main_get_current_keyboard();