[maemo-commits] [maemo-commits] r17608 - in projects/haf/trunk/gconf2: . backends

[From: subversion at stage.maemo.org]

Author: richard
Date: 2009-03-09 12:39:05 +0200 (Mon, 09 Mar 2009)
New Revision: 17608

Modified:
   projects/haf/trunk/gconf2/ChangeLog
   projects/haf/trunk/gconf2/backends/markup-tree.c
Log:
Merge revision 2765 from upstream, further optimizations to the markup
backend.


Modified: projects/haf/trunk/gconf2/ChangeLog
===================================================================
--- projects/haf/trunk/gconf2/ChangeLog	2009-03-09 10:34:18 UTC (rev 17607)
+++ projects/haf/trunk/gconf2/ChangeLog	2009-03-09 10:39:05 UTC (rev 17608)
@@ -1,5 +1,10 @@
 2009-03-09  Richard Hult  <richard at imendio.com>
 
+	* Merge revision 2765 from upstream, further optimizations to the
+	markup backend.
+
+2009-03-09  Richard Hult  <richard at imendio.com>
+
 	* Merge revision 2764 from upstream, further optimizations to the
 	markup backend.
 

Modified: projects/haf/trunk/gconf2/backends/markup-tree.c
===================================================================
--- projects/haf/trunk/gconf2/backends/markup-tree.c	2009-03-09 10:34:18 UTC (rev 17607)
+++ projects/haf/trunk/gconf2/backends/markup-tree.c	2009-03-09 10:39:05 UTC (rev 17608)
@@ -2382,9 +2382,10 @@
 
   if (type == NULL)
     {
-      set_error (error, context, GCONF_ERROR_PARSE_ERROR,
+	/* in fact this is a rather common case */
+/*      set_error (error, context, GCONF_ERROR_PARSE_ERROR,
                  _("No \"%s\" attribute on element <%s>"),
-                 "type", element_name);
+                 "type", element_name); */
       return;
     }