- Move Applets into Applications. - Accomodote non-standard

* data/toc.xml.in:
- Move Applets into Applications.
- Accomodote non-standard GNOME|Applications|Accessories.

* src/yelp-theme.c:
- Don't be an idiot.  Use snprintf.

* src/yelp-window.c:
- Make the busy cursor go away when erroring out.

* stylesheets/db2html-html.xsl:
- Make admonitions use the only theme color we have for now.

* stylesheets/db2html-list.xsl:
- Don't bold varlistentry/term.  I might change this back.

7 files changed, 51 insertions, 60 deletions

diff --git a/ChangeLog b/ChangeLog
index c1c444d6..128ba412 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2003-12-29  Shaun McCance  <shaunm@gnome.org>
 
+	* data/toc.xml.in:
+	- Move Applets into Applications.
+	- Accomodote non-standard GNOME|Applications|Accessories.
+
+	* src/yelp-theme.c:
+	- Don't be an idiot.  Use snprintf.
+
+	* src/yelp-window.c:
+	- Make the busy cursor go away when erroring out.
+
+2003-12-29  Shaun McCance  <shaunm@gnome.org>
+
 	* src/yelp-uri.c:
 	- Consider #index to be equal to no fragment.
 
diff --git a/data/toc.xml.in b/data/toc.xml.in
index b39eaaa6..9207ea1c 100644
--- a/data/toc.xml.in
+++ b/data/toc.xml.in
@@ -9,14 +9,6 @@
 		<category>GNOME</category>
 		<category>GNOME|Core Desktop</category>
 		<category>GNOME|Desktop</category>
-		<category>GNOME|Applets</category>
-		<category>GNOME|Applets|Amusement</category>
-		<category>GNOME|Applets|Clock</category>
-		<category>GNOME|Applets|Monitors</category>
-		<category>GNOME|Applets|Multimedia</category>
-		<category>GNOME|Applets|Network</category>
-		<category>GNOME|Applets|Utility</category>
-		<category>GNOME|Graphics</category>
 		<category>GNOME|Settings</category>
 		<category>GNOME|System</category>
 		<category>GNOME|Other</category>
@@ -33,6 +25,19 @@
 		<_title>Applications</_title>
 
 		<category>GNOME|Applications</category>
+		<category>GNOME|Applications|Accessories</category>
+
+		<toc id="Applets">
+			<_title>Applets</_title>
+
+			<category>GNOME|Applets</category>
+			<category>GNOME|Applets|Amusement</category>
+			<category>GNOME|Applets|Clock</category>
+			<category>GNOME|Applets|Monitors</category>
+			<category>GNOME|Applets|Multimedia</category>
+			<category>GNOME|Applets|Network</category>
+			<category>GNOME|Applets|Utility</category>
+		</toc>
 
 		<toc id="Games">
 			<_title>Games and Entertainment</_title>
@@ -117,6 +122,7 @@
 			<category>Applications|Multimedia|Video|Editing</category>
 			<category>Applications|Multimedia|Video|Other</category>
 			<category>Applications|Multimedia|Other</category>
+			<category>GNOME|Graphics</category>
 			<category>GNOME|Multimedia</category>
 		</toc>
 
diff --git a/src/yelp-theme.c b/src/yelp-theme.c
index 748a7ede..3e246cb5 100644
--- a/src/yelp-theme.c
+++ b/src/yelp-theme.c
@@ -47,51 +47,16 @@ yelp_theme_init (void)
     if (!style) {
 	g_warning (_("Could not obtain a GtkStyle."));
     } else {
-	int state = GTK_STATE_NORMAL;
-	gushort rgb[3];
-	int i;
-
-	rgb[0] = style->bg[state].red >> 8;
-	rgb[1] = style->bg[state].green >> 8;
-	rgb[2] = style->bg[state].blue >> 8;
-
-	gray_background[0] = '"';
-	gray_background[1] = '#';
-	for (i = 0; i < 3; i++) {
-	    int j = rgb[i] / 16;
-	    if (j < 10)
-		gray_background[2*i+2] = '0' + j;
-	    else
-		gray_background[2*i+2] = 'A' + (j - 10);
-	    j = rgb[i] % 16;
-	    if (j < 10)
-		gray_background[2*i+3] = '0' + j;
-	    else
-		gray_background[2*i+3] = 'A' + (j - 10);
-	}
-	gray_background[8] = '"';
-	gray_background[9] = '\0';
-
-	rgb[0] = style->dark[state].red >> 8;
-	rgb[1] = style->dark[state].green >> 8;
-	rgb[2] = style->dark[state].blue >> 8;
-
-	gray_border[0] = '"';
-	gray_border[1] = '#';
-	for (i = 0; i < 3; i++) {
-	    int j = rgb[i] / 16;
-	    if (j < 10)
-		gray_border[2*i+2] = '0' + j;
-	    else
-		gray_border[2*i+2] = 'A' + (j - 10);
-	    j = rgb[i] % 16;
-	    if (j < 10)
-		gray_border[2*i+3] = '0' + j;
-	    else
-		gray_border[2*i+3] = 'A' + (j - 10);
-	}
-	gray_border[8] = '"';
-	gray_border[9] = '\0';
+	g_snprintf (gray_background, 10,
+		    "\"#%02X%02X%02X\"",
+		    style->bg[GTK_STATE_NORMAL].red >> 8,
+		    style->bg[GTK_STATE_NORMAL].green >> 8,
+		    style->bg[GTK_STATE_NORMAL].blue >> 8);
+	g_snprintf (gray_border, 10,
+		    "\"#%02X%02X%02X\"",
+		    style->dark[GTK_STATE_NORMAL].red >> 8,
+		    style->dark[GTK_STATE_NORMAL].green >> 8,
+		    style->dark[GTK_STATE_NORMAL].blue >> 8);
     }
 }
 
diff --git a/src/yelp-window.c b/src/yelp-window.c
index 348643eb..9872f0ef 100644
--- a/src/yelp-window.c
+++ b/src/yelp-window.c
@@ -998,6 +998,8 @@ window_disconnect (YelpWindow *window)
     YelpWindowPriv *priv = window->priv;
     g_return_if_fail (YELP_IS_WINDOW (window));
 
+    gdk_window_set_cursor (GTK_WIDGET (window)->window, NULL);
+
     if (priv->contents_handler) {
 	g_signal_handler_disconnect (priv->pager,
 				     priv->contents_handler);
@@ -1061,8 +1063,6 @@ pager_page_cb (YelpPager *pager,
     uri  = yelp_window_get_current_uri (window);
 
     if (yelp_pager_uri_is_page (pager, page_id, uri)) {
-	gdk_window_set_cursor (GTK_WIDGET (window)->window, NULL);
-
 	window_disconnect (window);
 
 	page = (YelpPage *) yelp_pager_get_page (pager, page_id);
@@ -1077,8 +1077,6 @@ pager_error_cb (YelpPager   *pager,
     YelpWindow *window = YELP_WINDOW (user_data);
     GError *error = yelp_pager_get_error (pager);
 
-    gdk_window_set_cursor (GTK_WIDGET (window)->window, NULL);
-
     window_disconnect (window);
     window_error (window, error);
 
diff --git a/stylesheets/ChangeLog b/stylesheets/ChangeLog
index 60605f8a..bdf4918c 100644
--- a/stylesheets/ChangeLog
+++ b/stylesheets/ChangeLog
@@ -1,3 +1,11 @@
+2003-12-30  Shaun McCance  <shaunm@gnome.org>
+
+	* db2html-html.xsl:
+	- Make admonitions use the only theme color we have for now.
+
+	* db2html-list.xsl:
+	- Don't bold varlistentry/term.  I might change this back.
+
 2003-12-29  Shaun McCance  <shaunm@gnome.org>
 
 	* db2html-division.xsl:
diff --git a/stylesheets/db2html-html.xsl b/stylesheets/db2html-html.xsl
index 396e5521..db62fc1f 100644
--- a/stylesheets/db2html-html.xsl
+++ b/stylesheets/db2html-html.xsl
@@ -166,8 +166,10 @@ div[class="admonition"] {
 	margin-right: 1.6em;
 	margin-bottom: 0.8em;
 	padding: 0.8em;
-	background-color: #CCCCCC;
-	border: solid 2px #C0C0C0;
+	background-color: </xsl:text>
+<xsl:value-of select="$color_gray_background"/><xsl:text>;
+	border: solid 1px </xsl:text>
+<xsl:value-of select="$color_gray_border"/><xsl:text>;
 }
 div[class="admonition"] td[class="image"] { margin-right: 1.6em; }
 
diff --git a/stylesheets/db2html-list.xsl b/stylesheets/db2html-list.xsl
index 4c45163e..d3c9d491 100644
--- a/stylesheets/db2html-list.xsl
+++ b/stylesheets/db2html-list.xsl
@@ -243,7 +243,7 @@
 </xsl:template>
 
 <xsl:template match="term">
-	<xsl:call-template name="inline.bold"/>
+	<xsl:call-template name="inline"/>
 </xsl:template>
 
 </xsl:stylesheet>