mirror of
git://slackware.nl/current.git
synced 2024-12-27 09:59:16 +01:00
646a5c1cbf
a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
38 lines
1.2 KiB
Diff
38 lines
1.2 KiB
Diff
--- gtk+-1.2.10/gdk/gdkfont.c.utf8fontset Sun Apr 1 22:31:25 2001
|
|
+++ gtk+-1.2.10/gdk/gdkfont.c Tue Jul 10 11:31:54 2001
|
|
@@ -26,6 +26,7 @@
|
|
|
|
#include <X11/Xlib.h>
|
|
#include <X11/Xos.h>
|
|
+#include <langinfo.h>
|
|
#include "gdk.h"
|
|
#include "gdkprivate.h"
|
|
|
|
@@ -173,9 +174,24 @@
|
|
if (missing_charset_count)
|
|
{
|
|
gint i;
|
|
- g_warning ("Missing charsets in FontSet creation\n");
|
|
- for (i=0;i<missing_charset_count;i++)
|
|
- g_warning (" %s\n", missing_charset_list[i]);
|
|
+ const char *codeset;
|
|
+
|
|
+ codeset = nl_langinfo (CODESET);
|
|
+
|
|
+ /* Hack - UTF-8 is likely to be rendered with a list of
|
|
+ * possible legacy fallback charsets, so a failure here
|
|
+ * shouldn't be warned about. But we don't want to suppress
|
|
+ * this warning in general, since for other character sets
|
|
+ * it gives a useful indication of what went wrong.
|
|
+ */
|
|
+ if (g_strcasecmp (codeset, "utf-8") != 0 &&
|
|
+ g_strcasecmp (codeset, "utf8") != 0)
|
|
+ {
|
|
+ g_warning ("Missing charsets in FontSet creation\n");
|
|
+ for (i=0;i<missing_charset_count;i++)
|
|
+ g_warning (" %s\n", missing_charset_list[i]);
|
|
+ }
|
|
+
|
|
XFreeStringList (missing_charset_list);
|
|
}
|
|
|