SF.net SVN: geany: [2556] branches/custom-filetypes

ntrel at users.sourceforge.net ntrel at xxxxx
Wed May 7 13:54:22 UTC 2008


Revision: 2556
          http://geany.svn.sourceforge.net/geany/?rev=2556&view=rev
Author:   ntrel
Date:     2008-05-07 06:54:21 -0700 (Wed, 07 May 2008)

Log Message:
-----------
Rename GEANY_FILETYPES_ALL GEANY_FILETYPES_NONE.

Modified Paths:
--------------
    branches/custom-filetypes/ChangeLog
    branches/custom-filetypes/src/build.c
    branches/custom-filetypes/src/dialogs.c
    branches/custom-filetypes/src/document.c
    branches/custom-filetypes/src/filetypes.c
    branches/custom-filetypes/src/filetypes.h
    branches/custom-filetypes/src/highlighting.c
    branches/custom-filetypes/src/keyfile.c
    branches/custom-filetypes/src/msgwindow.c
    branches/custom-filetypes/src/symbols.c
    branches/custom-filetypes/src/templates.c
    branches/custom-filetypes/src/ui_utils.c
    branches/custom-filetypes/src/utils.c
    branches/custom-filetypes/src/win32.c

Modified: branches/custom-filetypes/ChangeLog
===================================================================
--- branches/custom-filetypes/ChangeLog	2008-05-07 12:22:46 UTC (rev 2555)
+++ branches/custom-filetypes/ChangeLog	2008-05-07 13:54:21 UTC (rev 2556)
@@ -10,6 +10,11 @@
    Make Open dialog file filter work for custom filetypes.
  * plugins/pluginmacros.h:
    Add filetypes_array macro to allow use of filetypes[ft_id].
+ * src/templates.c, src/build.c, src/utils.c, src/win32.c,
+   src/highlighting.c, src/dialogs.c, src/msgwindow.c, src/keyfile.c,
+   src/filetypes.c, src/filetypes.h, src/document.c, src/symbols.c,
+   src/ui_utils.c:
+   Rename GEANY_FILETYPES_ALL GEANY_FILETYPES_NONE.
 
 
 2008-05-06  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: branches/custom-filetypes/src/build.c
===================================================================
--- branches/custom-filetypes/src/build.c	2008-05-07 12:22:46 UTC (rev 2555)
+++ branches/custom-filetypes/src/build.c	2008-05-07 13:54:21 UTC (rev 2556)
@@ -58,7 +58,7 @@
 #include "win32.h"
 
 
-BuildInfo build_info = {GBO_COMPILE, 0, NULL, GEANY_FILETYPES_ALL, NULL};
+BuildInfo build_info = {GBO_COMPILE, 0, NULL, GEANY_FILETYPES_NONE, NULL};
 
 static gchar *current_dir_entered = NULL;
 
@@ -66,7 +66,7 @@
 {
 	GPid pid;
 	gint file_type_id;
-} run_info = {0, GEANY_FILETYPES_ALL};
+} run_info = {0, GEANY_FILETYPES_NONE};
 
 #ifdef G_OS_WIN32
 static const gchar RUN_SCRIPT_CMD[] = "geany_run_script.bat";
@@ -1642,7 +1642,7 @@
 	if (idx == -1)
 		idx = document_get_cur_idx();
 	if (idx == -1 ||
-		(FILETYPE_ID(doc_list[idx].file_type) == GEANY_FILETYPES_ALL &&
+		(FILETYPE_ID(doc_list[idx].file_type) == GEANY_FILETYPES_NONE &&
 			doc_list[idx].file_name == NULL))
 	{
 		gtk_widget_set_sensitive(lookup_widget(app->window, "menu_build1"), FALSE);
@@ -1703,7 +1703,7 @@
 		((ft->actions->can_compile ||
 		ft->actions->can_link ||
 		ft->actions->can_exec) &&
-		FILETYPE_ID(ft) != GEANY_FILETYPES_ALL);
+		FILETYPE_ID(ft) != GEANY_FILETYPES_NONE);
 	if (menu_items->item_set_args)
 		gtk_widget_set_sensitive(menu_items->item_set_args, can_set_args);
 
@@ -1776,7 +1776,7 @@
 
 
 /* Creates the relevant build menu if necessary.
- * If filetype_idx is -1, the current filetype is used, or GEANY_FILETYPES_ALL */
+ * If filetype_idx is -1, the current filetype is used, or GEANY_FILETYPES_NONE */
 BuildMenuItems *build_get_menu_items(gint filetype_idx)
 {
 	BuildMenuItems *items;

Modified: branches/custom-filetypes/src/dialogs.c
===================================================================
--- branches/custom-filetypes/src/dialogs.c	2008-05-07 12:22:46 UTC (rev 2555)
+++ branches/custom-filetypes/src/dialogs.c	2008-05-07 13:54:21 UTC (rev 2556)
@@ -88,7 +88,7 @@
 		gboolean ro = (response == GEANY_RESPONSE_VIEW);	/* View clicked */
 
 		/* ignore detect from file item */
-		if (filetype_idx >= 0 && filetype_idx < GEANY_FILETYPES_ALL)
+		if (filetype_idx >= 0 && filetype_idx < GEANY_FILETYPES_NONE)
 			ft = filetypes[filetype_idx];
 		if (encoding_idx >= 0 && encoding_idx < GEANY_ENCODINGS_MAX)
 			charset = encodings[encoding_idx].charset;
@@ -203,13 +203,13 @@
 
 	/* add FileFilters(start with "All Files") */
 	gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(ui_widgets.open_filesel),
-				filetypes_create_file_filter(filetypes[GEANY_FILETYPES_ALL]));
+				filetypes_create_file_filter(filetypes[GEANY_FILETYPES_NONE]));
 	/* now create meta filter "All Source" */
 	gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(ui_widgets.open_filesel),
 				filetypes_create_file_filter_all_source());
 	for (i = 0; i < filetypes_array->len; i++)
 	{
-		if (i == GEANY_FILETYPES_ALL)
+		if (i == GEANY_FILETYPES_NONE)
 			continue;
 
 		gtk_combo_box_append_text(GTK_COMBO_BOX(filetype_combo), filetypes[i]->title);
@@ -555,7 +555,7 @@
 	{
 		gchar *fname = NULL;
 
-		if (doc_list[idx].file_type != NULL && doc_list[idx].file_type->id != GEANY_FILETYPES_ALL &&
+		if (doc_list[idx].file_type != NULL && doc_list[idx].file_type->id != GEANY_FILETYPES_NONE &&
 			doc_list[idx].file_type->extension != NULL)
 			fname = g_strconcat(GEANY_STRING_UNTITLED, ".",
 								doc_list[idx].file_type->extension, NULL);

Modified: branches/custom-filetypes/src/document.c
===================================================================
--- branches/custom-filetypes/src/document.c	2008-05-07 12:22:46 UTC (rev 2555)
+++ branches/custom-filetypes/src/document.c	2008-05-07 13:54:21 UTC (rev 2556)
@@ -633,13 +633,13 @@
 	/* store the opened encoding for undo/redo */
 	store_saved_encoding(idx);
 
-	/*document_set_filetype(idx, (ft == NULL) ? filetypes[GEANY_FILETYPES_ALL] : ft);*/
+	/*document_set_filetype(idx, (ft == NULL) ? filetypes[GEANY_FILETYPES_NONE] : ft);*/
 	if (ft == NULL && filename != NULL) /* guess the filetype from the filename if one is given */
 		ft = filetypes_detect_from_file(idx);
 
 	document_set_filetype(idx, ft);	/* also clears taglist */
 	if (ft == NULL)
-		highlighting_set_styles(doc_list[idx].sci, GEANY_FILETYPES_ALL);
+		highlighting_set_styles(doc_list[idx].sci, GEANY_FILETYPES_NONE);
 	ui_set_window_title(idx);
 	build_menu_update(idx);
 	document_update_tag_list(idx, FALSE);
@@ -1294,7 +1294,7 @@
 	if (! DOC_IDX_VALID(idx)) return FALSE;
 
 	/* detect filetype */
-	if (FILETYPE_ID(doc_list[idx].file_type) == GEANY_FILETYPES_ALL)
+	if (FILETYPE_ID(doc_list[idx].file_type) == GEANY_FILETYPES_NONE)
 	{
 		filetype *ft = filetypes_detect_from_file(idx);
 

Modified: branches/custom-filetypes/src/filetypes.c
===================================================================
--- branches/custom-filetypes/src/filetypes.c	2008-05-07 12:22:46 UTC (rev 2555)
+++ branches/custom-filetypes/src/filetypes.c	2008-05-07 13:54:21 UTC (rev 2556)
@@ -403,14 +403,14 @@
 	filetypes[GEANY_FILETYPES_REST]->comment_close = NULL;
 
 #define ALL
-	filetypes[GEANY_FILETYPES_ALL]->id = GEANY_FILETYPES_ALL;
-	filetypes[GEANY_FILETYPES_ALL]->name = g_strdup("None");
-	filetypes[GEANY_FILETYPES_ALL]->lang = -2;
-	filetypes[GEANY_FILETYPES_ALL]->title = g_strdup(_("All files"));
-	filetypes[GEANY_FILETYPES_ALL]->extension = g_strdup("*");
-	filetypes[GEANY_FILETYPES_ALL]->pattern = utils_strv_new("*", NULL);
-	filetypes[GEANY_FILETYPES_ALL]->comment_open = NULL;
-	filetypes[GEANY_FILETYPES_ALL]->comment_close = NULL;
+	filetypes[GEANY_FILETYPES_NONE]->id = GEANY_FILETYPES_NONE;
+	filetypes[GEANY_FILETYPES_NONE]->name = g_strdup("None");
+	filetypes[GEANY_FILETYPES_NONE]->lang = -2;
+	filetypes[GEANY_FILETYPES_NONE]->title = g_strdup(_("All files"));
+	filetypes[GEANY_FILETYPES_NONE]->extension = g_strdup("*");
+	filetypes[GEANY_FILETYPES_NONE]->pattern = utils_strv_new("*", NULL);
+	filetypes[GEANY_FILETYPES_NONE]->comment_open = NULL;
+	filetypes[GEANY_FILETYPES_NONE]->comment_close = NULL;
 }
 
 
@@ -506,7 +506,7 @@
 				sub_menu = sub_menu_misc;
 				break;
 			}
-			case GEANY_FILETYPES_ALL:	/* none */
+			case GEANY_FILETYPES_NONE:	/* none */
 			{
 				sub_menu = filetype_menu;
 				title = _("None");
@@ -534,7 +534,7 @@
 	gboolean ret = FALSE;
 
 	/* Don't match '*' because it comes before any custom filetypes */
-	if (ft->id == GEANY_FILETYPES_ALL)
+	if (ft->id == GEANY_FILETYPES_NONE)
 		return FALSE;
 
 	for (j = 0; ft->pattern[j] != NULL; j++)
@@ -569,7 +569,7 @@
 
 	ft = g_hash_table_find(filetypes_hash, match_basename, base_filename);
 	if (ft == NULL)
-		ft = filetypes[GEANY_FILETYPES_ALL];
+		ft = filetypes[GEANY_FILETYPES_NONE];
 
 	g_free(base_filename);
 	return ft;
@@ -655,7 +655,7 @@
 		return ft;
 
 	if (utf8_filename == NULL)
-		return filetypes[GEANY_FILETYPES_ALL];
+		return filetypes[GEANY_FILETYPES_NONE];
 
 	return filetypes_detect_from_extension(utf8_filename);
 }
@@ -668,7 +668,7 @@
 	gchar *line;
 
 	if (! DOC_IDX_VALID(idx))
-		return filetypes[GEANY_FILETYPES_ALL];
+		return filetypes[GEANY_FILETYPES_NONE];
 
 	line = sci_get_line(doc_list[idx].sci, 0);
 	ft = filetypes_detect_from_file_internal(doc_list[idx].file_name, line);
@@ -708,7 +708,7 @@
 	g_return_if_fail(app->ignore_callback);
 
 	if (ft == NULL)
-		ft = filetypes[GEANY_FILETYPES_ALL];
+		ft = filetypes[GEANY_FILETYPES_NONE];
 
 	fft = (FullFileType*)ft;
 	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(fft->menu_item), TRUE);
@@ -894,8 +894,8 @@
 	config = g_key_file_new();
 	config_home = g_key_file_new();
 	{
-		/* highlighting uses GEANY_FILETYPES_ALL for common settings */
-		gchar *ext = (ft_id != GEANY_FILETYPES_ALL) ?
+		/* highlighting uses GEANY_FILETYPES_NONE for common settings */
+		gchar *ext = (ft_id != GEANY_FILETYPES_NONE) ?
 			filetypes_get_conf_extension(ft_id) : g_strdup("common");
 		gchar *f0 = g_strconcat(app->datadir, G_DIR_SEPARATOR_S "filetypes.", ext, NULL);
 		gchar *f = g_strconcat(app->configdir,
@@ -940,7 +940,7 @@
 		G_DIR_SEPARATOR_S GEANY_FILEDEFS_SUBDIR G_DIR_SEPARATOR_S "filetypes.", NULL);
 	gint i;
 
-	for (i = 0; i < GEANY_FILETYPES_ALL; i++)
+	for (i = 0; i < GEANY_FILETYPES_NONE; i++)
 	{
 		struct build_programs *bp = filetypes[i]->programs;
 		GKeyFile *config_home;
@@ -985,7 +985,7 @@
 
 	for (i = 0; i < filetypes_array->len; i++)
 	{
-		if (i == GEANY_FILETYPES_ALL)
+		if (i == GEANY_FILETYPES_NONE)
 			continue;
 
 		for (j = 0; filetypes[i]->pattern[j]; j++)

Modified: branches/custom-filetypes/src/filetypes.h
===================================================================
--- branches/custom-filetypes/src/filetypes.h	2008-05-07 12:22:46 UTC (rev 2555)
+++ branches/custom-filetypes/src/filetypes.h	2008-05-07 13:54:21 UTC (rev 2556)
@@ -77,13 +77,13 @@
 	GEANY_FILETYPES_REST,
 	GEANY_FILETYPES_SQL,
 
-	GEANY_FILETYPES_ALL,	/* must be last filetype, used for 'None' item. */
+	GEANY_FILETYPES_NONE,	/* must be last filetype */
 	GEANY_MAX_BUILT_IN_FILETYPES	/* Use filetypes_array->len instead */
 } filetype_id;
 
 /* Safe wrapper to get the id field of a possibly NULL filetype pointer. */
 #define FILETYPE_ID(filetype_ptr) \
-	(((filetype_ptr) != NULL) ? (filetype_ptr)->id : GEANY_FILETYPES_ALL)
+	(((filetype_ptr) != NULL) ? (filetype_ptr)->id : GEANY_FILETYPES_NONE)
 
 
 struct build_actions

Modified: branches/custom-filetypes/src/highlighting.c
===================================================================
--- branches/custom-filetypes/src/highlighting.c	2008-05-07 12:22:46 UTC (rev 2555)
+++ branches/custom-filetypes/src/highlighting.c	2008-05-07 13:54:21 UTC (rev 2556)
@@ -273,7 +273,7 @@
 {
 	HighlightingStyle *style_ptr;
 
-	if (ft == GEANY_FILETYPES_ALL)
+	if (ft == GEANY_FILETYPES_NONE)
 		style_ptr = &common_style_set.styling[styling_index];
 	else
 		style_ptr = &style_sets[ft].styling[styling_index];
@@ -555,10 +555,10 @@
 
 	SSM(sci, SCI_SETFOLDMARGINCOLOUR, 1, invert(common_style_set.styling[GCS_MARGIN_FOLDING].background));
 	/*SSM(sci, SCI_SETFOLDMARGINHICOLOUR, 1, invert(common_style_set.styling[GCS_MARGIN_FOLDING].background));*/
-	set_sci_style(sci, STYLE_LINENUMBER, GEANY_FILETYPES_ALL, GCS_MARGIN_LINENUMBER);
-	set_sci_style(sci, STYLE_BRACELIGHT, GEANY_FILETYPES_ALL, GCS_BRACE_GOOD);
-	set_sci_style(sci, STYLE_BRACEBAD, GEANY_FILETYPES_ALL, GCS_BRACE_BAD);
-	set_sci_style(sci, STYLE_INDENTGUIDE, GEANY_FILETYPES_ALL, GCS_INDENT_GUIDE);
+	set_sci_style(sci, STYLE_LINENUMBER, GEANY_FILETYPES_NONE, GCS_MARGIN_LINENUMBER);
+	set_sci_style(sci, STYLE_BRACELIGHT, GEANY_FILETYPES_NONE, GCS_BRACE_GOOD);
+	set_sci_style(sci, STYLE_BRACEBAD, GEANY_FILETYPES_NONE, GCS_BRACE_BAD);
+	set_sci_style(sci, STYLE_INDENTGUIDE, GEANY_FILETYPES_NONE, GCS_INDENT_GUIDE);
 
 	/* bold = common whitespace settings enabled */
 	SSM(sci, SCI_SETWHITESPACEFORE, common_style_set.styling[GCS_WHITE_SPACE].bold,
@@ -1864,11 +1864,11 @@
 
 static void styleset_none(ScintillaObject *sci)
 {
-	const filetype_id ft_id = GEANY_FILETYPES_ALL;
+	const filetype_id ft_id = GEANY_FILETYPES_NONE;
 
 	SSM(sci, SCI_SETLEXER, SCLEX_NULL, 0);
 
-	set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_ALL, GCS_DEFAULT);
+	set_sci_style(sci, STYLE_DEFAULT, GEANY_FILETYPES_NONE, GCS_DEFAULT);
 
 	styleset_common(sci, 5, ft_id);
 
@@ -2944,12 +2944,12 @@
 void highlighting_init_styles(gint filetype_idx, GKeyFile *config, GKeyFile *configh)
 {
 	/* All stylesets depend on filetypes.common */
-	if (filetype_idx != GEANY_FILETYPES_ALL)
-		filetypes_load_config(GEANY_FILETYPES_ALL);
+	if (filetype_idx != GEANY_FILETYPES_NONE)
+		filetypes_load_config(GEANY_FILETYPES_NONE);
 
 	switch (filetype_idx)
 	{
-		init_styleset_case(GEANY_FILETYPES_ALL,		common);
+		init_styleset_case(GEANY_FILETYPES_NONE,		common);
 		init_styleset_case(GEANY_FILETYPES_ASM,		asm);
 		init_styleset_case(GEANY_FILETYPES_BASIC,	basic);
 		init_styleset_case(GEANY_FILETYPES_C,		c);
@@ -2997,7 +2997,7 @@
 	filetypes_load_config(filetype_idx);	/* load filetypes.ext */
 
 	/* load tags files (some lexers highlight global typenames) */
-	if (filetype_idx < GEANY_FILETYPES_ALL)
+	if (filetype_idx < GEANY_FILETYPES_NONE)
 		symbols_global_tags_loaded(filetype_idx);
 
 	switch (filetype_idx)
@@ -3035,7 +3035,7 @@
 		styleset_case(GEANY_FILETYPES_VHDL,		vhdl);
 		styleset_case(GEANY_FILETYPES_XML,		xml);
 		default:
-		styleset_case(GEANY_FILETYPES_ALL,		none);
+		styleset_case(GEANY_FILETYPES_NONE,		none);
 	}
 }
 

Modified: branches/custom-filetypes/src/keyfile.c
===================================================================
--- branches/custom-filetypes/src/keyfile.c	2008-05-07 12:22:46 UTC (rev 2555)
+++ branches/custom-filetypes/src/keyfile.c	2008-05-07 13:54:21 UTC (rev 2556)
@@ -121,7 +121,7 @@
 	filetype *ft = doc_list[idx].file_type;
 
 	if (ft == NULL)	/* can happen when saving a new file when quitting */
-		ft = filetypes[GEANY_FILETYPES_ALL];
+		ft = filetypes[GEANY_FILETYPES_NONE];
 
 	fname = g_strdup_printf("%d;%s;%d;%d;%d;%d;%d;%s;",
 		sci_get_current_position(doc_list[idx].sci),

Modified: branches/custom-filetypes/src/msgwindow.c
===================================================================
--- branches/custom-filetypes/src/msgwindow.c	2008-05-07 12:22:46 UTC (rev 2555)
+++ branches/custom-filetypes/src/msgwindow.c	2008-05-07 13:54:21 UTC (rev 2556)
@@ -737,7 +737,7 @@
 		case GEANY_FILETYPES_LATEX:
 			/* ./kommtechnik_2b.tex:18: Emergency stop. */
 		case GEANY_FILETYPES_MAKE:	/* Assume makefile is building with gcc */
-		case GEANY_FILETYPES_ALL:
+		case GEANY_FILETYPES_NONE:
 		default:	/* The default is a GNU gcc type error */
 		{
 			if (build_info.file_type_id == GEANY_FILETYPES_JAVA &&

Modified: branches/custom-filetypes/src/symbols.c
===================================================================
--- branches/custom-filetypes/src/symbols.c	2008-05-07 12:22:46 UTC (rev 2555)
+++ branches/custom-filetypes/src/symbols.c	2008-05-07 13:54:21 UTC (rev 2556)
@@ -1102,7 +1102,7 @@
 
 		g_free(utf8_fname);
 
-		if (FILETYPE_ID(ft) < GEANY_FILETYPES_ALL)
+		if (FILETYPE_ID(ft) < GEANY_FILETYPES_NONE)
 		{
 			fnames = g_hash_table_lookup(hash, ft);	/* may be NULL */
 			fnames = g_list_append(fnames, fname);
@@ -1138,13 +1138,13 @@
 
 static void load_user_tags(filetype_id ft_id)
 {
-	static guchar tags_loaded[GEANY_FILETYPES_ALL] = {0};
+	static guchar tags_loaded[GEANY_FILETYPES_NONE] = {0};
 	static GHashTable *lang_hash = NULL;
 	GList *fnames;
 	const GList *node;
 	const filetype *ft = filetypes[ft_id];
 
-	g_return_if_fail(ft_id < GEANY_FILETYPES_ALL);
+	g_return_if_fail(ft_id < GEANY_FILETYPES_NONE);
 
 	if (tags_loaded[ft_id])
 		return;

Modified: branches/custom-filetypes/src/templates.c
===================================================================
--- branches/custom-filetypes/src/templates.c	2008-05-07 12:22:46 UTC (rev 2555)
+++ branches/custom-filetypes/src/templates.c	2008-05-07 13:54:21 UTC (rev 2556)
@@ -298,7 +298,7 @@
 
 		switch (ft_id)
 		{
-			case GEANY_FILETYPES_ALL:	TEMPLATES_CREATE_FILE(fname, templates_filetype_none); break;
+			case GEANY_FILETYPES_NONE:	TEMPLATES_CREATE_FILE(fname, templates_filetype_none); break;
 			case GEANY_FILETYPES_C:		TEMPLATES_CREATE_FILE(fname, templates_filetype_c); break;
 			case GEANY_FILETYPES_CPP:	TEMPLATES_CREATE_FILE(fname, templates_filetype_cpp); break;
 			case GEANY_FILETYPES_D:		TEMPLATES_CREATE_FILE(fname, templates_filetype_d); break;
@@ -346,7 +346,7 @@
 
 		if (ft_templates[ft_id] == NULL)
 			continue;
-		if (ft_id == GEANY_FILETYPES_ALL)
+		if (ft_id == GEANY_FILETYPES_NONE)
 			label = _("None");
 		tmp_menu = gtk_menu_item_new_with_label(label);
 		tmp_button = gtk_menu_item_new_with_label(label);
@@ -482,7 +482,7 @@
 			break;
 		}
 
-		case GEANY_FILETYPES_ALL:
+		case GEANY_FILETYPES_NONE:
 		{
 			line_prefix = "";
 			break;
@@ -545,7 +545,7 @@
 
 	if (fname == NULL)
 	{
-		if (ft_id == GEANY_FILETYPES_ALL)
+		if (ft_id == GEANY_FILETYPES_NONE)
 			shortname = g_strdup(GEANY_STRING_UNTITLED);
 		else
 			shortname = g_strconcat(GEANY_STRING_UNTITLED, ".", ft->extension, NULL);
@@ -580,7 +580,7 @@
 	gchar *ft_template = NULL;
 	gchar *file_header = NULL;
 
-	if (FILETYPE_ID(ft) == GEANY_FILETYPES_ALL)
+	if (FILETYPE_ID(ft) == GEANY_FILETYPES_NONE)
 		return get_file_template(ft);
 
 	file_header = templates_get_template_fileheader(ft->id, NULL);	/* file template only used for new files */

Modified: branches/custom-filetypes/src/ui_utils.c
===================================================================
--- branches/custom-filetypes/src/ui_utils.c	2008-05-07 12:22:46 UTC (rev 2555)
+++ branches/custom-filetypes/src/ui_utils.c	2008-05-07 13:54:21 UTC (rev 2556)
@@ -130,8 +130,8 @@
 		const gchar *cur_tag;
 		gchar *filetype_name;
 
-		/* workaround to make the name of filetype GEANY_FILETYPES_ALL translatable */
-		if (doc_list[idx].file_type == NULL || doc_list[idx].file_type->id == GEANY_FILETYPES_ALL)
+		/* workaround to make the name of filetype GEANY_FILETYPES_NONE translatable */
+		if (doc_list[idx].file_type == NULL || doc_list[idx].file_type->id == GEANY_FILETYPES_NONE)
 			filetype_name = _("None");
 		else
 			filetype_name = doc_list[idx].file_type->name;

Modified: branches/custom-filetypes/src/utils.c
===================================================================
--- branches/custom-filetypes/src/utils.c	2008-05-07 12:22:46 UTC (rev 2555)
+++ branches/custom-filetypes/src/utils.c	2008-05-07 13:54:21 UTC (rev 2556)
@@ -607,7 +607,7 @@
 	/* parse the current function name here because TM line numbers may have changed,
 	 * and it would take too long to reparse the whole file. */
 	if (doc_list[idx].file_type != NULL &&
-		doc_list[idx].file_type->id != GEANY_FILETYPES_ALL)
+		doc_list[idx].file_type->id != GEANY_FILETYPES_NONE)
 	{
 		const gint fn_fold = get_function_fold_number(idx);
 

Modified: branches/custom-filetypes/src/win32.c
===================================================================
--- branches/custom-filetypes/src/win32.c	2008-05-07 12:22:46 UTC (rev 2555)
+++ branches/custom-filetypes/src/win32.c	2008-05-07 13:54:21 UTC (rev 2556)
@@ -128,14 +128,14 @@
 	if (project_files)
 	{
 		string = g_strconcat(_("Geany project files"), "\t", "*." GEANY_PROJECT_EXT, "\t",
-			filetypes[GEANY_FILETYPES_ALL]->title, "\t",
-			filetypes[GEANY_FILETYPES_ALL]->pattern[0], "\t", NULL);
+			filetypes[GEANY_FILETYPES_NONE]->title, "\t",
+			filetypes[GEANY_FILETYPES_NONE]->pattern[0], "\t", NULL);
 	}
 	else
 	{
 		string = g_strconcat(_("Executables"), "\t", "*.exe;*.bat;*.cmd", "\t",
-			filetypes[GEANY_FILETYPES_ALL]->title, "\t",
-			filetypes[GEANY_FILETYPES_ALL]->pattern[0], "\t", NULL);
+			filetypes[GEANY_FILETYPES_NONE]->title, "\t",
+			filetypes[GEANY_FILETYPES_NONE]->pattern[0], "\t", NULL);
 	}
 
 	/* replace all "\t"s by \0 */
@@ -332,7 +332,7 @@
 	of.lpstrFilter = filters;
 
 	of.lpstrCustomFilter = NULL;
-	of.nFilterIndex = GEANY_FILETYPES_ALL + 1;
+	of.nFilterIndex = GEANY_FILETYPES_NONE + 1;
 	of.lpstrFile = fname;
 	of.lpstrInitialDir = initial_dir;
 	of.nMaxFile = 2048;


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



More information about the Commits mailing list