From 9c35df3de3553b0bc94d1dc8ef539dd23a19ddc4 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sun, 28 Oct 2001 21:05:03 +0000 Subject: [PATCH] Add missing g_pattern_match_simple and g_pattern_spec_equal. 2001-10-28 Tor Lillqvist * glib/glib.def: Add missing g_pattern_match_simple and g_pattern_spec_equal. * glib/gwin32.c (g_win32_get_package_installation_subdirectory): Set separator correctly. * glib/libcharset/config.charset (os): Match also mingw*. * tests/testglib.c (main): (Win32): Print the lib/locale subdirectory, as that is what actually gets used. --- ChangeLog | 13 +++++++++++++ ChangeLog.pre-2-0 | 13 +++++++++++++ ChangeLog.pre-2-10 | 13 +++++++++++++ ChangeLog.pre-2-12 | 13 +++++++++++++ ChangeLog.pre-2-2 | 13 +++++++++++++ ChangeLog.pre-2-4 | 13 +++++++++++++ ChangeLog.pre-2-6 | 13 +++++++++++++ ChangeLog.pre-2-8 | 13 +++++++++++++ glib/glib.def | 2 ++ glib/gwin32.c | 8 ++++++-- glib/libcharset/config.charset | 2 +- tests/testglib.c | 2 +- 12 files changed, 114 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0d6f0fee4..698d7c23e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2001-10-28 Tor Lillqvist + + * glib/glib.def: Add missing g_pattern_match_simple and + g_pattern_spec_equal. + + * glib/gwin32.c (g_win32_get_package_installation_subdirectory): + Set separator correctly. + + * glib/libcharset/config.charset (os): Match also mingw*. + + * tests/testglib.c (main): (Win32): Print the lib/locale + subdirectory, as that is what actually gets used. + Wed Oct 24 11:10:54 2001 Owen Taylor * configure.in: Version 1.3.10, interface age, binary age = 0. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 0d6f0fee4..698d7c23e 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,16 @@ +2001-10-28 Tor Lillqvist + + * glib/glib.def: Add missing g_pattern_match_simple and + g_pattern_spec_equal. + + * glib/gwin32.c (g_win32_get_package_installation_subdirectory): + Set separator correctly. + + * glib/libcharset/config.charset (os): Match also mingw*. + + * tests/testglib.c (main): (Win32): Print the lib/locale + subdirectory, as that is what actually gets used. + Wed Oct 24 11:10:54 2001 Owen Taylor * configure.in: Version 1.3.10, interface age, binary age = 0. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 0d6f0fee4..698d7c23e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,16 @@ +2001-10-28 Tor Lillqvist + + * glib/glib.def: Add missing g_pattern_match_simple and + g_pattern_spec_equal. + + * glib/gwin32.c (g_win32_get_package_installation_subdirectory): + Set separator correctly. + + * glib/libcharset/config.charset (os): Match also mingw*. + + * tests/testglib.c (main): (Win32): Print the lib/locale + subdirectory, as that is what actually gets used. + Wed Oct 24 11:10:54 2001 Owen Taylor * configure.in: Version 1.3.10, interface age, binary age = 0. diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 0d6f0fee4..698d7c23e 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,16 @@ +2001-10-28 Tor Lillqvist + + * glib/glib.def: Add missing g_pattern_match_simple and + g_pattern_spec_equal. + + * glib/gwin32.c (g_win32_get_package_installation_subdirectory): + Set separator correctly. + + * glib/libcharset/config.charset (os): Match also mingw*. + + * tests/testglib.c (main): (Win32): Print the lib/locale + subdirectory, as that is what actually gets used. + Wed Oct 24 11:10:54 2001 Owen Taylor * configure.in: Version 1.3.10, interface age, binary age = 0. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 0d6f0fee4..698d7c23e 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,16 @@ +2001-10-28 Tor Lillqvist + + * glib/glib.def: Add missing g_pattern_match_simple and + g_pattern_spec_equal. + + * glib/gwin32.c (g_win32_get_package_installation_subdirectory): + Set separator correctly. + + * glib/libcharset/config.charset (os): Match also mingw*. + + * tests/testglib.c (main): (Win32): Print the lib/locale + subdirectory, as that is what actually gets used. + Wed Oct 24 11:10:54 2001 Owen Taylor * configure.in: Version 1.3.10, interface age, binary age = 0. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 0d6f0fee4..698d7c23e 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,16 @@ +2001-10-28 Tor Lillqvist + + * glib/glib.def: Add missing g_pattern_match_simple and + g_pattern_spec_equal. + + * glib/gwin32.c (g_win32_get_package_installation_subdirectory): + Set separator correctly. + + * glib/libcharset/config.charset (os): Match also mingw*. + + * tests/testglib.c (main): (Win32): Print the lib/locale + subdirectory, as that is what actually gets used. + Wed Oct 24 11:10:54 2001 Owen Taylor * configure.in: Version 1.3.10, interface age, binary age = 0. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 0d6f0fee4..698d7c23e 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,16 @@ +2001-10-28 Tor Lillqvist + + * glib/glib.def: Add missing g_pattern_match_simple and + g_pattern_spec_equal. + + * glib/gwin32.c (g_win32_get_package_installation_subdirectory): + Set separator correctly. + + * glib/libcharset/config.charset (os): Match also mingw*. + + * tests/testglib.c (main): (Win32): Print the lib/locale + subdirectory, as that is what actually gets used. + Wed Oct 24 11:10:54 2001 Owen Taylor * configure.in: Version 1.3.10, interface age, binary age = 0. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 0d6f0fee4..698d7c23e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,16 @@ +2001-10-28 Tor Lillqvist + + * glib/glib.def: Add missing g_pattern_match_simple and + g_pattern_spec_equal. + + * glib/gwin32.c (g_win32_get_package_installation_subdirectory): + Set separator correctly. + + * glib/libcharset/config.charset (os): Match also mingw*. + + * tests/testglib.c (main): (Win32): Print the lib/locale + subdirectory, as that is what actually gets used. + Wed Oct 24 11:10:54 2001 Owen Taylor * configure.in: Version 1.3.10, interface age, binary age = 0. diff --git a/glib/glib.def b/glib/glib.def index 28b0bad1b..cb98b414b 100644 --- a/glib/glib.def +++ b/glib/glib.def @@ -369,7 +369,9 @@ EXPORTS g_path_is_absolute g_path_skip_root g_pattern_match + g_pattern_match_simple g_pattern_match_string + g_pattern_spec_equal g_pattern_spec_free g_pattern_spec_new g_print diff --git a/glib/gwin32.c b/glib/gwin32.c index 6c8c3f0c2..e023fe715 100644 --- a/glib/gwin32.c +++ b/glib/gwin32.c @@ -771,8 +771,12 @@ g_win32_get_package_installation_subdirectory (gchar *package, prefix = g_win32_get_package_installation_directory (package, dll_name); - sep = ((subdir != NULL && strlen (subdir) > 0) || prefix[strlen (prefix) - 1] == G_DIR_SEPARATOR ? - "" : G_DIR_SEPARATOR_S); + if (subdir == NULL) + subdir = ""; + + sep = (subdir[0] == '\0' || + prefix[strlen (prefix) - 1] == G_DIR_SEPARATOR) ? + "" : G_DIR_SEPARATOR_S; return g_strconcat (prefix, sep, subdir, NULL); } diff --git a/glib/libcharset/config.charset b/glib/libcharset/config.charset index f4f2611c5..0b1f2db17 100755 --- a/glib/libcharset/config.charset +++ b/glib/libcharset/config.charset @@ -274,7 +274,7 @@ case "$os" in # BeOS has a single locale, and it has UTF-8 encoding. echo "* UTF-8" ;; - msdosdjgpp*) + msdosdjgpp*|mingw*) # DJGPP 2.03 doesn't have nl_langinfo(CODESET); therefore # localcharset.c falls back to using the full locale name # from the environment variables. diff --git a/tests/testglib.c b/tests/testglib.c index 865225e7d..c4478341b 100644 --- a/tests/testglib.c +++ b/tests/testglib.c @@ -1187,7 +1187,7 @@ main (int argc, g_print ("Ditto, only from GLib DLL name: %s\n", g_win32_get_package_installation_directory (NULL, glib_dll)); g_print ("locale subdirectory of GLib installation directory: %s\n", - g_win32_get_package_installation_subdirectory (NULL, glib_dll, "share\\locale")); + g_win32_get_package_installation_subdirectory (NULL, glib_dll, "lib\\locale")); g_print ("GTK+ 2.0 installation directory, if available: %s\n", g_win32_get_package_installation_directory ("gtk20", NULL));