SF.net SVN: geany:[5792] branches/0.20.1

[colombanw at users.sourceforge.net]

Revision: 5792
          http://geany.svn.sourceforge.net/geany/?rev=5792&view=rev
Author:   colombanw
Date:     2011-05-09 17:41:08 +0000 (Mon, 09 May 2011)

Log Message:
-----------
Avoid changing the tag tree if it's not the one of the current document

Modified Paths:
--------------
    branches/0.20.1/ChangeLog
    branches/0.20.1/src/sidebar.c

Modified: branches/0.20.1/ChangeLog
===================================================================
--- branches/0.20.1/ChangeLog	2011-05-09 17:40:47 UTC (rev 5791)
+++ branches/0.20.1/ChangeLog	2011-05-09 17:41:08 UTC (rev 5792)
@@ -33,6 +33,10 @@
    be quoted, adding support for XML (closes #3183506).
  * src/main.c, src/prefs.c, src/tools.c:
    Fix loading and updating menu accelerators for custom commands.
+ * src/sidebar.c:
+   Avoid changing the tag tree if it's not the one of the current
+   document, fixing showing the wrong tag list when reloading
+   configuration files.
 
 
 2011-05-08  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>

Modified: branches/0.20.1/src/sidebar.c
===================================================================
--- branches/0.20.1/src/sidebar.c	2011-05-09 17:40:47 UTC (rev 5791)
+++ branches/0.20.1/src/sidebar.c	2011-05-09 17:41:08 UTC (rev 5792)
@@ -195,7 +195,10 @@
 	/* changes the tree view to the given one, trying not to do useless changes */
 	#define CHANGE_TREE(new_child) \
 		G_STMT_START { \
-			if (child != new_child) \
+			/* only change the tag tree if it's actually not the same (to avoid flickering) and if
+			 * it's the one of the current document (to avoid problems when e.g. reloading
+			 * configuration files */ \
+			if (child != new_child && doc == document_get_current()) \
 			{ \
 				if (child) \
 					gtk_container_remove(GTK_CONTAINER(tag_window), child); \


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.