Hello community, here is the log from the commit of package glib2 for openSUSE:Factory checked in at Mon Feb 21 11:54:41 CET 2011.
-------- --- GNOME/glib2/glib2.changes 2011-02-13 17:41:01.000000000 +0100 +++ glib2/glib2.changes 2011-02-20 10:50:21.000000000 +0100 @@ -1,0 +2,9 @@ +Sun Feb 20 10:38:00 CET 2011 - [email protected] + +- Add glib2-fix-default-mime-handler.patch: this fixes an issue + where a user has configured a handler for a relatively generic + mime type, that breaks the default mime handler for subtypes. For + example, if gvim is explicitly configured to open text/plain, + then LibreOffice documents will also open in gvim. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- glib2-fix-default-mime-handler.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glib2.spec ++++++ --- /var/tmp/diff_new_pack.VtE7v4/_old 2011-02-21 11:53:24.000000000 +0100 +++ /var/tmp/diff_new_pack.VtE7v4/_new 2011-02-21 11:53:24.000000000 +0100 @@ -22,7 +22,7 @@ Name: glib2 %define _name glib Version: 2.28.0 -Release: 1 +Release: 5 # FIXME: change zlib-devel to pkgconfig(zlib) once we have a recent enough version of zlib # FIXME: find out if tapsets should really be in devel package or in main package License: LGPLv2+ @@ -50,6 +50,8 @@ Patch11: glib2-fate300461-gettext-gkeyfile-suse.patch # PATCH-FIX-UPSTREAM glib2-force-fam-for-remote-fs.patch bgo#592211 [email protected] -- Try monitoring files on NFS mounts via FAM before falling back to inotify. Patch12: glib2-force-fam-for-remote-fs.patch +# PATCH-FIX-UPSTREAM glib2-fix-default-mime-handler.patch bgo#642797 [email protected] -- Fix default mime handler to not be the one of a user-configured less-specific mime type +Patch13: glib2-fix-default-mime-handler.patch BuildRequires: fam-devel BuildRequires: fdupes BuildRequires: gcc-c++ @@ -256,6 +258,7 @@ %patch10 -p1 %patch11 -p1 %patch12 -p1 +%patch13 -p1 cp -a %{S:1} %{S:2} %{S:3} . cp -a %{S:4} gnome_defaults.conf if ! test -f %{_datadir}/aclocal/gtk-doc.m4 ; then ++++++ glib2-fix-default-mime-handler.patch ++++++ commit 862c5a86d7ac24e1607749fe7c3ce772727c2691 Author: Vincent Untz <[email protected]> Date: Sun Feb 20 10:41:17 2011 +0100 appinfo: Do not override system default handler with less specific one We were considering explicitly configured defaults for parent types after we already got results for the specific type we're interested in. This resulted in the explicit default for text/plain to override all system defaults for subtypes of text/plain, for example. The explicit default should not apply to subtypes that have a system default. https://bugzilla.gnome.org/show_bug.cgi?id=642797 diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c index 61ef54c..f81d3db 100644 --- a/gio/gdesktopappinfo.c +++ b/gio/gdesktopappinfo.c @@ -3059,14 +3059,18 @@ get_all_desktop_entries_for_mime_type (const char *base_mime_type, { dir = dir_list->data; - /* Pick the explicit default application */ - entry = g_hash_table_lookup (dir->mimeapps_list_defaults_map, mime_type); - - if (entry != NULL) + /* Pick the explicit default application if we got no result earlier + * (ie, for more specific mime types) */ + if (desktop_entries == NULL) { - /* Save the default entry if it's the first one we encounter */ - if (default_entry == NULL) - default_entry = g_strdup (entry); + entry = g_hash_table_lookup (dir->mimeapps_list_defaults_map, mime_type); + + if (entry != NULL) + { + /* Save the default entry if it's the first one we encounter */ + if (default_entry == NULL) + default_entry = g_strdup (entry); + } } /* Then added associations from mimeapps.list */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
