[gtk+/gtk-2-24] gtk-update-icon-cache: Add an --include-image-data option

[Matthias Clasen <matthiasc src gnome org>]

commit 30f24286717a64dac3d0938ebb1d01a5b18254c2
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Jun 14 19:30:17 2014 -0400

    gtk-update-icon-cache: Add an --include-image-data option
    
    Now that we don't include the image data by default anymore,
    lets add an option that  does it.
    
    Conflicts:
        docs/reference/gtk/gtk-update-icon-cache.xml

 docs/reference/gtk/gtk-update-icon-cache.xml |   13 +++++++++++--
 gtk/updateiconcache.c                        |    1 +
 2 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/docs/reference/gtk/gtk-update-icon-cache.xml b/docs/reference/gtk/gtk-update-icon-cache.xml
index 4d3f4a8..31ecd6d 100644
--- a/docs/reference/gtk/gtk-update-icon-cache.xml
+++ b/docs/reference/gtk/gtk-update-icon-cache.xml
@@ -19,8 +19,11 @@
 <command>gtk-update-icon-cache</command>
 <arg choice="opt">--force</arg>
 <arg choice="opt">--ignore-theme-index</arg>
-<arg choice="opt">--index-only</arg>
-<arg choice="opt">--source<arg>name</arg></arg>
+<group>
+  <arg choice="plain">--index-only</arg>
+  <arg choice="plain">--include-image-data</arg>
+</group>
+<arg choice="opt">--source <arg choice="plain"><replaceable>NAME</replaceable></arg></arg>
 <arg choice="opt">--quiet</arg>
 <arg choice="opt">--validate</arg>
 <arg choice="req">iconpath</arg>
@@ -72,6 +75,12 @@ multiple applications, the overall memory consumption is reduced as well.
   </varlistentry>
 
   <varlistentry>
+    <term>--include-image-data</term>
+    <listitem><para>Include image data in the cache.
+    </para></listitem>
+  </varlistentry>
+
+  <varlistentry>
     <term>--source</term>
     <term>-c</term>
     <listitem><para>Output a C header file declaring a constant 
diff --git a/gtk/updateiconcache.c b/gtk/updateiconcache.c
index 785116f..3ed3253 100644
--- a/gtk/updateiconcache.c
+++ b/gtk/updateiconcache.c
@@ -1659,6 +1659,7 @@ static GOptionEntry args[] = {
   { "force", 'f', 0, G_OPTION_ARG_NONE, &force_update, N_("Overwrite an existing cache, even if up to 
date"), NULL },
   { "ignore-theme-index", 't', 0, G_OPTION_ARG_NONE, &ignore_theme_index, N_("Don't check for the existence 
of index.theme"), NULL },
   { "index-only", 'i', 0, G_OPTION_ARG_NONE, &index_only, N_("Don't include image data in the cache"), NULL 
},
+  { "include-image-data", 0, G_OPTION_FLAG_REVERSE, G_OPTION_ARG_NONE, &index_only, N_("Include image data 
in the cache"), NULL },
   { "source", 'c', 0, G_OPTION_ARG_STRING, &var_name, N_("Output a C header file"), "NAME" },
   { "quiet", 'q', 0, G_OPTION_ARG_NONE, &quiet, N_("Turn off verbose output"), NULL },
   { "validate", 'v', 0, G_OPTION_ARG_NONE, &validate, N_("Validate existing icon cache"), NULL },