Make colours reflect theme better Fix crash on NULL search string. Again.

* src/yelp-settings.c: 
Make colours reflect theme better
* src/yelp-search-parser.c:
Fix crash on NULL search string.  Again.
Correct a small typo in translator comment
* README:
Update slightly to remove scrollkeeper references

svn path=/trunk/; revision=3018

4 files changed, 30 insertions, 24 deletions

diff --git a/ChangeLog b/ChangeLog
index 1e9f9764..21cd7161 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2008-01-07  Don Scorgie  <dscorgie@svn.gnome.org>
+
+	* src/yelp-settings.c: 
+	Make colours reflect theme better
+
+	* src/yelp-search-parser.c:
+	Fix crash on NULL search string.  Again.
+	Correct a small typo in translator comment
+
+	* README:
+	Update slightly to remove scrollkeeper references
+	
 2008-01-04  Shaun McCance  <shaunm@gnome.org>
 
 	* data/toc.xml.in:
diff --git a/README b/README
index 2ef89855..43b57528 100644
--- a/README
+++ b/README
@@ -10,8 +10,8 @@ Yelp is pronounced the same as the swedish word for 'help'.
 Requirments:
 ------------
 
-* GNOME 2.0 ( >= 2.0.2 )
-* A working ScrollKeeper installation ( > 0.3.14 )
+* GNOME 2.0 ( >= 2.21.1 )
+* A working Rarian installation (0.7.x/0.8.x series)
 * GNOME Documentation Utilities (gnome-doc-utils > 0.5.2)
 * Version 4.1.2 of the DocBook XML DTD
 
@@ -44,17 +44,3 @@ interface, the API keyword should also be included.
   
 Patches should be in unified diff form. (The -u option to GNU diff.)
 
-
-Help on setting your system up:
--------------------------------
-
-A brief note on how to get the docbook stuff to work. 
-
-1) Install Scrollkeeper 0.3.14: 
-http://prdownloads.sourceforge.net/scrollkeeper/scrollkeeper-0.3.14.tar.gz
-
-Edit /etc/scrollkeeper.conf to include your $(gnome2_prefix)/share/omf
-directory. For best use in GNOME 2.0, remove all other directories. 
-
-Run scrollkeeper-update. 
-
diff --git a/src/yelp-search-parser.c b/src/yelp-search-parser.c
index 4ab87052..611ce403 100644
--- a/src/yelp-search-parser.c
+++ b/src/yelp-search-parser.c
@@ -884,7 +884,7 @@ build_lists (gchar *search_terms, gchar ***terms, gint **dups,
      * to words.  Things that may be put at ends of words to slightly 
      * alter their meaning (like -ing and -s in English).  This is a
      * colon seperated list (I like colons).  If there are none,
-     * please use the strig NULL.  If there is only 1, please
+     * please use the string NULL.  If there is only 1, please
      * add a colon at the end of the list
      */
     common_suffixes = g_strdup (_("ers:er:ing:es:s:'s"));
@@ -977,7 +977,10 @@ build_lists (gchar *search_terms, gchar ***terms, gint **dups,
     (*dups) = g_new0 (gint, n_terms);
     (*stops) = g_new0 (gboolean, n_terms);
     list_copy = g_strsplit (dup_str, ":", -1);
-    
+
+    if (n_terms == 0)
+	goto done;
+	
     for (iter = *terms; *iter; iter++) {
 	i++;
 	if (g_str_equal (list_copy[i], "O")) {
@@ -994,6 +997,7 @@ build_lists (gchar *search_terms, gchar ***terms, gint **dups,
 	}
     }
 
+ done:
     /* Clean up all those pesky strings */
     g_free (ignore_words);
     g_free (common_prefixes);
@@ -1022,6 +1026,9 @@ slow_search_setup (YelpSearchParser *parser)
    terms_number = build_lists (parser->search_terms,&terms_list, 
 				&dup_list, &stop_list, 
 				&required_no);
+   if (terms_number < 1)
+       goto done;
+       
    data = g_new0 (SearchDocData, 1);
    data->container = g_new0 (SearchContainer, 1);
    data->parser = parser;
@@ -1036,7 +1043,8 @@ slow_search_setup (YelpSearchParser *parser)
 
    search_process_man (parser, terms_list);
    search_process_info (parser, terms_list);
- 
+
+ done: 
    check_finished (parser);
 
    return FALSE;
diff --git a/src/yelp-settings.c b/src/yelp-settings.c
index 92d9879e..98d04bfa 100644
--- a/src/yelp-settings.c
+++ b/src/yelp-settings.c
@@ -734,9 +734,9 @@ settings_update (YelpSettingsType type)
 		    style->text[GTK_STATE_NORMAL].green / 65535.0,
 		    style->text[GTK_STATE_NORMAL].blue / 65535.0,
 		    &text_h, &text_l, &text_s);
-	rgb_to_hls (style->base[GTK_STATE_NORMAL].red / 65535.0,
-		    style->base[GTK_STATE_NORMAL].green / 65535.0,
-		    style->base[GTK_STATE_NORMAL].blue / 65535.0,
+	rgb_to_hls (style->bg[GTK_STATE_NORMAL].red / 65535.0,
+		    style->bg[GTK_STATE_NORMAL].green / 65535.0,
+		    style->bg[GTK_STATE_NORMAL].blue / 65535.0,
 		    &base_h, &base_l, &base_s);
 
 	/* YELP_COLOR_FG */
@@ -792,11 +792,11 @@ settings_update (YelpSettingsType type)
 		    base_s,
 		    YELP_COLOR_GRAY_BORDER);
 
-	hls_to_hex (240,
+	hls_to_hex (base_h,
 		    base_l - ((base_l - text_l) * 0.05),
 		    0.6,
 		    YELP_COLOR_BLUE_BG);
-	hls_to_hex (240, 
+	hls_to_hex (base_h,
 		    base_l - ((base_l - text_l) * 0.1),
 		    0.6,
 		    YELP_COLOR_BLUE_BORDER);