gtk+ r20141 - in trunk: . docs/reference/gtk/tmpl gtk

[matthiasc svn gnome org]

Author: matthiasc
Date: Sat May 24 23:19:01 2008
New Revision: 20141
URL: http://svn.gnome.org/viewvc/gtk+?rev=20141&view=rev

Log:
Make the iconfactory buildable implementation less strict


Modified:
   trunk/ChangeLog
   trunk/docs/reference/gtk/tmpl/gtkiconfactory.sgml
   trunk/gtk/gtkiconfactory.c

Modified: trunk/docs/reference/gtk/tmpl/gtkiconfactory.sgml
==============================================================================
--- trunk/docs/reference/gtk/tmpl/gtkiconfactory.sgml	(original)
+++ trunk/docs/reference/gtk/tmpl/gtkiconfactory.sgml	Sat May 24 23:19:01 2008
@@ -51,7 +51,7 @@
 <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>
 

Modified: trunk/gtk/gtkiconfactory.c
==============================================================================
--- trunk/gtk/gtkiconfactory.c	(original)
+++ trunk/gtk/gtkiconfactory.c	Sat May 24 23:19:01 2008
@@ -2827,9 +2827,9 @@
 	}
     }
 
-  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;
     }