Blame gtk+-1.2.10-utf8fontset.patch
|
 |
9fcb0f8 |
--- gtk+-1.2.10/gdk/gdkfont.c.utf8fontset Sun Apr 1 22:31:25 2001
|
|
|
9fcb0f8 |
+++ gtk+-1.2.10/gdk/gdkfont.c Tue Jul 10 11:31:54 2001
|
|
|
9fcb0f8 |
@@ -26,6 +26,7 @@
|
|
|
9fcb0f8 |
|
|
|
9fcb0f8 |
#include <X11/Xlib.h>
|
|
|
9fcb0f8 |
#include <X11/Xos.h>
|
|
|
9fcb0f8 |
+#include <langinfo.h>
|
|
|
9fcb0f8 |
#include "gdk.h"
|
|
|
9fcb0f8 |
#include "gdkprivate.h"
|
|
|
9fcb0f8 |
|
|
|
9fcb0f8 |
@@ -173,9 +174,24 @@
|
|
|
9fcb0f8 |
if (missing_charset_count)
|
|
|
9fcb0f8 |
{
|
|
|
9fcb0f8 |
gint i;
|
|
|
9fcb0f8 |
- g_warning ("Missing charsets in FontSet creation\n");
|
|
|
9fcb0f8 |
- for (i=0;i
|
|
|
9fcb0f8 |
- g_warning (" %s\n", missing_charset_list[i]);
|
|
|
9fcb0f8 |
+ const char *codeset;
|
|
|
9fcb0f8 |
+
|
|
|
9fcb0f8 |
+ codeset = nl_langinfo (CODESET);
|
|
|
9fcb0f8 |
+
|
|
|
9fcb0f8 |
+ /* Hack - UTF-8 is likely to be rendered with a list of
|
|
|
9fcb0f8 |
+ * possible legacy fallback charsets, so a failure here
|
|
|
9fcb0f8 |
+ * shouldn't be warned about. But we don't want to suppress
|
|
|
9fcb0f8 |
+ * this warning in general, since for other character sets
|
|
|
9fcb0f8 |
+ * it gives a useful indication of what went wrong.
|
|
|
9fcb0f8 |
+ */
|
|
|
9fcb0f8 |
+ if (g_strcasecmp (codeset, "utf-8") != 0 &&
|
|
|
9fcb0f8 |
+ g_strcasecmp (codeset, "utf8") != 0)
|
|
|
9fcb0f8 |
+ {
|
|
|
9fcb0f8 |
+ g_warning ("Missing charsets in FontSet creation\n");
|
|
|
9fcb0f8 |
+ for (i=0;i
|
|
|
9fcb0f8 |
+ g_warning (" %s\n", missing_charset_list[i]);
|
|
|
9fcb0f8 |
+ }
|
|
|
9fcb0f8 |
+
|
|
|
9fcb0f8 |
XFreeStringList (missing_charset_list);
|
|
|
9fcb0f8 |
}
|
|
|
9fcb0f8 |
|