SF.net SVN: geany:[3278] trunk

[ntrel at users.sourceforge.net]

Revision: 3278
          http://geany.svn.sourceforge.net/geany/?rev=3278&view=rev
Author:   ntrel
Date:     2008-11-25 12:09:08 +0000 (Tue, 25 Nov 2008)

Log Message:
-----------
Make 'Reload Configuration' command also reload ignore.tags.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/main.c
    trunk/src/symbols.c
    trunk/src/symbols.h

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-11-24 17:57:16 UTC (rev 3277)
+++ trunk/ChangeLog	2008-11-25 12:09:08 UTC (rev 3278)
@@ -1,3 +1,9 @@
+2008-11-25  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/main.c, src/symbols.c, src/symbols.h:
+   Make 'Reload Configuration' command also reload ignore.tags.
+
+
 2008-11-24  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
 
  * tagmanager/c.c:

Modified: trunk/src/main.c
===================================================================
--- trunk/src/main.c	2008-11-24 17:57:16 UTC (rev 3277)
+++ trunk/src/main.c	2008-11-25 12:09:08 UTC (rev 3278)
@@ -1186,5 +1186,8 @@
 		filetypes_load_config(i, TRUE);
 	}
 
+	/* C tag names to ignore */
+	symbols_reload_config_files();
+
 	ui_set_statusbar(TRUE, _("Configuration files reloaded."));
 }

Modified: trunk/src/symbols.c
===================================================================
--- trunk/src/symbols.c	2008-11-24 17:57:16 UTC (rev 3277)
+++ trunk/src/symbols.c	2008-11-25 12:09:08 UTC (rev 3278)
@@ -107,6 +107,8 @@
 /* get the tags_ignore list, exported by tagmanager's options.c */
 extern gchar **c_tags_ignore;
 
+/* ignore certain tokens when parsing C-like syntax.
+ * Also works for reloading. */
 static void load_c_ignore_tags(void)
 {
 	gchar *path = g_strconcat(app->configdir, G_DIR_SEPARATOR_S "ignore.tags", NULL);
@@ -114,6 +116,7 @@
 
 	if (g_file_get_contents(path, &content, NULL, NULL))
 	{
+		g_strfreev(c_tags_ignore);
 		c_tags_ignore = g_strsplit_set(content, " \n\r", -1);
 		g_free(content);
 	}
@@ -121,6 +124,12 @@
 }
 
 
+void symbols_reload_config_files(void)
+{
+	load_c_ignore_tags();
+}
+
+
 /* Ensure that the global tags file(s) for the file_type_idx filetype is loaded.
  * This provides autocompletion, calltips, etc. */
 void symbols_global_tags_loaded(gint file_type_idx)

Modified: trunk/src/symbols.h
===================================================================
--- trunk/src/symbols.h	2008-11-24 17:57:16 UTC (rev 3277)
+++ trunk/src/symbols.h	2008-11-25 12:09:08 UTC (rev 3278)
@@ -39,6 +39,8 @@
 
 void symbols_finalize(void);
 
+void symbols_reload_config_files(void);
+
 void symbols_global_tags_loaded(gint file_type_idx);
 
 GString *symbols_find_tags_as_string(GPtrArray *tags_array, guint tag_types, gint lang);


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