summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShaun McCance <shaunm@src.gnome.org>2009-03-08 18:45:59 +0000
committerShaun McCance <shaunm@src.gnome.org>2009-03-08 18:45:59 +0000
commit368098751de2fb9d09fb375f39c7fc51e11112bd (patch)
treec64a2ddb6ba15ebb2cd6ab733797413a2f678aa4
parent57c0d064f4057e474c732e5e054c0dac16f5a588 (diff)
downloadyelp-368098751de2fb9d09fb375f39c7fc51e11112bd.tar.gz
- Unlock mutex on error, bug #568058, from Andy Owen
* src/yelp-document.c: - Unlock mutex on error, bug #568058, from Andy Owen * stylesheets/toc2html.xsl.in: - Indentation fix svn path=/trunk/; revision=3228
-rw-r--r--ChangeLog8
-rw-r--r--src/yelp-document.c9
-rw-r--r--stylesheets/toc2html.xsl.in4
3 files changed, 15 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 12371a9d..4c762bf3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-03-08 Shaun McCance <shaunm@gnome.org>
+
+ * src/yelp-document.c:
+ - Unlock mutex on error, bug #568058, from Andy Owen
+
+ * stylesheets/toc2html.xsl.in:
+ - Indentation fix
+
2009-03-02 Shaun McCance <shaunm@gnome.org>
* configure.in:
diff --git a/src/yelp-document.c b/src/yelp-document.c
index 21884185..bcef2f70 100644
--- a/src/yelp-document.c
+++ b/src/yelp-document.c
@@ -750,10 +750,11 @@ request_idle_final (YelpDocument *document)
g_mutex_lock (priv->mutex);
if (priv->reqs_pending == NULL) {
- /*
- Time to bail as we shouldn't be here anyway.
- */
- return FALSE;
+ /*
+ Time to bail as we shouldn't be here anyway.
+ */
+ g_mutex_unlock (priv->mutex);
+ return FALSE;
}
for (cur = priv->reqs_pending; cur; cur = cur->next) {
diff --git a/stylesheets/toc2html.xsl.in b/stylesheets/toc2html.xsl.in
index e36f84ec..f630e62f 100644
--- a/stylesheets/toc2html.xsl.in
+++ b/stylesheets/toc2html.xsl.in
@@ -70,9 +70,9 @@
float: </xsl:text><xsl:value-of select="$right"/><xsl:text>;
margin-</xsl:text><xsl:value-of select="$right"/><xsl:text>: 18px;
}
- h2 h3 {
+ h2 h3 {
color: </xsl:text><xsl:value-of select="$theme.color.text"/><xsl:text>;
- }
+ }
div[class~="body"] { }
div[class~="leftbar"] {
position: absolute;