Fix bookmarks export to HTML. Bug #345925, patch by Stefan Stuhr.

2006-12-17  Christian Persch  <chpe@cvs.gnome.org>

	* data/epiphany-bookmarks-html.xsl:

	Fix bookmarks export to HTML. Bug #345925, patch by Stefan Stuhr.

3 files changed, 28 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index 75be8fcd4..43739a32b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2006-12-17  Christian Persch  <chpe@cvs.gnome.org>
 
+	* data/epiphany-bookmarks-html.xsl:
+
+	Fix bookmarks export to HTML. Bug #345925, patch by Stefan Stuhr.
+
+2006-12-17  Christian Persch  <chpe@cvs.gnome.org>
+
 	* configure.ac:
 
 	Bump version to 2.17.4.
diff --git a/data/epiphany-bookmarks-html.xsl b/data/epiphany-bookmarks-html.xsl
index 2bd752de7..1b9014501 100644
--- a/data/epiphany-bookmarks-html.xsl
+++ b/data/epiphany-bookmarks-html.xsl
@@ -42,23 +42,19 @@ $Id$
     <dl>
 
     <!-- Items with Topics assigned will be processed first -->
-    <xsl:for-each select="purl:item[count(. | key('topics', dc:subject)[1]) = 1]">
-        <xsl:sort select="dc:subject" />
+    <xsl:for-each select="purl:item/dc:subject[count(.. | key('topics', .)[1]) = 1]">
+        <xsl:sort select="." />
 
-        <!-- Test if a topic is assigned -->
-        <xsl:if test="dc:subject">
-
-            <dt><h3><xsl:value-of select="dc:subject" /></h3><dl>
-            <xsl:for-each select="key('topics', dc:subject)">
-                <xsl:sort select="purl:title" />
-                <dt><a href="{./purl:link}"><xsl:value-of select="./purl:title" /></a></dt>
-            </xsl:for-each>
+        <dt><h3><xsl:value-of select="." /></h3><dl>
+        <xsl:for-each select="key('topics', .)">
+            <xsl:sort select="purl:title" />
+            <dt><a href="{./purl:link}"><xsl:value-of select="./purl:title" /></a></dt>
+        </xsl:for-each>
 
-            <!-- Force a linebreak; otherwise thinks will break for Topics with only 1 item -->
-            <xsl:text>
-            </xsl:text>
-            </dl></dt>
-        </xsl:if>
+        <!-- Force a linebreak; otherwise thinks will break for Topics with only 1 item -->
+        <xsl:text>
+        </xsl:text>
+        </dl></dt>
     </xsl:for-each>
 
     <!-- Now Bookmarks without topics will be added at the bottom of the output file -->
diff --git a/doc/reference/tmpl/ephy-embed.sgml b/doc/reference/tmpl/ephy-embed.sgml
index 5c6a8c225..c10f33f57 100644
--- a/doc/reference/tmpl/ephy-embed.sgml
+++ b/doc/reference/tmpl/ephy-embed.sgml
@@ -267,7 +267,6 @@ be done by casting).
 @: 
 @: 
 @: 
-@: 
 @:
 @Param2: 
 @Param3: 
@@ -282,6 +281,16 @@ be done by casting).
 @event: 
 @Returns: 
 
+<!-- ##### SIGNAL EphyEmbed::ge-search-link ##### -->
+<para>
+
+</para>
+
+@ephyembed: the object which received the signal.
+@arg1: 
+@arg2: 
+@arg3: 
+
 <!-- ##### SIGNAL EphyEmbed::ge-security-change ##### -->
 <para>
 
@@ -307,6 +316,7 @@ be done by casting).
 @context_menu: 
 @favicon: 
 @feed_link: 
+@search_link: 
 @location: 
 @net_state: 
 @dom_mouse_click: