gtkhtml r9193 - trunk/gtkhtml

[tobiasmue svn gnome org]

Author: tobiasmue
Date: Wed Apr  8 10:36:38 2009
New Revision: 9193
URL: http://svn.gnome.org/viewvc/gtkhtml?rev=9193&view=rev

Log:
2009-04-08  Tobias Mueller  <tobiasmue svn gnome org>

    * htmlsearch.c (html_search_new):
    Use a proper format string ("%s") for g_warning.

    * htmlclueflow.c (write_flow_tag):
    Use a proper format string ("%s") for html_engine_save_output_string.

    Fixes bug #574335




Modified:
   trunk/gtkhtml/ChangeLog
   trunk/gtkhtml/htmlclueflow.c
   trunk/gtkhtml/htmlsearch.c

Modified: trunk/gtkhtml/htmlclueflow.c
==============================================================================
--- trunk/gtkhtml/htmlclueflow.c	(original)
+++ trunk/gtkhtml/htmlclueflow.c	Wed Apr  8 10:36:38 2009
@@ -1687,7 +1687,7 @@
 		char *p_str = get_p_str (self, state);
 
 		if (p_str) {
-			if (! html_engine_save_output_string (state, p_str))
+			if (! html_engine_save_output_string (state, "%s", p_str))
 				return FALSE;
 		}
 	}
@@ -1738,13 +1738,13 @@
 
 	if (is_item (self)) {
 		if (next && is_levels_equal (self, next) && !is_item (next) && !html_clueflow_contains_table (self)) {
-			if (!html_engine_save_output_string (state, br_str))
+			if (!html_engine_save_output_string (state, "%s", br_str))
 				return FALSE;
 		} else if (!html_engine_save_output_string (state, "\n"))
 			return FALSE;
 	} else if (is_levels_equal (self, next) && self->style == next->style) {
 		if (self->style != HTML_CLUEFLOW_STYLE_PRE && !html_clueflow_contains_table (self)) {
-			if (!html_engine_save_output_string (state, br_str))
+			if (!html_engine_save_output_string (state, "%s", br_str))
 				return FALSE;
 		} else {
 			if (!html_engine_save_output_string (state, "\n"))
@@ -1755,7 +1755,7 @@
 
 		if (self->style != HTML_CLUEFLOW_STYLE_PRE) {
 			if ((!html_clueflow_contains_table (self) && !end && next && self->style == next->style) || html_clueflow_is_empty (self)) {
-				if (!html_engine_save_output_string (state, br_str))
+				if (!html_engine_save_output_string (state, "%s", br_str))
 					return FALSE;
 			} else {
 				if (!html_engine_save_output_string (state, "\n"))

Modified: trunk/gtkhtml/htmlsearch.c
==============================================================================
--- trunk/gtkhtml/htmlsearch.c	(original)
+++ trunk/gtkhtml/htmlsearch.c	Wed Apr  8 10:36:38 2009
@@ -96,7 +96,7 @@
 		if (rv_int) {
 			char buf[1024];
 			if (regerror(rv_int, ns->reb, buf, sizeof(buf))) {
-				g_warning (buf);
+				g_warning ("%s", buf);
 			} else {
 				g_warning ("regcomp failed, error code %d", rv_int);
 			}