SF.net SVN: geany:[4646] branches/geany-0.18.1

[eht16 at users.sourceforge.net]

Revision: 4646
          http://geany.svn.sourceforge.net/geany/?rev=4646&view=rev
Author:   eht16
Date:     2010-02-06 17:41:43 +0000 (Sat, 06 Feb 2010)

Log Message:
-----------
When reloading configuration, process the current document at last so the symbol list will be updated correctly.

Modified Paths:
--------------
    branches/geany-0.18.1/ChangeLog
    branches/geany-0.18.1/src/main.c

Modified: branches/geany-0.18.1/ChangeLog
===================================================================
--- branches/geany-0.18.1/ChangeLog	2010-02-06 17:41:19 UTC (rev 4645)
+++ branches/geany-0.18.1/ChangeLog	2010-02-06 17:41:43 UTC (rev 4646)
@@ -3,6 +3,9 @@
  * src/geanymenubuttonaction.c, src/templates.c:
    Unref the new files toolbar menu when setting a new menu to fix
    possible crashes when reloading configuration.
+ * src/main.c:
+   When reloading configuration, process the current document at last
+   so the symbol list will be updated correctly.
 
 
 2010-02-01  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: branches/geany-0.18.1/src/main.c
===================================================================
--- branches/geany-0.18.1/src/main.c	2010-02-06 17:41:19 UTC (rev 4645)
+++ branches/geany-0.18.1/src/main.c	2010-02-06 17:41:43 UTC (rev 4646)
@@ -1188,6 +1188,7 @@
 void main_reload_configuration(void)
 {
 	guint i;
+	GeanyDocument *current_doc;
 
 	/* reload templates */
 	templates_free_templates();
@@ -1209,8 +1210,15 @@
 		/* filetypes_load_config() will skip not loaded filetypes */
 		filetypes_load_config(i, TRUE);
 	}
+	/* update document styling */
+	current_doc = document_get_current();
 	documents_foreach(i)
-		document_reload_config(documents[i]);
+	{
+		if (current_doc != documents[i])
+			document_reload_config(documents[i]);
+	}
+	/* process the current document at last */
+	document_reload_config(current_doc);
 
 	/* C tag names to ignore */
 	symbols_reload_config_files();


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