Make the iconfactory buildable implementation less strict

svn path=/trunk/; revision=20141

diff --git a/ChangeLog b/ChangeLog
index 9045f385300faf7e7b4a5c33fa181b6e8f712e95..4f18934eced916199190502ce76bdfc621d03474 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-05-24  Matthias Clasen  <mclasen@redhat.com>
+
+       Bug 520989 – icon factory buildable too strict
+
+       * gtk/gtkiconfactory.c (icon_source_start_element): Make filename
+       an optional attribute.
+
 2008-05-24  Matthias Clasen  <mclasen@redhat.com>
 
        Bug 387972 – gtkassistant drawing problem

diff --git a/docs/reference/gtk/tmpl/gtkiconfactory.sgml b/docs/reference/gtk/tmpl/gtkiconfactory.sgml
index db160c208d4f915cd729e08e4bd16da1caa456a8..6c716e0a3be57554226abdd77ac2d6dc04d801fc 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkiconfactory.sgml
+++ b/docs/reference/gtk/tmpl/gtkiconfactory.sgml
@@ -51,7 +51,7 @@ This attribute is mandatory</para></listitem>
 <varlistentry>
 <term>filename</term>
 <listitem><para>The filename of the source, a string.
-This attribute is mandatory</para>
+This attribute is optional</para>
 </listitem>
 </varlistentry>
 

diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c
index 7e1c7a96fa3aff73669f023863eab45294ad88ec..fe932c7a1657613a15afc2e03d09d9d6244f898b 100644 (file)
--- a/gtk/gtkiconfactory.c
+++ b/gtk/gtkiconfactory.c
@@ -2827,9 +2827,9 @@ icon_source_start_element (GMarkupParseContext *context,
        }
     }
 
-  if (!stock_id || !filename)
+  if (!stock_id)
     {
-      error_msg = g_strdup_printf ("<source> requires a stock_id and a filename");
+      error_msg = g_strdup_printf ("<source> requires a stock_id");
       error_domain = GTK_BUILDER_ERROR_MISSING_ATTRIBUTE;
       goto error;
     }