Commit Graph

2934 Commits

Author SHA1 Message Date
Ray Strode
0a5580d822 don't return an error if we come across a value with invalid utf8 or if we
2004-11-01  Ray Strode <rstrode@redhat.com>

	* glib/gkeyfile.c:
	(g_key_file_get_locale_string): don't return an
	error if we come across a value with invalid utf8 or
	if we don't find a translated string. Just fallback
	to the untranslated string (Mark McLoughlin, bug
	#156790).

	* glib/gkeyfile.c:
	(g_key_file_init), (g_key_file_clear): track the
	actual start GKeyFileGroup rather than just its name
	(g_key_file_parse_group): allow add_group() to
	update the start group.
	(g_key_file_remove_group_node): update the start
	group if it gets removed (Mark McLoughlin, bug
	#156790).

	* glib/gkeyfile.c:
	(g_key_file_parse_string_as_value): Don't escape
	tabs and spaces in the middle of key values.
2004-11-01 19:28:32 +00:00
Matthias Clasen
286d84fcb0 glib/gdebug.h glib/gutils.c gobject/gtype.c gthread/gthread-posix.c
2004-11-01  Matthias Clasen  <mclasen@redhat.com>

	* glib/gconvert.c:
	* glib/gdebug.h
	* glib/gutils.c
	* gobject/gtype.c
	* gthread/gthread-posix.c
	* tests/timeloop-closure.c
	* tests/timeloop.c: Fix sparse warnings.  (#157014, Kjartan Maraas)
2004-11-01 18:47:12 +00:00
Matthias Clasen
938f1a9a5a Documentation updates. 2004-11-01 17:52:02 +00:00
Matthias Clasen
57f8507273 Handle conflicts between options in different groups. (#156808)
2004-11-01  Matthias Clasen  <mclasen@redhat.com>

	Handle conflicts between options in different groups. (#156808)

	* glib/goption.c (g_option_context_parse): When a long option does not
	match exactly, try to parse it as --group-option.
	(g_option_context_add_group): Warn if a group name conflict occurs.

	* glib/goption.c (print_help): Print out the effective options, ie
	don't print shadowed short options, and for long options print
	--group-option instead of --option if appropriate.
2004-11-01 17:40:09 +00:00
Matthias Clasen
0032a3c1b6 Document G_WIN32_IS_NT_BASED, G_WIN32_HAVE_WIDECHAR_API.
2004-10-31  Matthias Clasen  <mclasen@redhat.com>

	* glib/tmpl/windows.sgml: Document G_WIN32_IS_NT_BASED,
	G_WIN32_HAVE_WIDECHAR_API.

	* glib/glib-sections.txt: Add g_lstat

	* glib/running.sgml: Document G_WIN32_PRETEND_WIN9X.

200
2004-10-31 17:41:29 +00:00
Tor Lillqvist
8ff42a540e Document g_win32_get_windows_version().
2004-10-31  Tor Lillqvist  <tml@iki.fi>

	* glib/gwin32.c: Document g_win32_get_windows_version().
2004-10-31 16:31:41 +00:00
Tor Lillqvist
20e56bbc2c Add g_lstat().
2004-10-31  Tor Lillqvist  <tml@iki.fi>

	* glib/gstdio.[ch]: Add g_lstat().
2004-10-31 15:56:08 +00:00
Matthias Clasen
eb0b4db5ff Doc additions. 2004-10-30 05:06:15 +00:00
Matthias Clasen
b190dce984 Convert filenames to UTF-8 on Windows.
2004-10-29  Matthias Clasen  <mclasen@redhat.com>

	* glib/goption.c (parse_arg): Convert filenames to UTF-8 on
	Windows.
2004-10-30 03:20:31 +00:00
Hans Breuer
aa410edee6 updated [and finally fixed my script to produce ready to go de-in(ed)
2004-10-29  Hans Breuer  <hans@breuer.org>

	* glibconfig.h */makefile.msc.in : updated [and finally fixed my
	script to produce ready to go de-in(ed) files, w/o autotools]

	* */*.rc.in : updated copyrights to 2004

	* glib/gutils.c : some CSIDL_* defines lacking from older SDK;
	use the same fallback mecahnism as on *NIX where ever applicable
2004-10-29 20:58:04 +00:00
Matthias Clasen
dd028d11f6 Add G_OPTION_REMAINING
2004-10-29  Matthias Clasen  <mclasen@redhat.com>

	* glib/glib-sections.txt: Add G_OPTION_REMAINING
2004-10-29 20:27:01 +00:00
Matthias Clasen
eca5c5ea7d Update. 2004-10-29 20:26:19 +00:00
Matthias Clasen
a9fa61a13e Add tests for the handling of non-option arguments, "--" and
2004-10-29  Matthias Clasen  <mclasen@redhat.com>

	* tests/option-test.c: Add tests for the handling of
	non-option arguments, "--" and G_OPTION_REMAINING.

	* glib/goption.[hc]: #define G_OPTION_REMAINING, which is
	a special long option name, which can be used for an option
	in the main group which collects the non-option arguments.
	It must be of type G_OPTION_ARG_STRING_ARRAY or
	G_OPTION_ARG_FILENAME_ARRAY. If the main group doesn't contain
	an option whose name is G_OPTION_REMAINING, the non-option
	arguments are left behind in argv as before.
2004-10-29 20:19:06 +00:00
Matthias Clasen
a0e217e94a Document GOption 2004-10-29 18:43:34 +00:00
Matthias Clasen
4d424f4f30 Mark g_assert_warning as G_GNUC_NORETURN, to avoid compiler warnings.
2004-10-28  Matthias Clasen  <mclasen@redhat.com>

	* glib/gmessages.h: Mark g_assert_warning as G_GNUC_NORETURN,
	to avoid compiler warnings.  (#156767, Owen Taylor)
2004-10-29 02:20:02 +00:00
Tor Lillqvist
1eb924770c Include also <direct.h> for mkdir() prototype with MSVC. [156727, Kazuki
2004-10-29  Tor Lillqvist  <tml@iki.fi>

	* glib/gstdio.c: Include also <direct.h> for mkdir() prototype
	with MSVC. [156727, Kazuki IWAMOTO]
2004-10-29 02:04:28 +00:00
Tor Lillqvist
37d3825e29 Redefine also g_io_channel_new_file to the UTF-8 version on Win32.
2004-10-29  Tor Lillqvist  <tml@iki.fi>

	* glib/giochannel.h (g_io_channel_new_file): Redefine also
	g_io_channel_new_file to the UTF-8 version on Win32. [156725,
	Kazuki IWAMOTO)
2004-10-29 02:00:05 +00:00
Ray Strode
be4d82189f fix whitespace in changelog entry 2004-10-28 22:11:48 +00:00
Ray Strode
f72f7be1d3 clean up a leak (#156652, Morten Welinder) (g_key_file_load_from_fd):
2004-10-28  Ray Strode  <rstrode@redhat.com>

	* glib/gkeyfile.c
	(find_file_in_data_dirs): clean up a leak (#156652,
        Morten Welinder)
        (g_key_file_load_from_fd): propagate fstat() error
        conditions and retry read on EAGAIN (#156647, Morten
        Welinder).  Return error if file is NOT regular, not if
        it is regular (bug introduced from last commited bug
        fix).
        (g_key_file_load_from_data_dirs): allocate enough space
        for the terminating NULL.
2004-10-28 22:10:06 +00:00
Ray Strode
6b931891bc Don't use S_ISREG macro (#156728, Kazuki IWAMOTO)
2004-10-28  Ray Strode  <rstrode@redhat.com>

	* glib/gkeyfile.c: Don't use S_ISREG macro (#156728,
	Kazuki IWAMOTO)
2004-10-28 18:42:46 +00:00
Matthias Clasen
9e8ebbbdfb Add some introductory notes.
2004-10-28  Matthias Clasen  <mclasen@redhat.com>

	* glib/tmpl/keyfile.sgml: Add some introductory notes.
2004-10-28 18:38:07 +00:00
Matthias Clasen
69bff65ed4 Fix credits. 2004-10-28 17:18:40 +00:00
Matthias Clasen
f2d02dce82 Include galias.h before glib.h (#156697, Christian Persch)
2004-10-28  Matthias Clasen  <mclasen@redhat.com>

	* glib/gstdio.c: Include galias.h before glib.h (#156697,
	Christian Persch)
2004-10-28 14:16:06 +00:00
Matthias Clasen
59501ed292 Add a missing "Since: 2.6" comment.
2004-10-28  Matthias Clasen  <mclasen@redhat.com>

	* glib/gkeyfile.c: Add a missing "Since: 2.6" comment.
2004-10-28 14:10:02 +00:00
Tor Lillqvist
a51f1009b2 Include glib.h early to get G_OS_WIN32. Include errno.h for errno.
2004-10-28  Tor Lillqvist  <tml@iki.fi>

	* glib/gstdio.c: Include glib.h early to get G_OS_WIN32. Include
	errno.h for errno.
2004-10-28 03:43:48 +00:00
Tor Lillqvist
7e52a0584f Include gstdio.h and use g_open().
2004-10-28  Tor Lillqvist  <tml@iki.fi>

	* glib/gkeyfile.c: Include gstdio.h and use g_open().
2004-10-28 03:04:10 +00:00
Tor Lillqvist
9941162fea Fix typo in bug number reference. 2004-10-28 03:01:18 +00:00
Ray Strode
31c3bd53a2 Move file is regular check to load_from_file to use fstat() instead of
2004-10-27  Ray Strode  <rstrode@redhat.com>

	* glib/gkeyfile.c:
	 (g_key_file_load_from_fd),
	 (g_key_file_load_from_file):
	 Move file is regular check to load_from_file to use
	 fstat() instead of race prone g_file_test().  Don't
	 clear/init until needed. Change error messages to be
	 more consistent.
	 (g_key_file_load_from_data),
	 (g_key_file_load_from_data_dirs),
	 (g_key_file_parse_data),
	 (g_key_file_get_value),
	 (g_key_file_get_string),
	 (g_key_file_set_string),
	 (g_key_file_get_string_list),
	 (g_key_file_set_string_list),
	 (g_key_file_set_locale_string),
	 (g_key_file_get_locale_string),
	 (g_key_file_set_locale_string_list),
	 (g_key_file_get_boolean),
	 (g_key_file_set_boolean),
	 (g_key_file_get_boolean_list),
	 (g_key_file_set_boolean_list),
	 (g_key_file_get_integer),
	 (g_key_file_get_integer_list),
	 (g_key_file_set_integer_list),
	 (g_key_file_remove_key):
	 Add more g_return_*if_fail checks for public functions.
2004-10-27 21:22:01 +00:00
Matthias Clasen
24c2d623b5 Bump version 2004-10-27 18:31:10 +00:00
Matthias Clasen
25dc3ce452 2.5.4 2004-10-27 17:56:33 +00:00
Matthias Clasen
8a7eecd7c6 Introduce the idea of a filename encoding, which is *literally* the
2004-10-27  Matthias Clasen  <mclasen@redhat.com>

	Introduce the idea of a filename encoding, which is
	*literally* the filename encoding on Unix. On windows,
	use the Unicode name converted to UTF-8. (#156325,
	Tor Lillqvist, Owen Taylor)

	* glib/gdir.[hc]:
	* glib/gconvert.[hc]:
	* glib/gfileutils.[hc]:
	* glib/gutils.[hc]:
	* glib/giowin32.c: On Windows, keep old ABI versions
	of GLib pathname api for DLL ABI stability. Use different
	names for the new-style UTF-8 versions. Hide this through
	a #define.

	* glib/gstdio.[hc]: New files containing wrappers for
	POSIX pathname api.

	* glib/glib.symbols: Add new symbols.

	* glib/makegalias.pl: Drop Win32 specific .def syntax,
	include gstdio.h
2004-10-27 16:46:29 +00:00
Kjartan Maraas
8e6b272126 Update Norwegian bokmål translation.
2004-10-27  Kjartan Maraas  <kmaraas@gnome.org>

	* nb.po: Update Norwegian bokmål translation.
2004-10-27 10:31:03 +00:00
Matthias Clasen
da9d1cd0f6 Fix includes. (#156500, #156499, Kazuki IWAMOTO)
2004-10-27  Matthias Clasen  <mclasen@redhat.com>

	* glib/gkeyfile.c: Fix includes. (#156500, #156499,
	Kazuki IWAMOTO)
2004-10-27 05:12:27 +00:00
Matthias Clasen
1cb5534a51 Fix srcdir != builddir builds. (#156447, Thomas Fitzsimmons)
2004-10-27  Matthias Clasen  <mclasen@redhat.com>

	* Makefile.am (gobjectalias.h): Fix srcdir != builddir
	builds.  (#156447, Thomas Fitzsimmons)
2004-10-27 04:42:51 +00:00
Matthias Clasen
b5e4a809fa Add a missing include. 2004-10-26 18:48:55 +00:00
Matthias Clasen
45698f6ecf Add new symbols.
2004-10-26  Matthias Clasen  <mclasen@redhat.com>

	* glib/glib.symbols: Add new symbols.

	* abicheck.sh: Don't include symbols which are just in the
	symbols list for .defs file compatibility.
2004-10-26 16:41:43 +00:00
Gora Mohanty
18de636289 configure.in: Added 'or' to ALL_LINGUAS.
po/or.po: Updated Oriya translation.
2004-10-26 16:32:46 +00:00
Matthias Clasen
7275b6c4e4 Add new symbols. 2004-10-26 16:19:40 +00:00
Matthias Clasen
933afd0277 Add a 2.6 index. 2004-10-26 16:13:20 +00:00
Matthias Clasen
5a6df6dd65 Documentation fixes. 2004-10-26 16:10:52 +00:00
Matthias Clasen
537908e429 Make the last change compile. 2004-10-26 14:24:27 +00:00
Matthias Clasen
9b66aa4222 Make this function thread-safe in the GLib style.
2004-10-26  Matthias Clasen  <mclasen@redhat.com>

	* glib/gwin32.c (g_win32_get_windows_version): Make this
	function thread-safe in the GLib style.
	* glib/gthreadinit.h:
	* glib/gwin32.c (_g_win32_thread_init): New function to
	initialize the version.
	* glib/gthread.c (g_thread_init_glib): Call
	_g_win32_thread_init() from here.
2004-10-26 14:04:52 +00:00
Ray Strode
d59b22a981 Add Matthias to "Written by" lines (GKeyFileGroup): add field to hold
2004-10-26  Ray Strode  <rstrode@redhat.com>

	* glib/gkeyfile.c: Add Matthias to "Written by" lines
	 (GKeyFileGroup): add field to hold comments about groups
	 (g_key_file_load_from_fd): return TRUE on success and
	 FALSE on failure.  Don't close fd's opened by other
	 parent function.
	 (g_key_file_load_from_file): run FILE_IS_REGULAR test
	 before trying to open file, to save an fd from being
	 leaked (would probably be better to use fstat()). Close
	 fd when done with it. Return TRUE on success and FALSE
	 on failure.
	 (g_key_file_load_from_data): Return TRUE on success and
	 FALSE on failure.
	 (g_key_file_load_from_data_dirs): remove superfluous
	 const modifier.  Return TRUE on success and FALSE on
	 failure.  Stop trying to load files when one succeeds.
	 (g_key_file_parse_key_value_pair): don't validate input
	 for UTF-8 until users uses a getter that does
	 validation.  Don't leak copy of start_group_name.
	 (g_key_file_to_data): serialize new comment field for
	 groups.
	 (g_key_file_get_keys): Remove convenience code to let
	 NULL group mean start group.  Get rid of unneeded NULL
	 check before g_strdup.
	 (g_key_file_get_groups): Reverse groups list before
	 sending to user because it is maintained in backward
	 order internally.
	 (g_key_file_get_value),
	 (g_key_file_set_value): add g_return checks at top of
	 public functions.
	 (g_key_file_get_string),
	 (g_key_file_get_string_list): validate key value is UTF-8.
	 (g_key_file_[sg]et_*comment): new functions for
	 setting/getting comments
	 (g_key_file_remove_comment): new function to remove
	 comment block
	 (g_key_file_remove_key_value_pair_node): new function to
	 pull a key-value pair out of the list and free it.
	 (g_key_file_remove_group_node): call
	 g_key_file_remove_key_value_pair_node instead of
	 freeing the list immediately to get better statistics
	 for approximate_size.
	 (g_key_file_remove_group): use lookup_group_node instead
	 of lookup_group to prevent a g_list_find call.
	 (g_key_file_add_key): report group also when unable to
	 find key.
	 (g_key_file_lookup_group_node): new function to make
	 getting the group node from a group name easier.
	 (g_key_file_lookup_group): use lookup_group_node under
	 the hood.
	 (g_key_file_lookup_key_value_pair_node): new function to
	 make getting the key-value pair from a group and key
	 name eaiser.
	 (g_key_file_parse_comment_as_value): new function to add '#' to the
	 beginning of every line.
	 (g_key_file_parse_value_as_comment): new function that
	 attempts to be the inverse of comment as value.
2004-10-26 12:35:58 +00:00
Matthias Clasen
ee36299b55 Don't include ctype.h needlessly. (#156424, Morten Welinder)
2004-10-26  Matthias Clasen  <mclasen@redhat.com>

	* glib/gutils.c:
	* glib/gkeyfile.c: Don't include ctype.h needlessly.  (#156424,
	Morten Welinder)
2004-10-26 05:23:40 +00:00
Matthias Clasen
196be2da77 Don't include ctype.h needlessly. (#156424, Morten Welinder)
2004-10-26  Matthias Clasen  <mclasen@redhat.com>

	* glib/gkeyfile.c: Don't include ctype.h needlessly.  (#156424,
	Morten Welinder)
2004-10-26 05:16:47 +00:00
Matthias Clasen
491732c99d Improve error reporting.
2004-10-26  Matthias Clasen  <mclasen@redhat.com>

	* tests/strtod-test.c (test_string): Improve error reporting.
2004-10-26 04:16:02 +00:00
Manish Singh
5c38cfa58d rm autom4te.cache, since it might interfere with differing autoconf
Mon Oct 25 15:05:18 2004  Manish Singh  <yosh@gimp.org>

        * autogen.sh: rm autom4te.cache, since it might interfere with
        differing autoconf versions.

        * tests/child-test.c: use GINT_TO_POINTER for g_child_watch_add
        user data.

        * glib/gfileutils.c: G_IS_DIR_SEPARATOR is defined in gutils.h now,
        don't redefine it here.
2004-10-25 22:08:37 +00:00
Matthias Clasen
5883072cb2 Add GKeyFile section, add index for 2.6 additions.
2004-10-25  Matthias Clasen  <mclasen@redhat.com>

	* glib/glib-docs.sgml:  Add GKeyFile section, add
	index for 2.6 additions.
2004-10-25 13:56:25 +00:00
Kjartan Maraas
34e3df22f2 Update.
2004-10-25  Kjartan Maraas  <kmaraas@gnome.org>

	* nb.po: Update.
2004-10-25 10:40:04 +00:00
Matthias Clasen
1ec985a141 Don't destroy the lookup map if it is NULL.
2004-10-24  Matthias Clasen  <mclasen@redhat.com>

	* glib/gkeyfile.c (g_key_file_remove_group_node): Don't
	destroy the lookup map if it is NULL.

20
2004-10-24 05:49:14 +00:00