SF.net SVN: geany:[5365] trunk

[ntrel at users.sourceforge.net]

Revision: 5365
          http://geany.svn.sourceforge.net/geany/?rev=5365&view=rev
Author:   ntrel
Date:     2010-11-04 16:45:47 +0000 (Thu, 04 Nov 2010)

Log Message:
-----------
Do not translate 'name' field for filetype None because it is used
for hash table lookup. This fixes missing files in the Open dialog
for the 'All files' filter with non-English locales (thanks to Sardem
FF7).

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/filetypes.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-11-03 19:07:27 UTC (rev 5364)
+++ trunk/ChangeLog	2010-11-04 16:45:47 UTC (rev 5365)
@@ -1,3 +1,12 @@
+2010-11-04  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/filetypes.c:
+   Do not translate 'name' field for filetype None because it is used
+   for hash table lookup. This fixes missing files in the Open dialog
+   for the 'All files' filter with non-English locales (thanks to Sardem
+   FF7).
+
+
 2010-11-02  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
 
  * src/plugindata.h, src/plugins.c, plugins/geanyfunctions.h:
@@ -16,7 +25,8 @@
    Print "GIO" and "built-in regex" if enabled with --version.
  * src/document.c:
    Use g_file_replace_contents() if available to save documents - this
-   should help workaround bugs in GVFS.
+   should help workaround bugs in GVFS (based on patch by Alexey
+   Antipov, thanks).
    Needs testing.
  * src/templates.c:
    Fix wrongly adding newlines for templates on disk that don't have

Modified: trunk/src/filetypes.c
===================================================================
--- trunk/src/filetypes.c	2010-11-03 19:07:27 UTC (rev 5364)
+++ trunk/src/filetypes.c	2010-11-04 16:45:47 UTC (rev 5365)
@@ -93,7 +93,8 @@
 
 #define NONE	/* these macros are only to ease navigation */
 	ft = filetypes[GEANY_FILETYPES_NONE];
-	ft->name = g_strdup(_("None"));
+	/* ft->name must not be translated as it is used for filetype lookup */
+	ft->name = g_strdup("None");
 	ft->title = g_strdup(_("None"));
 	ft->group = GEANY_FILETYPE_GROUP_NONE;
 


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