Adjust to the stock icon changes.

2005-11-07  Matthias Clasen  <mclasen@redhat.com>

	* configure.in: Adjust to the stock icon changes.
This commit is contained in:
Matthias Clasen 2005-11-07 14:30:35 +00:00 committed by Matthias Clasen
parent 90942c4fef
commit 57904c8ce6
6 changed files with 35 additions and 9 deletions

View File

@ -1,3 +1,7 @@
2005-11-07 Matthias Clasen <mclasen@redhat.com>
* configure.in: Adjust to the stock icon changes.
2005-11-07 Tor Lillqvist <tml@novell.com>
* gdk/win32/gdkcursor-win32.c (pixbuf_to_hbitmaps_normal):

View File

@ -1,3 +1,7 @@
2005-11-07 Matthias Clasen <mclasen@redhat.com>
* configure.in: Adjust to the stock icon changes.
2005-11-07 Tor Lillqvist <tml@novell.com>
* gdk/win32/gdkcursor-win32.c (pixbuf_to_hbitmaps_normal):

View File

@ -993,10 +993,10 @@ if test $cross_compiling = yes; then
fi
fi
if test ! -f $srcdir/gtk/stock-icons/gtkstockpixbufs.h &&
if test ! -f $srcdir/gtk/gtkbuiltincache.h &&
test "x$REBUILD_PNGS" = "x#" ; then
AC_MSG_ERROR([
*** gtkstockpixbufs.h is not in the tree, and cannot be built
*** gtkbuiltincache.h is not in the tree, and cannot be built
*** because you don't have libpng, or (when cross-compiling) you
*** don't have a prebuilt gdk-pixbuf-csource on the host system.])
fi
@ -1628,7 +1628,6 @@ gtk/Makefile
gtk/makefile.msc
gtk/gtkversion.h
gtk/gtk-win32.rc
gtk/stock-icons/Makefile
gtk/theme-bits/Makefile
gtk/xdgmime/Makefile
modules/Makefile

View File

@ -1,3 +1,8 @@
2005-11-07 Matthias Clasen <mclasen@redhat.com>
* gtk/gtk-update-icon-cache.xml:
* gtk/gtk-update-icon-cache.1: Document the --source option.
2005-10-25 Matthias Clasen <mclasen@redhat.com>
* gtk/tmpl/gtkfilechooser.sgml: Don't use deprecated functions

View File

@ -2,7 +2,7 @@
.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
.\" Instead of manually editing it, you probably should edit the DocBook XML
.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
.TH "GTK\-UPDATE\-ICON\-CACH" "1" "08/26/2005" "" ""
.TH "GTK\-UPDATE\-ICON\-CACH" "1" "11/07/2005" "" ""
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
@ -11,13 +11,13 @@
gtk\-update\-icon\-cache \- Icon theme caching utility
.SH "SYNOPSIS"
.HP 22
\fBgtk\-update\-icon\-cache\fR [\-\-force] [\-\-index\-only] [\-\-ignore\-theme\-index] [\-\-quiet] {iconpath}
\fBgtk\-update\-icon\-cache\fR [\-\-force] [\-\-ignore\-theme\-index] [\-\-index\-only] [\-\-source\ [name]] [\-\-quiet] {iconpath}
.SH "DESCRIPTION"
.PP
\fBgtk\-update\-icon\-cache\fR
creates mmap()able cache files for icon themes.
.PP
If expects to be given the path to a icon theme directory containing an
It expects to be given the path to a icon theme directory containing an
\fIindex.theme\fR, e.g.
\fI/usr/share/icons/hicolor\fR, and writes a
\fIicon\-theme.cache\fR
@ -39,6 +39,11 @@ refuses to create an icon cache in a directory which does not appear to be the t
\-\-index\-only, \-i
Don't include image data in the cache.
.TP
\-\-source, \-c
Output a C header file declaring a constant
\fIname\fR
with the contents of the icon cache.
.TP
\-\-quiet, \-q
Turn off verbose output.
.SH "BUGS"

View File

@ -14,8 +14,9 @@
<cmdsynopsis>
<command>gtk-update-icon-cache</command>
<arg choice="opt">--force</arg>
<arg choice="opt">--index-only</arg>
<arg choice="opt">--ignore-theme-index</arg>
<arg choice="opt">--index-only</arg>
<arg choice="opt">--source<arg>name</arg></arg>
<arg choice="opt">--quiet</arg>
<arg choice="req">iconpath</arg>
</cmdsynopsis>
@ -44,8 +45,8 @@ multiple applications, the overall memory consumption is reduced as well.
<varlistentry>
<term>--force</term>
<term>-f</term>
<listitem><para>Overwrite an existing cache file even if it appears to be uptodate.
</para></listitem>
<listitem><para>Overwrite an existing cache file even if it appears to be
uptodate.</para></listitem>
</varlistentry>
<varlistentry>
@ -65,6 +66,14 @@ multiple applications, the overall memory consumption is reduced as well.
</para></listitem>
</varlistentry>
<varlistentry>
<term>--source</term>
<term>-c</term>
<listitem><para>Output a C header file declaring a constant
<replaceable>name</replaceable> with the contents of the icon
cache.</para></listitem>
</varlistentry>
<varlistentry>
<term>--quiet</term>
<term>-q</term>