SF.net SVN: geany:[3429] trunk
eht16 at users.sourceforge.net
eht16 at xxxxx
Mon Dec 29 10:41:04 UTC 2008
Revision: 3429
http://geany.svn.sourceforge.net/geany/?rev=3429&view=rev
Author: eht16
Date: 2008-12-29 10:41:04 +0000 (Mon, 29 Dec 2008)
Log Message:
-----------
Avoid unnecessary critical warnings when setting tooltips for the symbol list with non-UTF-8 files (closes #2473376).
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/symbols.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-12-28 17:25:09 UTC (rev 3428)
+++ trunk/ChangeLog 2008-12-29 10:41:04 UTC (rev 3429)
@@ -1,3 +1,10 @@
+2008-12-29 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/symbols.c:
+ Avoid unnecessary critical warnings when setting tooltips for the
+ symbol list with non-UTF-8 files (closes #2473376).
+
+
2008-12-28 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
* src/prefs.c, src/geanyobject.c, src/geanyobject.h, src/stash.c,
Modified: trunk/src/symbols.c
===================================================================
--- trunk/src/symbols.c 2008-12-28 17:25:09 UTC (rev 3428)
+++ trunk/src/symbols.c 2008-12-29 10:41:04 UTC (rev 3429)
@@ -885,7 +885,9 @@
/* encodings_convert_to_utf8_from_charset() fails with charset "None", so skip conversion
* for None at this point completely */
- if (! utils_str_equal(doc->encoding, "UTF-8") && ! utils_str_equal(doc->encoding, "None"))
+ if (utf8_name != NULL &&
+ ! utils_str_equal(doc->encoding, "UTF-8") &&
+ ! utils_str_equal(doc->encoding, "None"))
{
setptr(utf8_name,
encodings_convert_to_utf8_from_charset(utf8_name, -1, doc->encoding, TRUE));
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