mirror of
				https://gitlab.gnome.org/GNOME/glib.git
				synced 2025-11-03 17:48:56 +01:00 
			
		
		
		
	Add missing g_pattern_match_simple and g_pattern_spec_equal.
2001-10-28 Tor Lillqvist <tml@iki.fi> * 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.
This commit is contained in:
		
				
					committed by
					
						
						Tor Lillqvist
					
				
			
			
				
	
			
			
			
						parent
						
							d59c859aec
						
					
				
				
					commit
					9c35df3de3
				
			
							
								
								
									
										13
									
								
								ChangeLog
									
									
									
									
									
								
							
							
						
						
									
										13
									
								
								ChangeLog
									
									
									
									
									
								
							@@ -1,3 +1,16 @@
 | 
			
		||||
2001-10-28  Tor Lillqvist  <tml@iki.fi>
 | 
			
		||||
 | 
			
		||||
	* 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  <otaylor@redhat.com>
 | 
			
		||||
 | 
			
		||||
	* configure.in: Version 1.3.10, interface age, binary age = 0.
 | 
			
		||||
 
 | 
			
		||||
@@ -1,3 +1,16 @@
 | 
			
		||||
2001-10-28  Tor Lillqvist  <tml@iki.fi>
 | 
			
		||||
 | 
			
		||||
	* 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  <otaylor@redhat.com>
 | 
			
		||||
 | 
			
		||||
	* configure.in: Version 1.3.10, interface age, binary age = 0.
 | 
			
		||||
 
 | 
			
		||||
@@ -1,3 +1,16 @@
 | 
			
		||||
2001-10-28  Tor Lillqvist  <tml@iki.fi>
 | 
			
		||||
 | 
			
		||||
	* 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  <otaylor@redhat.com>
 | 
			
		||||
 | 
			
		||||
	* configure.in: Version 1.3.10, interface age, binary age = 0.
 | 
			
		||||
 
 | 
			
		||||
@@ -1,3 +1,16 @@
 | 
			
		||||
2001-10-28  Tor Lillqvist  <tml@iki.fi>
 | 
			
		||||
 | 
			
		||||
	* 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  <otaylor@redhat.com>
 | 
			
		||||
 | 
			
		||||
	* configure.in: Version 1.3.10, interface age, binary age = 0.
 | 
			
		||||
 
 | 
			
		||||
@@ -1,3 +1,16 @@
 | 
			
		||||
2001-10-28  Tor Lillqvist  <tml@iki.fi>
 | 
			
		||||
 | 
			
		||||
	* 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  <otaylor@redhat.com>
 | 
			
		||||
 | 
			
		||||
	* configure.in: Version 1.3.10, interface age, binary age = 0.
 | 
			
		||||
 
 | 
			
		||||
@@ -1,3 +1,16 @@
 | 
			
		||||
2001-10-28  Tor Lillqvist  <tml@iki.fi>
 | 
			
		||||
 | 
			
		||||
	* 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  <otaylor@redhat.com>
 | 
			
		||||
 | 
			
		||||
	* configure.in: Version 1.3.10, interface age, binary age = 0.
 | 
			
		||||
 
 | 
			
		||||
@@ -1,3 +1,16 @@
 | 
			
		||||
2001-10-28  Tor Lillqvist  <tml@iki.fi>
 | 
			
		||||
 | 
			
		||||
	* 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  <otaylor@redhat.com>
 | 
			
		||||
 | 
			
		||||
	* configure.in: Version 1.3.10, interface age, binary age = 0.
 | 
			
		||||
 
 | 
			
		||||
@@ -1,3 +1,16 @@
 | 
			
		||||
2001-10-28  Tor Lillqvist  <tml@iki.fi>
 | 
			
		||||
 | 
			
		||||
	* 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  <otaylor@redhat.com>
 | 
			
		||||
 | 
			
		||||
	* configure.in: Version 1.3.10, interface age, binary age = 0.
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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);
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -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.
 | 
			
		||||
 
 | 
			
		||||
@@ -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));
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user