summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <matthiasc@src.gnome.org>2008-08-15 18:01:38 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2008-08-15 18:01:38 +0000
commit8d221c6caa32916789f5fe20331af1d13760b0ad (patch)
tree0d6b8afddabe063983e0c47039a9a641ad5417ba
parent0d52beb5db6cda4851c7cd762ebdc41bcef6f62f (diff)
downloadgtk+-8d221c6caa32916789f5fe20331af1d13760b0ad.tar.gz
Some doc additions
svn path=/trunk/; revision=21129
-rw-r--r--ChangeLog7
-rw-r--r--README.in5
-rw-r--r--docs/reference/ChangeLog5
-rw-r--r--docs/reference/gtk/building.sgml11
4 files changed, 28 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 859b3c3fc7..82680abca6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-15 Matthias Clasen <mclasen@redhat.com>
+
+ Bug 547655 – gio_can_sniff configure test can fail if not installed
+ with prefix {/usr,/usr/local} and XDG_DATA_DIRS env not set
+
+ * README.in: Add a note about shared-mime-info and XDG_DATA_DIRS.
+
2008-08-15 Christian Dywan <christian@imendio.com>
Bug 547846 – gtktestutils functions lack Since: tags
diff --git a/README.in b/README.in
index 71b6538206..254da7f5b9 100644
--- a/README.in
+++ b/README.in
@@ -48,6 +48,11 @@ Release notes for 2.14
to GTK_SENSITIVITY_ON, so that the button is always sensitive or
GTK_SENSITIVITY_OFF to make it insensitive respectively.
+* gdk-pixbuf will use GIO for mime type detection if possible. For
+ this to work, shared-mime-info needs to be installed and XDG_DATA_DIRS
+ set accordingly at configure time. Otherwise, gdk-pixbuf falls
+ back to its built-in sniffing implementation.
+
Release notes for 2.12
======================
diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 0f7eb481e5..3e29405cce 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-15 Matthias Clasen <mclasen@redhat.com>
+
+ * gtk/building.sgml: Add a note about shared-mime-info and
+ XDG_DATA_DIRS.
+
2008-08-13 Matthias Clasen <mclasen@redhat.com>
* gtk/gtk-sections.txt: Remove useless getters
diff --git a/docs/reference/gtk/building.sgml b/docs/reference/gtk/building.sgml
index 8b5c298032..a32b725ed3 100644
--- a/docs/reference/gtk/building.sgml
+++ b/docs/reference/gtk/building.sgml
@@ -255,6 +255,17 @@ How to compile GTK+ itself
drawing.
</para>
</listitem>
+ <listitem>
+ <para>
+ The <ulink url="http://www.freedesktop.org/wiki/Software/shared-mime-info">shared-mime-info</ulink>
+ package is not a hard dependency of GTK+, but it contains definitions
+ for mime types that are used by GIO and, indirectly, by GTK+.
+ gdk-pixbuf will use GIO for mime type detection if possible. For this
+ to work, shared-mime-info needs to be installed and
+ <envvar>XDG_DATA_DIRS</envvar> set accordingly at configure time.
+ Otherwise, gdk-pixbuf falls back to its built-in mime type detection.
+ </para>
+ </listitem>
</itemizedlist>
</refsect1>
<refsect1 id="building">