6220 Commits

Author SHA1 Message Date
Tor Lillqvist
c35ce6cebd Drop unnecessary comment.
svn path=/branches/glib-2-18/; revision=7769
2009-01-05 09:58:41 +00:00
Tor Lillqvist
b76458d893 Bug 566348 - g_file_open_tmp uses the wrong g_mkstemp on win32
2009-01-05  Tor Lillqvist  <tml@iki.fi>

	Bug 566348 - g_file_open_tmp uses the wrong g_mkstemp on win32

	* glib/gfileutils.c: Move the binary compatibility versions of
	g_file_test(), g_file_get_contents(), g_mkstemp() and
	g_file_open_tmp() last in the file. Remove the restriction that
	the XXXXXX is last in the template in the binary compatibility
	version of g_mkstemp(). Thanks to Morten Welinder and Jody
	Goldberg.


svn path=/branches/glib-2-18/; revision=7768
2009-01-05 09:54:36 +00:00
Matthias Clasen
db4a20cae9 Fix the build
svn path=/branches/glib-2-18/; revision=7727
2008-12-04 04:16:37 +00:00
Matthias Clasen
a2e919f867 Fix the build
svn path=/branches/glib-2-18/; revision=7701
2008-11-28 19:15:55 +00:00
Matthias Clasen
cfbff7b707 Bug 559633 – gtk_image_new_from_gicon does not always work for .desktop
2008-11-28  Matthias Clasen  <mclasen@redhat.com>

        Bug 559633 – gtk_image_new_from_gicon does not always work for
        .desktop files

        * gdesktopappinfo.c (g_desktop_app_info_new_from_keyfile): Ignore
        extensions on icon names.  Proposed by Axel von Bertoldi.



svn path=/branches/glib-2-18/; revision=7699
2008-11-28 08:30:24 +00:00
Matthias Clasen
4f6096cdc3 Bug 548163 – Nautilus displays wrong error message for too long file
2008-11-28  Matthias Clasen  <mclasen@redhat.com>

        Bug 548163 – Nautilus displays wrong error message for too long file
        names

        * glocalfile.c (g_local_file_set_display_name): Correctly set
        error conditions if the new name is e.g. too long. Reported
        by Leonardo Ferreira Fontenelle.


svn path=/branches/glib-2-18/; revision=7697
2008-11-28 08:07:35 +00:00
Matthias Clasen
3243c6a652 Bug 547481 – g_data_input_stream_read_line behaves not as stated in the
2008-11-28  Matthias Clasen  <mclasen@redhat.com>

        Bug 547481 – g_data_input_stream_read_line behaves not as stated in
        the docs

        * gdatainputstream.c (g_data_input_stream_read_line): Behave as
        documented and include the line end in the returned string.
        Pointed out by Paul Pogonyshev.

        * tests/data-input-stream.c: Fix the read_line test to test the
        documented behaviour.


svn path=/branches/glib-2-18/; revision=7695
2008-11-28 07:45:48 +00:00
Matthias Clasen
857333564b Bug 541715 – win32 : patch for warnings and signature problems in recent
2008-11-28  Matthias Clasen  <mclasen@redhat.com>

        Bug 541715 – win32 : patch for warnings and signature problems in
        recent code

        * glocalvfs.c: Avoid unused variables. Pointed out by Jody
        Goldberg.


svn path=/branches/glib-2-18/; revision=7692
2008-11-28 07:06:27 +00:00
Matthias Clasen
60b8d04b57 Bug 559110 – Do not include libintl.h after glibintl.h
2008-11-28  Matthias Clasen  <mclasen@redhat.com>

        Bug 559110 – Do not include libintl.h after glibintl.h

        * glib/glibintl.h: Define bind_textdomain_codeset in the DISABLE_NLS
        branch. Patch by Peter Kjellerstedt.

        * glib/gutil.c: Don't include libintl.h directly.


svn path=/branches/glib-2-18/; revision=7689
2008-11-28 06:28:13 +00:00
Matthias Clasen
74f8f8f2c5 Bug 562393 – g_buffered_input_stream_read_byte broken if data available
2008-11-28  Matthias Clasen  <mclasen@redhat.com>

        Bug 562393 – g_buffered_input_stream_read_byte broken if data
        available

        * gio/gbufferedinputstream.c (g_buffered_input_stream_read_byte): Fix
        handling of buffered content.  Patch by Philip Withnall

        * gio/tests/buffered-input-stream.c: Add a testcase for this bug.
        * gio/tests/Makefile.am: And build it


svn path=/branches/glib-2-18/; revision=7687
2008-11-28 06:01:52 +00:00
Matthias Clasen
b242171ec3 Bug 562378 – callback return value not respected for callback option
2008-11-28  Matthias Clasen  <mclasen@redhat.com>

        Bug 562378 – callback return value not respected for callback option
        with no arg

        * glib/goption.c (parse_long_option): Return the parse_arg return
        value even for no-arg callbacks. Patch by Christian Persch

        * glib/tests/option-context.c: Add a test for a callback which
        returns FALSE.



svn path=/branches/glib-2-18/; revision=7685
2008-11-28 05:19:15 +00:00
Matthias Clasen
aa855eaa1d Bug 561807 – inotify_sub.c :: dup_dirname() fails to remove trailing '/'
2008-11-28  Matthias Clasen  <mclasen@redhat.com>

        Bug 561807 – inotify_sub.c :: dup_dirname() fails to remove trailing
        '/'

        * inotify/inotify-sub.c (dup_dirname): Actually strip the trailing
        '/' away. Spotted by Dan Williams.



svn path=/branches/glib-2-18/; revision=7683
2008-11-28 05:10:53 +00:00
Matthias Clasen
1596363fba Bump version
svn path=/branches/glib-2-18/; revision=7681
2008-11-24 07:31:27 +00:00
Matthias Clasen
96eb1ef8ab 2.18.3
svn path=/branches/glib-2-18/; revision=7679
GLIB_2_18_3
2008-11-24 07:29:23 +00:00
Christian Persch
e6564be249 Bug 559413 – g_option_group_set_error_hook docs buglet
svn path=/branches/glib-2-18/; revision=7678
2008-11-23 21:17:35 +00:00
Christian Persch
962ed4f90c Bug 560568 – gkeyfile docs buglet
svn path=/branches/glib-2-18/; revision=7677
2008-11-23 21:17:31 +00:00
Christian Persch
adf8eed3cd Bug 560569 – gkeyfile doesn't use the set list_separator in some cases
svn path=/branches/glib-2-18/; revision=7676
2008-11-23 21:17:26 +00:00
Hans Breuer
cb7e575262 updated to simplify build with prebuilt dependencies. Just extract them to
2008-11-23  Hans Breuer  <hans@breuer.org>

	* win32/make.msc win32/module.defs : updated to simplify build
	with prebuilt dependencies. Just extract them to $(TOP)\dev.
	Also some adaptions to optionally use vc2008 (express).

svn path=/branches/glib-2-18/; revision=7672
2008-11-23 17:20:53 +00:00
Hans Breuer
6cf62991a6 updated
2008-11-23  Hans Breuer  <hans@breuer.org>

	* tests/makefile.msc : updated

	* glib/makefile.msc.in : filter out G_GNUC_FORMAT

svn path=/branches/glib-2-18/; revision=7671
2008-11-23 17:06:22 +00:00
Hans Breuer
0d242117d9 updated (generate files before building in sub dir)
2008-11-23  Hans Breuer  <hans@breuer.org>

	* makefile.msc : updated (generate files before building in sub dir)

svn path=/branches/glib-2-18/; revision=7670
2008-11-23 16:50:32 +00:00
Hans Breuer
a01a34112b unbroken
2008-11-23  Hans Breuer  <hans@breuer.org>

	* glib/pcre/makefile.msc : unbroken


svn path=/branches/glib-2-18/; revision=7669
2008-11-23 12:02:40 +00:00
Hans Breuer
76642c27a5 add -DG_DISABLE_DEPRECTAED; rule for localcharset.obj
2008-11-23  Hans Breuer  <hans@breuer.org>

	* glib/makefile.msc.in : add -DG_DISABLE_DEPRECTAED; rule for 
	localcharset.obj


svn path=/branches/glib-2-18/; revision=7668
2008-11-23 11:59:25 +00:00
Hans Breuer
c8f57c4a9b version resource as for the other glib dlls added, EXTRA_DIST updated
2008-11-23  Hans Breuer  <hans@breuer.org>

	* gio.rc.in : version resource as for the other glib dlls
	* win32/makefile.msc win32/Makefile.am : added, EXTRA_DIST
	* makefile.msc : updated


svn path=/branches/glib-2-18/; revision=7667
2008-11-23 11:57:57 +00:00
Matthias Clasen
f86fde917d Updates
svn path=/branches/glib-2-18/; revision=7664
2008-11-21 06:12:53 +00:00
Cosimo Cecchi
8ca6c59df2 Bug 561375 – Leaks mountpoint description
2008-11-21  Cosimo Cecchi  <cosimoc@gnome.org>

	Bug 561375 – Leaks mountpoint description

	* glocalfile.c: (get_mount_info): don't leak the mountpoint description
	string.

svn path=/branches/glib-2-18/; revision=7663
2008-11-21 00:02:00 +00:00
Cosimo Cecchi
86febe088b Bug 561352 – Leak of icon description
2008-11-21  Cosimo Cecchi  <cosimoc@gnome.org>

	Bug 561352 – Leak of icon description

	* gcontenttype.c: (g_content_type_get_icon): don't leak the XDG mimetype
	generic icon string.

svn path=/branches/glib-2-18/; revision=7661
2008-11-20 23:59:29 +00:00
Matthias Clasen
52acb0af29 Updates
svn path=/branches/glib-2-18/; revision=7656
2008-11-15 00:13:17 +00:00
Matthias Clasen
3308fda56c Plug a memory leak
svn path=/branches/glib-2-18/; revision=7653
2008-11-14 23:26:08 +00:00
Matthias Clasen
c2dc7dd85e Small documentation fix.
svn path=/branches/glib-2-18/; revision=7652
2008-11-14 23:22:27 +00:00
Matthias Clasen
39705cc3e0 Bug 557210 – g_compute_checksum_for_* asserts with less than 2 bytes
* glib/gchecksum.c (g_compute_checksum_for_data): Accept
        lengths < 2. Patch by Tommi Komulainen


svn path=/branches/glib-2-18/; revision=7651
2008-11-14 23:20:49 +00:00
Tor Lillqvist
cb717fd4db Bug 556415 - Crash on Windows 2000 in g_winhttp_vfs_init()
2008-11-12  Tor Lillqvist  <tml@novell.com>

	Bug 556415 - Crash on Windows 2000 in g_winhttp_vfs_init()

	* win32/gwinhttpvfs.h: Move the set of function pointers to
	winhttp.dll into a separate struct GWinHttpDllFuncs. Just have a
	pointer to that in the GWinHttpVfsClass.
	
	* win32/gwinhttpvfs.c: Move the lookup of functions from
	winhttp.dll into a function of its own, that stores the pointers
	in a separate GWinHttpDllFuncs variable. Add two bookeeping
	booleans lookup_done and funcs_found.

	Don't call g_io_extension_point_implement() to register the
	winhttp extension unless winhttp.dll has been successfully loaded
	and the required functions found in it.

	* win32/gwinhttp*.c: Adjust calls of the functions looked up from
	winhttp.dll correspondingly.


svn path=/branches/glib-2-18/; revision=7647
2008-11-12 17:42:37 +00:00
Tor Lillqvist
ea6ff61ce7 Bug 558153 - Patch for .def files generation
2008-11-02  Tor Lillqvist  <tml@novell.com>

	Bug 558153 - Patch for .def files generation

	* win32/{vs8,vs9}/*.vcproj: Add &quot; around paths, making it
	possible to compile in a directory containing spaces. .def files
	generation is done for every configuration not only the "Debug"
	ones.

	Patch by Guillaume Duhamel.


svn path=/branches/glib-2-18/; revision=7638
2008-11-02 19:39:31 +00:00
Grahame Bowland
4672b6f531 Bug 558185 – 'parent' variable in
2008-10-31  Grahame Bowland  <grahame@angrygoats.net>

	Bug 558185 – 'parent' variable in g_local_file_get_child_for_display_name() 
	hits g_object_unref(NULL) assertion

	* gio/glocalfile.c: 
	- remove unused variable. Patch by Matt Johnston <matt@ucc.asn.au>

svn path=/branches/glib-2-18/; revision=7635
2008-10-31 02:23:30 +00:00
Federico Mena Quintero
6db434cc6c Fix leak inside g_local_file_get_parse_name()
Signed-off-by: Federico Mena Quintero <federico@novell.com>

svn path=/branches/glib-2-18/; revision=7630
2008-10-27 20:44:25 +00:00
Tor Lillqvist
8fb341766b Bug 557592 - Missing include in gwinhttpfile.c
2008-10-27  Tor Lillqvist  <tml@novell.com>

	Bug 557592 - Missing include in gwinhttpfile.c

	* win32/gwinhttpfile.c: Include <wchar.h> to make it compile with
	MSVC2008.


svn path=/branches/glib-2-18/; revision=7627
2008-10-27 08:28:31 +00:00
Alexander Larsson
dbfc719775 Merged from trunk:
2008-10-23  Alexander Larsson  <alexl@redhat.com>

	Merged from trunk:

	Bug 528320 - Incorrect icons displayed for files with custom mimetype icons
	
        * glocalfileinfo.c:
        (_g_local_file_info_get):
	Don't return the fallback icon (text-x-generic) for all files.
	This is causing problems with theme icon lookup and custom mime
	icons, as the generic fallback overrides custom mime icons in
	inherited themes.

	This is a slight change as applications might not get an icon wher
	they previously did. But there is no guarantee to get on neither before
	or after this change, so it should not break applications. Changes
	to nautilus and gtk+ will be done to manually use the generic fallback
	icon if no icon is found, but this is only required for rare cases.
	


svn path=/branches/glib-2-18/; revision=7621
2008-10-23 09:23:04 +00:00
Christian Persch
8098f0db68 Bug 557087 – mem leak in g_content_types_get_registered
svn path=/branches/glib-2-18/; revision=7617
2008-10-20 16:50:17 +00:00
Djihed Afifi
40a6019b6f Updated Arabic Translation by Anas Afif Emad.
* Updated Arabic Translation by Anas Afif Emad. 

svn path=/branches/glib-2-18/; revision=7614
2008-10-19 11:40:25 +00:00
Matthias Clasen
020c5d7e4b Bump version
svn path=/branches/glib-2-18/; revision=7610
2008-10-16 21:32:24 +00:00
Matthias Clasen
c1281a0375 2.18.2
svn path=/branches/glib-2-18/; revision=7608
GLIB_2_18_2
2008-10-16 21:24:27 +00:00
Matthias Clasen
61f82f5afd Don't specify multiple directories in DOC_SOURCE_DIR. It doesn't work.
* glib/Makefile.am: Don't specify multiple directories in
        DOC_SOURCE_DIR. It doesn't work.



svn path=/branches/glib-2-18/; revision=7606
2008-10-16 19:22:11 +00:00
Matthias Clasen
38d9412b51 Updates
svn path=/branches/glib-2-18/; revision=7605
2008-10-16 05:06:01 +00:00
Matthias Clasen
6ec48813f1 Bug 556334 – Warning when building without selinux support
2008-10-14  Matthias Clasen  <mclasen@redhat.com>

        Bug 556334 – Warning when building without selinux support

        * glocalfileinfo.c: Avoid compiler warnings when selinux is
        disabled. Patch by Pascal Terjan


svn path=/branches/glib-2-18/; revision=7602
2008-10-15 03:40:53 +00:00
Alexander Larsson
e999f10a8f Merged from trunk:
2008-10-13  Alexander Larsson  <alexl@redhat.com>

	Merged from trunk:

        * gdesktopappinfo.c:
	When adding an application as handling a mime type (but
	not as the default), copy the full list of desktop ids handling
	that type in before adding the new one on the end of the list.
	This means we're not accidentally changing the default by overriding
	the info from the later directories in the search path.
	
	Also, fixes small leak of removed_entries.


svn path=/branches/glib-2-18/; revision=7596
2008-10-13 10:03:15 +00:00
Alexander Larsson
49c3c77009 Merged from trunk:
2008-10-10  Alexander Larsson  <alexl@redhat.com>

	Merged from trunk:

	* gfileattribute.c (escape_byte_string):
	Upper half of byte is >> 4, not >> 8.
	Found by Kjartan Maraas via sparse


svn path=/branches/glib-2-18/; revision=7591
2008-10-10 11:36:41 +00:00
Matthias Clasen
ad0b356a9e Bug 555711 – Wrong fallback order of mimetype icons
* gcontenttype.c: Don't prefer generic icons over
        default mimetype icons.

        * xdgmime/xdgmimecache.c (xdg_mime_cache_get_icon):
        * xdgmime/xdgmime.c (xdg_mime_get_icon): Don't fall back
        to generic icons.
        Patch by Krysztof Kosiński


svn path=/branches/glib-2-18/; revision=7589
2008-10-10 05:14:06 +00:00
Matthias Clasen
0fd18b3ba7 Bug 555121 – Improved build-time handling of gio module-dir
2008-10-10  Matthias Clasen  <mclasen@redhat.com>

        Bug 555121 – Improved build-time handling of gio module-dir

        * fam/Makefile.am: Use GIO_MODULE_DIR consistently.
        * Makefile.am: Create the module dir.


svn path=/branches/glib-2-18/; revision=7588
2008-10-10 05:12:22 +00:00
Alexander Larsson
c2007bc0f9 Actually return -1 in case of cancelled, not old res value.
2008-10-09  Alexander Larsson  <alexl@redhat.com>

	* gunixinputstream.c (g_unix_input_stream_read):
	Actually return -1 in case of cancelled, not old res value.



svn path=/branches/glib-2-18/; revision=7582
2008-10-09 10:02:45 +00:00
Christian Persch
49ffecc6ba Bug 555314 – mem leak in gmarkup
svn path=/branches/glib-2-18/; revision=7581
2008-10-08 20:55:10 +00:00
Tor Lillqvist
48064c2032 Bug 554790 - g_convert() misbehaves with winiconv versions
2008-10-08  Tor Lillqvist  <tml@novell.com>

	Bug 554790 - g_convert() misbehaves with winiconv versions

	* glib/win_iconv.c (kernel_mbtowc): If converting from ASCII,
	explicitly check for and reject 8bit chars. MultiByteToWideChar()
	doesn't, at least not on XP.


svn path=/branches/glib-2-18/; revision=7577
2008-10-08 20:34:46 +00:00