Commit Graph

28 Commits

Author SHA1 Message Date
Matthias Clasen
475c3f5e0f Sync xdgmime to the copy in gio
svn path=/trunk/; revision=20013
2008-04-16 22:18:27 +00:00
Matthias Clasen
0d62579c66 Partically revert the last commit after realizing that
2008-04-16  Matthias Clasen  <mclasen@redhat.com>

        Partically revert the last commit after realizing that
        xdg_mime_media_type_equal doesn't have to init at all.

        * xdgmime/xdgmime.h:
        * xdgmime/xdgmime.c: Get rid of _xdg_mime_media_type_equal

        * xdgmime/xdgmimecache.c: Use xdg_mime_media_type_equal


svn path=/trunk/; revision=20011
2008-04-16 17:23:08 +00:00
Matthias Clasen
f3177151c6 Avoid possible memory corruption in xdgmime, fd.o bug 12512, reported by
2008-04-16  Matthias Clasen  <mclasen@redhat.com>

        Avoid possible memory corruption in xdgmime, fd.o bug 12512,
        reported by Joe Shaw and Federico Mena Quintero.

        * xdgmime.c(_xdg_mime_media_type_equal): Implement.
        (xdg_mime_media_type_equal): Turn into a wrapper around the
        _-prefixed version.

        * xdgmimecache.c: Use the _-prefixed versions of
        comparison functions throughout.


svn path=/trunk/; revision=20009
2008-04-16 16:59:28 +00:00
Matthias Clasen
066bb1b8f6 Fix a thinko that leads to constantly reloading the mime data if a
2006-07-20  Matthias Clasen  <mclasen@redhat.com>

	Fix a thinko that leads to constantly reloading
	the mime data if a mime.cache is present.  Patch
	by Yevgen Muntyan, bugs.freedesktop.org #7495

	* xdgmime.c (xdg_check_dir): Look for mime.cache first.
	(xdg_check_file): Report existance of the file separately.
2006-07-20 17:42:10 +00:00
Matthias Clasen
c0b6729871 Free caches on shutdown 2006-07-20 14:40:57 +00:00
Matthias Clasen
81c0660f19 Add xdg_init-free versions of some functions and use them internally, so
2006-07-20  Matthias Clasen  <mclasen@redhat.com>

	* xdgmimemagic.c:
	* xdgmime.c:
	* xdgmime.h: Add xdg_init-free versions of some
	functions and use them internally, so that we don't
	reload caches and clobber data structures in the
	middle of an operation.  Patch by Joe Shaw,
	bugs.freedesktop.org #6824
2006-07-20 04:14:59 +00:00
Matthias Clasen
c7f1892ef8 Move a constant string to rodata 2006-04-04 03:49:32 +00:00
Matthias Clasen
7499e33c81 Merge upstream changes to handle duplicate glob patterns. 2005-12-01 19:04:41 +00:00
Matthias Clasen
7f6251a593 Prevent a segfault 2005-11-04 15:56:13 +00:00
Matthias Clasen
faff0f5f8b Remove a debugging printf.
2005-10-17  Matthias Clasen  <mclasen@redhat.com>

	* xdgmime.c (xdg_mime_get_mime_type_for_file): Remove
	a debugging printf.
2005-10-18 02:54:55 +00:00
Matthias Clasen
6224a37708 Pass statbufs down to xdg_mime_get_mime_type_for_file() where possible, to
2005-09-01  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkfilesystemunix.c: Pass statbufs down to
	xdg_mime_get_mime_type_for_file() where possible, to avoid
	useless re-stating.
2005-09-01 14:42:02 +00:00
Matthias Clasen
c1eead8dad Don't export extra stuff 2005-08-07 13:32:27 +00:00
Federico Mena Quintero
252e7dfa84 Pass the correct size to realloc(). Fixes
2005-06-10  Federico Mena Quintero  <federico@ximian.com>

	* xdgmime.c (xdg_mime_init_from_directory): Pass the correct size
	to realloc().  Fixes https://bugs.freedesktop.org/show_bug.cgi?id=3506.
2005-06-10 05:33:58 +00:00
Matthias Clasen
2464763a22 Sync to upstream.
2005-04-29  Matthias Clasen  <mclasen@redhat.com>

	* Sync to upstream.
2005-04-29 18:24:38 +00:00
Matthias Clasen
415750b253 Forgotten file 2005-04-04 21:57:39 +00:00
Manish Singh
5fed4b4afd revert previous change, maintain ABI.
Tue Mar  1 13:53:56 2005  Manish Singh  <yosh@gimp.org>

        * gtk/xdgmime/xdgmime.[ch]: revert previous change, maintain ABI.
2005-03-01 22:00:03 +00:00
Matthias Clasen
6da29b43a6 gdk/gdkkeyuni.c gdk/gdkpixbuf-drawable.c gdk/gdkrgb.c gdk/x11/gdkdnd-x11.c
2005-03-01  Matthias Clasen  <mclasen@redhat.com>

	* gdk/gdkkeyuni.c
	* gdk/gdkpixbuf-drawable.c
	* gdk/gdkrgb.c
	* gdk/x11/gdkdnd-x11.c
	* gdk/x11/gdkevents-x11.c
	* gdk/x11/gdkproperty-x11.c
	* gdk/x11/gdkvisual-x11.c
	* gdk-pixbuf/gdk-pixbuf.c
	* gtk/gtkaction.c
	* gtk/gtkbindings.c
	* gtk/gtkcolorbutton.c
	* gtk/gtkcombo.c
	* gtk/gtkcontainer.c
	* gtk/gtkfilechooserdefault.c
	* gtk/gtkfilesel.c
	* gtk/gtkgamma.c
	* gtk/gtkiconview.c
	* gtk/gtkinputdialog.c
	* gtk/gtkitemfactory.c
	* gtk/gtkmenu.c
	* gtk/gtktextview.c
	* gtk/gtktooltips.c
	* gtk/gtktreedatalist.c
	* gtk/gtkuimanager.c
	* gtk/tree_minus.xpm
	* gtk/tree_plus.xpm
	* gtk/xdgmime/xdgmime.c
	* gtk/xdgmime/xdgmime.h:
	Move constant data to .rodata.
2005-03-01 06:25:55 +00:00
Marco Pesenti Gritti
08b5b675e1 Resync with upstream
2004-12-09  Marco Pesenti Gritti  <marco@gnome.org>

        * xdgmime.c: (xdg_mime_unalias_mime_type),
        (xdg_mime_mime_type_equal), (xdg_mime_mime_type_subclass),
        (xdg_mime_get_mime_parents):
        * xdgmime.h:
        * xdgmimealias.c: (_xdg_mime_alias_list_lookup):
        * xdgmimeglob.c: (_xdg_glob_hash_node_lookup_file_name):
        * xdgmimeint.c: (_xdg_ucs4_to_lower):
        * xdgmimeint.h:
        * xdgmimemagic.c: (_xdg_mime_magic_read_from_file):
        * xdgmimeparent.c: (_xdg_mime_parent_list_lookup):

        Resync with upstream
2004-12-09 17:26:52 +00:00
Manish Singh
3d325e30d9 Don't put /* within a comment.
Fri Nov 19 15:10:32 2004  Manish Singh  <yosh@gimp.org>

        * xdgmime.c: Don't put /* within a comment.
2004-11-19 23:16:14 +00:00
Matthias Clasen
c4183ed568 Use xdg_mime_mime_type_subclass() to match mime types. This also gives use
2004-11-08  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkfilefilter.c (gtk_file_filter_filter): Use
	xdg_mime_mime_type_subclass() to match mime types. This
	also gives use wildcard matching. (#143760, #141224,
	Tommi Komulainen, David A Knight)
2004-11-08 21:25:27 +00:00
Matthias Clasen
d0e90e40b1 Sync from upstream
2004-11-08  Matthias Clasen  <mclasen@redhat.com>

	* Sync from upstream
2004-11-08 19:36:12 +00:00
Morten Welinder
c2ddd0e23c Make sure to include <config.h> (#137001)
2004-03-12  Morten Welinder  <terra@gnome.org>

	* *.c: Make sure to include <config.h>  (#137001)
2004-03-12 18:25:01 +00:00
Jonathan Blandford
f01a9050f4 Sync from upstream
Wed Mar 10 22:48:15 2004  Jonathan Blandford  <jrb@gnome.org>

        * Sync from upstream
2004-03-11 03:48:26 +00:00
Federico Mena Quintero
80581c3011 Fixes #136082 and #135265, patch by Morten Welinder.
2004-03-05  Federico Mena Quintero  <federico@ximian.com>

	Fixes #136082 and #135265, patch by Morten Welinder.

	* configure.in: Use AC_SYS_LARGEFILE.

	* */*.c: #include <config.h>
2004-03-06 03:38:59 +00:00
Jonathan Blandford
a99fb2ea6c resync with upstream sources.
Tue Jan 20 13:07:04 2004  Jonathan Blandford  <jrb@gnome.org>

        * xdgmime.c: resync with upstream sources.
2004-01-20 18:07:07 +00:00
Owen Taylor
1e5c8e64f5 Relicense to be dual AFL/LGPL (and thus also GPL) rather than AFL/GPL.
Fri Oct 24 16:02:32 2003  Owen Taylor  <otaylor@redhat.com>

        * *.[ch]: Relicense to be dual AFL/LGPL (and thus also
        GPL) rather than AFL/GPL. Also update AFL version to 1.2.
2003-10-24 20:03:37 +00:00
Jonathan Blandford
96ba7bb65e use XDG_DATA_HOME instead of XDG_CONFIG_HOME.
* xdgmime/xdgmime.c (xdg_mime_init): use XDG_DATA_HOME instead of
        XDG_CONFIG_HOME.
2003-07-22 19:39:10 +00:00
Owen Taylor
7e54248bc3 auto-ize.
Wed Jul 16 16:50:31 2003  Owen Taylor  <otaylor@redhat.com>

        * configure.ac Makefile.am: auto-ize.

        * xdgmime/: Add freedesktop.org MIME spec implementatin
        by Jonathan Blandford.

        * gtkfilesystem.[ch]: Add gtk_file_info_render_icon()
        gtk_file_info_set/get_icon_type to do icon handling
        based on MIME type. Add a simple icon caching system.

        * gtkfilesystemgnomevfs.c: Implement ensure_types()
        so that extending the set of types for a loaded
        directory works. Set the MIME type to get the default
        icon handling.

        * gtkfilesystemunix.c: Look up the MIME type using
        xdgmime.

        * gtkfilechooserimpldefault.c: Display icons in the list.
2003-07-16 21:07:38 +00:00