Commit: 95a8c326408bab6be21d60efb4012b1c410e3fe3 - dia (git)

作図ソフト dia の改良版

Commit MetaInfo

• Révision: 95a8c326408bab6be21d60efb4012b1c410e3fe3 (tree)
• l'heure: 2001-06-15 01:06:31
• Auteur: Cyrille Chepelov <cyrille@src....>
• Commiter: Cyrille Chepelov

Message de Log

corrected the degraded mode for when !HAVE_UNICODE. Thanks to Ben A.

* lib/charconv.c: corrected the degraded mode for when
!HAVE_UNICODE. Thanks to Ben A. Hetland for reporting this.

Change Summary

• modified: ChangeLog
• modified: lib/charconv.c

Modification

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
[phone]  Cyrille Chepelov  <[e-mail]>
+
+	* lib/charconv.c: corrected the degraded mode for when
+	!HAVE_UNICODE. Thanks to Ben A. Hetland for reporting this.	
+	
 2001-06-13  Cyrille Chepelov  <[e-mail]>
 
 	* lib/properties.[ch]: convenience macros around PROP_NOTEBOOKS ;

--- a/lib/charconv.c
+++ b/lib/charconv.c
@@ -23,7 +23,14 @@
 #include <config.h>
 
 #include <glib.h>
+
+#ifdef HAVE_UNICODE
 #define UNICODE_WORK_IN_PROGRESS /* here, it's mandatory or we break. */
+#else
+/* we won't actually break, because the code which is here will dumb itself
+down to nops and strdups */
+#endif
+
 #include "charconv.h" 
 
 #ifdef HAVE_UNICODE
@@ -58,8 +65,12 @@ int get_local_charset(char **charset)
     *charset = this_charset;
     return local_is_utf8;
   }
- 
+
+#ifdef HAVE_UNICODE 
   local_is_utf8 = unicode_get_charset(charset);
+#else
+  *charset = NULL;
+#endif
   this_charset = *charset;
   if (local_is_utf8) {
     return local_is_utf8;