GNOME.org
 

[gtkhtml] Coding style and whitespace cleanup.

commit 2ceb6a3a069ede7778dbddd2e80caf346532dd8f
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Jan 30 17:22:06 2010 -0500

    Coding style and whitespace cleanup.

 a11y/text.c                             |    2 +-
 gtkhtml/gtkhtml-embedded.h              |    2 +-
 gtkhtml/gtkhtml.c                       |    8 +-
 gtkhtml/gtkhtmldebug.c                  |    2 +-
 gtkhtml/htmlclue.c                      |    8 +-
 gtkhtml/htmlclueflow.c                  |   24 ++++----
 gtkhtml/htmlcluev.c                     |   18 +++---
 gtkhtml/htmlcursor.c                    |   30 +++++-----
 gtkhtml/htmlembedded.c                  |    8 +-
 gtkhtml/htmlengine-edit-clueflowstyle.c |    2 +-
 gtkhtml/htmlengine-edit-cursor.c        |    2 +-
 gtkhtml/htmlengine-edit-fontstyle.c     |    4 +-
 gtkhtml/htmlengine-edit-movement.c      |    2 +-
 gtkhtml/htmlengine-edit-text.c          |    2 +-
 gtkhtml/htmlengine-save.c               |   14 ++--
 gtkhtml/htmlengine.c                    |  104 +++++++++++++++---------------
 gtkhtml/htmlgdkpainter.c                |    4 +-
 gtkhtml/htmlimage.c                     |    6 +-
 gtkhtml/htmlmarshal.c                   |    2 +-
 gtkhtml/htmlobject.c                    |    4 +-
 gtkhtml/htmlprinter.c                   |   28 ++++----
 gtkhtml/htmlstack.c                     |    2 +-
 gtkhtml/htmltablecell.c                 |    4 +-
 gtkhtml/htmltext.c                      |    2 +-
 24 files changed, 142 insertions(+), 142 deletions(-)
---
diff --git a/a11y/text.c b/a11y/text.c
index 7b5c158..fc34c05 100644
--- a/a11y/text.c
+++ b/a11y/text.c
@@ -1157,7 +1157,7 @@ static gint
 html_a11y_text_get_n_links (AtkHypertext *hypertext)
 {
 	HTMLText *text = HTML_TEXT (HTML_A11Y_HTML (hypertext));
-	if (!text || ! HTML_IS_TEXT (text))
+	if (!text || !HTML_IS_TEXT (text))
 		return 0;
 	return g_slist_length (text->links);
 }
diff --git a/gtkhtml/gtkhtml-embedded.h b/gtkhtml/gtkhtml-embedded.h
index 98c1732..564e9e9 100644
--- a/gtkhtml/gtkhtml-embedded.h
+++ b/gtkhtml/gtkhtml-embedded.h
@@ -69,4 +69,4 @@ void gtk_html_embedded_set_parameter (GtkHTMLEmbedded *ge, gchar *param, gchar *
 gchar *gtk_html_embedded_get_parameter (GtkHTMLEmbedded *ge, gchar *param);
 void gtk_html_embedded_set_descent (GtkHTMLEmbedded *ge, gint descent);
 
-#endif /* ! _GTK_HTML_EMBEDDED_H */
+#endif /* _GTK_HTML_EMBEDDED_H */
diff --git a/gtkhtml/gtkhtml.c b/gtkhtml/gtkhtml.c
index ebb908b..f3a14e8 100644
--- a/gtkhtml/gtkhtml.c
+++ b/gtkhtml/gtkhtml.c
@@ -337,7 +337,7 @@ gtk_html_update_styles (GtkHTML *html)
 
 	/* printf ("gtk_html_update_styles called\n"); */
 
-	if (! html_engine_get_editable (html->engine))
+	if (!html_engine_get_editable (html->engine))
 		return;
 
 	engine          = html->engine;
@@ -2059,7 +2059,7 @@ button_release_event (GtkWidget *initial_widget,
 		html->in_selection_drag = FALSE;
 
 		if (!html->priv->dnd_in_progress
-		    && html->pointer_url != NULL && ! html->in_selection
+		    && html->pointer_url != NULL && !html->in_selection
 		    && (!gtk_html_get_editable (html) || html->priv->in_url_test_mode)) {
 			g_signal_emit (widget,  signals[LINK_CLICKED], 0, html->pointer_url);
 			focus_object = html_engine_get_focus_object (html->engine, &focus_object_offset);
@@ -3676,7 +3676,7 @@ gtk_html_begin (GtkHTML *html)
 GtkHTMLStream *
 gtk_html_begin_content (GtkHTML *html, const gchar *content_type)
 {
-	g_return_val_if_fail (! gtk_html_get_editable (html), NULL);
+	g_return_val_if_fail (!gtk_html_get_editable (html), NULL);
 
 	return gtk_html_begin_full (html, NULL, content_type , 0);
 }
@@ -4225,7 +4225,7 @@ gtk_html_set_paragraph_style (GtkHTML *html,
 	    && (current_style != HTML_CLUEFLOW_STYLE_LIST_ITEM || item_type == cur_item_type))
 		return;
 
-	if (! html_engine_set_clueflow_style (html->engine, clueflow_style, item_type, 0, 0, NULL,
+	if (!html_engine_set_clueflow_style (html->engine, clueflow_style, item_type, 0, 0, NULL,
 					      HTML_ENGINE_SET_CLUEFLOW_STYLE, HTML_UNDO_UNDO, TRUE))
 		return;
 
diff --git a/gtkhtml/gtkhtmldebug.c b/gtkhtml/gtkhtmldebug.c
index 0433e25..5b93693 100644
--- a/gtkhtml/gtkhtmldebug.c
+++ b/gtkhtml/gtkhtmldebug.c
@@ -63,7 +63,7 @@ gtk_html_debug_log (GtkHTML *html,
 {
 	va_list ap;
 
-	if (! html->debug)
+	if (!html->debug)
 		return;
 
 	va_start (ap, format);
diff --git a/gtkhtml/htmlclue.c b/gtkhtml/htmlclue.c
index 351940b..43402b1 100644
--- a/gtkhtml/htmlclue.c
+++ b/gtkhtml/htmlclue.c
@@ -476,7 +476,7 @@ save (HTMLObject *self,
 	clue = HTML_CLUE (self);
 
 	for (p = clue->head; p != NULL; p = p->next) {
-		if (! html_object_save (p, state))
+		if (!html_object_save (p, state))
 		    return FALSE;
 	}
 
@@ -494,7 +494,7 @@ save_plain (HTMLObject *self,
 	clue = HTML_CLUE (self);
 
 	for (p = clue->head; p != NULL; p = p->next) {
-		if (! html_object_save_plain (p, state, requested_width))
+		if (!html_object_save_plain (p, state, requested_width))
 		    return FALSE;
 	}
 
@@ -818,7 +818,7 @@ html_clue_append (HTMLClue *clue,
 
 	tail = get_tail (o);
 
-	if (! clue->head) {
+	if (!clue->head) {
 		clue->head = o;
 		o->prev = NULL;
 	} else {
@@ -854,7 +854,7 @@ html_clue_prepend (HTMLClue *clue,
 
 	tail = get_tail (o);
 
-	if (! clue->head) {
+	if (!clue->head) {
 		clue->head = o;
 		clue->tail = tail;
 		o->prev = NULL;
diff --git a/gtkhtml/htmlclueflow.c b/gtkhtml/htmlclueflow.c
index 116b244..d3972fa 100644
--- a/gtkhtml/htmlclueflow.c
+++ b/gtkhtml/htmlclueflow.c
@@ -503,16 +503,16 @@ get_pre_padding (HTMLClueFlow *flow, guint pad)
 
 		if (flow->style == HTML_CLUEFLOW_STYLE_PRE
 		    && prev->style != HTML_CLUEFLOW_STYLE_PRE
-		    && ! is_header (prev))
+		    && !is_header (prev))
 			return pad;
 
-		if (is_header (flow) && ! is_header (prev))
+		if (is_header (flow) && !is_header (prev))
 			return pad;
 
 		return 0;
 	}
 
-	if (! is_header (flow) && flow->levels->len == 0)
+	if (!is_header (flow) && flow->levels->len == 0)
 		return 0;
 
 	return pad;
@@ -542,7 +542,7 @@ get_post_padding (HTMLClueFlow *flow,
 
 		if (flow->style == HTML_CLUEFLOW_STYLE_PRE
 		    && next->style != HTML_CLUEFLOW_STYLE_PRE
-		    && ! is_header (next))
+		    && !is_header (next))
 			return pad;
 
 		if (is_header (flow))
@@ -551,7 +551,7 @@ get_post_padding (HTMLClueFlow *flow,
 		return 0;
 	}
 
-	if (! is_header (flow) && flow->levels->len == 0)
+	if (!is_header (flow) && flow->levels->len == 0)
 		return 0;
 
 	return pad;
@@ -590,7 +590,7 @@ get_level_indent (HTMLClueFlow *flow,
 	guint indent = 0;
 	gint i = 0;
 
-	if (flow->levels->len > 0 || ! is_item (flow)) {
+	if (flow->levels->len > 0 || !is_item (flow)) {
 		guint cite_width, indent_width;
 
 		cite_width = html_painter_get_block_cite_width (painter, GTK_HTML_FONT_STYLE_SIZE_3, NULL, dir)
@@ -987,7 +987,7 @@ layout_aligned (HTMLObject *o, HTMLPainter *painter, HTMLObject *cur,
 		GList **changed_objs, gboolean *leaf_children_changed_size,
 		gint *lmargin, gint *rmargin, gint indent, gboolean *changed)
 {
-	if (! html_clue_appended (HTML_CLUE (o->parent), HTML_CLUE (cur))) {
+	if (!html_clue_appended (HTML_CLUE (o->parent), HTML_CLUE (cur))) {
 		html_object_calc_size (cur, painter, changed_objs);
 
 		if (HTML_CLUE (cur)->halign == HTML_HALIGN_LEFT)
@@ -1686,7 +1686,7 @@ write_flow_tag (HTMLClueFlow *self, HTMLEngineSaveState *state)
 		const gchar *p_str = get_p_str (self, state);
 
 		if (p_str) {
-			if (! html_engine_save_output_string (state, "%s", p_str))
+			if (!html_engine_save_output_string (state, "%s", p_str))
 				return FALSE;
 		}
 	}
@@ -1716,7 +1716,7 @@ write_flow_tag (HTMLClueFlow *self, HTMLEngineSaveState *state)
 	halign = HTML_CLUE (self)->halign;
 	/* Alignment tag.  */
 	if (halign != HTML_HALIGN_NONE && halign != HTML_HALIGN_LEFT) {
-		if (! html_engine_save_output_string
+		if (!html_engine_save_output_string
 		    (state, "<DIV ALIGN=%s>",
 		     html_engine_save_get_paragraph_align (html_alignment_to_paragraph (halign))))
 			return FALSE;
@@ -1726,12 +1726,12 @@ write_flow_tag (HTMLClueFlow *self, HTMLEngineSaveState *state)
 		return FALSE;
 
 	/* Paragraph's content.  */
-	if (! HTML_OBJECT_CLASS (&html_clue_class)->save (HTML_OBJECT (self), state))
+	if (!HTML_OBJECT_CLASS (&html_clue_class)->save (HTML_OBJECT (self), state))
 		return FALSE;
 
 	/* Close alignment tag.  */
 	if (halign != HTML_HALIGN_NONE && halign != HTML_HALIGN_LEFT) {
-		if (! html_engine_save_output_string (state, "</DIV>"))
+		if (!html_engine_save_output_string (state, "</DIV>"))
 			return FALSE;
 	}
 
@@ -1779,7 +1779,7 @@ write_flow_tag (HTMLClueFlow *self, HTMLEngineSaveState *state)
 				const gchar *head_p_str = get_p_str (HTML_CLUEFLOW (head), state);
 
 				if (head_p_str) {
-					if (! html_engine_save_output_string (state, "</P>\n"))
+					if (!html_engine_save_output_string (state, "</P>\n"))
 						return FALSE;
 				}
 			}
diff --git a/gtkhtml/htmlcluev.c b/gtkhtml/htmlcluev.c
index 3d3c874..e07f9ae 100644
--- a/gtkhtml/htmlcluev.c
+++ b/gtkhtml/htmlcluev.c
@@ -48,9 +48,9 @@ remove_aligned_by_parent ( HTMLClueV *cluev,
     tmp = NULL;
     obj = cluev->align_left_list;
 
-    while ( obj ) {
-		if ( obj->parent == p ) {
-			if ( tmp ) {
+    while (obj) {
+		if (obj->parent == p) {
+			if (tmp) {
 				tmp->next_aligned = HTML_CLUEALIGNED (obj)->next_aligned;
 				tmp = HTML_CLUEALIGNED (obj);
 			} else {
@@ -68,9 +68,9 @@ remove_aligned_by_parent ( HTMLClueV *cluev,
     tmp = NULL;
     obj = cluev->align_right_list;
 
-    while ( obj ) {
-		if ( obj->parent == p ) {
-			if ( tmp ) {
+    while (obj) {
+		if (obj->parent == p) {
+			if (tmp) {
 				tmp->next_aligned = HTML_CLUEALIGNED (obj)->next_aligned;
 				tmp = HTML_CLUEALIGNED (obj);
 			} else {
@@ -269,7 +269,7 @@ html_cluev_do_layout (HTMLObject *o, HTMLPainter *painter, gboolean calc_size, G
 			o->ascent = aclue->y + aclue->parent->y - aclue->parent->ascent;
 	}
 
-	if (! changed
+	if (!changed
 	    && (o->ascent != old_ascent || o->descent != old_descent || o->width != old_width))
 		changed = TRUE;
 
@@ -515,7 +515,7 @@ check_point (HTMLObject *self,
 	for (p = HTML_CLUE (self)->head; p != 0; p = p->next) {
 		gint x1, y1;
 
-		if (! for_cursor) {
+		if (!for_cursor) {
 			x1 = x;
 			y1 = y;
 		} else {
@@ -596,7 +596,7 @@ relayout (HTMLObject *self,
 		self->y = self->ascent;
 	} else {
 		/* Relayout our parent starting from us.  */
-		if (! html_object_relayout (self->parent, engine, self))
+		if (!html_object_relayout (self->parent, engine, self))
 			html_engine_queue_draw (engine, self);
 	}
 
diff --git a/gtkhtml/htmlcursor.c b/gtkhtml/htmlcursor.c
index 8f4782c..07f7652 100644
--- a/gtkhtml/htmlcursor.c
+++ b/gtkhtml/htmlcursor.c
@@ -369,7 +369,7 @@ html_cursor_up (HTMLCursor *cursor,
 				     engine->painter, cursor->offset,
 				     &x, &y);
 
-	if (! cursor->have_target_x) {
+	if (!cursor->have_target_x) {
 		cursor->target_x = x;
 		cursor->have_target_x = TRUE;
 	}
@@ -384,7 +384,7 @@ html_cursor_up (HTMLCursor *cursor,
 		prev_x = x;
 		prev_y = y;
 
-		if (! backward (cursor, engine, FALSE))
+		if (!backward (cursor, engine, FALSE))
 			return FALSE;
 
 		html_object_get_cursor_base (cursor->object,
@@ -411,7 +411,7 @@ html_cursor_up (HTMLCursor *cursor,
 
 		if (dir == HTML_DIRECTION_RTL) {
 			if (new_line && x >= target_x) {
-				if (! cursor->have_target_x) {
+				if (!cursor->have_target_x) {
 					cursor->have_target_x = TRUE;
 					cursor->target_x = target_x;
 				}
@@ -429,7 +429,7 @@ html_cursor_up (HTMLCursor *cursor,
 			}
 		} else {
 			if (new_line && x <= target_x) {
-				if (! cursor->have_target_x) {
+				if (!cursor->have_target_x) {
 					cursor->have_target_x = TRUE;
 					cursor->target_x = target_x;
 				}
@@ -484,7 +484,7 @@ html_cursor_down (HTMLCursor *cursor,
 				     engine->painter, cursor->offset,
 				     &x, &y);
 
-	if (! cursor->have_target_x) {
+	if (!cursor->have_target_x) {
 		cursor->target_x = x;
 		cursor->have_target_x = TRUE;
 	}
@@ -499,10 +499,10 @@ html_cursor_down (HTMLCursor *cursor,
 		prev_y = y;
 
 		if (dir == HTML_DIRECTION_RTL) {
-			if (! move_left (cursor, engine))
+			if (!move_left (cursor, engine))
 				return FALSE;
 		} else {
-			if (! move_right (cursor, engine))
+			if (!move_right (cursor, engine))
 				return FALSE;
 		}
 
@@ -530,7 +530,7 @@ html_cursor_down (HTMLCursor *cursor,
 
 		if (dir == HTML_DIRECTION_RTL) {
 			if (new_line && x <= target_x) {
-				if (! cursor->have_target_x) {
+				if (!cursor->have_target_x) {
 					cursor->have_target_x = TRUE;
 					cursor->target_x = target_x;
 				}
@@ -548,7 +548,7 @@ html_cursor_down (HTMLCursor *cursor,
 			}
 		} else {
 			if (new_line && x >= target_x) {
-				if (! cursor->have_target_x) {
+				if (!cursor->have_target_x) {
 					cursor->have_target_x = TRUE;
 					cursor->target_x = target_x;
 				}
@@ -708,12 +708,12 @@ html_cursor_real_jump_to_position (HTMLCursor *cursor,
 
 	if (cursor->position < position) {
 		while (cursor->position < position) {
-			if (! forward (cursor, engine, exact_position))
+			if (!forward (cursor, engine, exact_position))
 				break;
 		}
 	} else if (cursor->position > position) {
 		while (cursor->position > position) {
-			if (! backward (cursor, engine, exact_position))
+			if (!backward (cursor, engine, exact_position))
 				break;
 		}
 	}
@@ -807,7 +807,7 @@ html_cursor_get_current_char (const HTMLCursor *cursor)
 
 	g_return_val_if_fail (cursor != NULL, 0);
 
-	if (! html_object_is_text (cursor->object)) {
+	if (!html_object_is_text (cursor->object)) {
 		if (cursor->offset < html_object_get_length (cursor->object))
 			return 0;
 
@@ -822,7 +822,7 @@ html_cursor_get_current_char (const HTMLCursor *cursor)
 		return html_text_get_char (HTML_TEXT (cursor->object), cursor->offset);
 
 	next = html_object_next_not_slave (cursor->object);
-	if (next == NULL || ! html_object_is_text (next))
+	if (next == NULL || !html_object_is_text (next))
 		return 0;
 
 	return html_text_get_char (HTML_TEXT (next), 0);
@@ -1092,7 +1092,7 @@ html_cursor_left_edge_of_line (HTMLCursor *cursor, HTMLEngine *engine)
 				     &x, &prev_y);
 
 	while (1) {
-		if (! left_in_flow (cursor, engine))
+		if (!left_in_flow (cursor, engine))
 			return TRUE;
 
 		html_object_get_cursor_base (cursor->object, engine->painter, cursor->offset,
@@ -1205,7 +1205,7 @@ html_cursor_right_edge_of_line (HTMLCursor *cursor, HTMLEngine *engine)
 				     &x, &prev_y);
 
 	while (1) {
-		if (! right_in_flow (cursor, engine))
+		if (!right_in_flow (cursor, engine))
 			return TRUE;
 
 		html_object_get_cursor_base (cursor->object, engine->painter, cursor->offset,
diff --git a/gtkhtml/htmlembedded.c b/gtkhtml/htmlembedded.c
index eed113c..651444c 100644
--- a/gtkhtml/htmlembedded.c
+++ b/gtkhtml/htmlembedded.c
@@ -249,7 +249,7 @@ html_embedded_encode_string (const gchar *before, const gchar *codepage)
 		g_iconv_close(iconv_cd);
 	    }
 
-        while ( pos < strlen(str) ) {
+        while (pos < strlen(str)) {
 
 		c = (guchar) str[pos];
 
@@ -261,15 +261,15 @@ html_embedded_encode_string (const gchar *before, const gchar *codepage)
 			{
 				encoded = g_string_append_c (encoded, c);
 			}
-		else if ( c == ' ' )
+		else if (c == ' ')
 			{
 				encoded = g_string_append_c (encoded, '+');
 			}
-		else if ( c == '\n' )
+		else if (c == '\n')
 			{
 				encoded = g_string_append (encoded, "%0D%0A");
 			}
-		else if ( c != '\r' )
+		else if (c != '\r')
 			{
 				sprintf( buffer, "%%%02X", (gint)c );
 				encoded = g_string_append (encoded, buffer);
diff --git a/gtkhtml/htmlengine-edit-clueflowstyle.c b/gtkhtml/htmlengine-edit-clueflowstyle.c
index ba3829f..0bce7e8 100644
--- a/gtkhtml/htmlengine-edit-clueflowstyle.c
+++ b/gtkhtml/htmlengine-edit-clueflowstyle.c
@@ -304,7 +304,7 @@ set_clueflow_style_in_region (HTMLEngine *engine,
 			break;
 	}
 
-	if (! do_undo)
+	if (!do_undo)
 		return;
 
 	add_undo (engine, style_operation_new (undo_forward ? g_list_reverse (prop_list) : prop_list, undo_forward), dir);
diff --git a/gtkhtml/htmlengine-edit-cursor.c b/gtkhtml/htmlengine-edit-cursor.c
index 926856c..44386b6 100644
--- a/gtkhtml/htmlengine-edit-cursor.c
+++ b/gtkhtml/htmlengine-edit-cursor.c
@@ -356,7 +356,7 @@ blink_timeout_cb (gpointer data)
 	g_return_val_if_fail (HTML_IS_ENGINE (data), FALSE);
 	engine = HTML_ENGINE (data);
 
-	engine->blinking_status = ! engine->blinking_status;
+	engine->blinking_status = !engine->blinking_status;
 
 	if (engine->blinking_status)
 		html_engine_show_cursor (engine);
diff --git a/gtkhtml/htmlengine-edit-fontstyle.c b/gtkhtml/htmlengine-edit-fontstyle.c
index c3c9064..9058821 100644
--- a/gtkhtml/htmlengine-edit-fontstyle.c
+++ b/gtkhtml/htmlengine-edit-fontstyle.c
@@ -142,7 +142,7 @@ html_engine_get_document_font_style (HTMLEngine *engine)
 
 		if (curr == NULL)
 			return GTK_HTML_FONT_STYLE_DEFAULT;
-		else if (! html_object_is_text (curr))
+		else if (!html_object_is_text (curr))
 			return GTK_HTML_FONT_STYLE_DEFAULT;
 		else {
 			HTMLObject *obj;
@@ -170,7 +170,7 @@ html_engine_get_document_color (HTMLEngine *engine)
 
 		if (curr == NULL)
 			return NULL;
-		else if (! html_object_is_text (curr))
+		else if (!html_object_is_text (curr))
 			return NULL;
 		else {
 			HTMLObject *obj;
diff --git a/gtkhtml/htmlengine-edit-movement.c b/gtkhtml/htmlengine-edit-movement.c
index 9f082d2..0afb236 100644
--- a/gtkhtml/htmlengine-edit-movement.c
+++ b/gtkhtml/htmlengine-edit-movement.c
@@ -79,7 +79,7 @@ html_engine_move_cursor (HTMLEngine *e,
 	html_engine_hide_cursor (e);
 
 	for (c = 0; c < count; c++) {
-		if (! (* movement_func) (e->cursor, e))
+		if (!(* movement_func) (e->cursor, e))
 			break;
 	}
 
diff --git a/gtkhtml/htmlengine-edit-text.c b/gtkhtml/htmlengine-edit-text.c
index bcff0eb..27e32a8 100644
--- a/gtkhtml/htmlengine-edit-text.c
+++ b/gtkhtml/htmlengine-edit-text.c
@@ -40,7 +40,7 @@ find_first (HTMLEngine *e)
 	gunichar c;
 
 	c = html_cursor_get_current_char (e->cursor);
-	while (c == 0 || ! g_unichar_isalnum (c) || c == ' ') {
+	while (c == 0 || !g_unichar_isalnum (c) || c == ' ') {
 		if (!html_cursor_forward (e->cursor, e))
 			return FALSE;
 		c = html_cursor_get_current_char (e->cursor);
diff --git a/gtkhtml/htmlengine-save.c b/gtkhtml/htmlengine-save.c
index 0ae6f6d..5fee260 100644
--- a/gtkhtml/htmlengine-save.c
+++ b/gtkhtml/htmlengine-save.c
@@ -285,14 +285,14 @@ write_header (HTMLEngineSaveState *state)
 
 	html_engine_clear_all_class_data (state->engine);
 	/* Preface.  */
-	if (! html_engine_save_output_string
+	if (!html_engine_save_output_string
 		    (state,
 		     "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 TRANSITIONAL//EN\">\n"
 		     "<HTML>\n"))
 		return FALSE;
 
 	/* Header start.  FIXME: `GENERATOR' string?  */
-	if (! html_engine_save_output_string
+	if (!html_engine_save_output_string
 		     (state,
 		      "<HEAD>\n"
 		      "  <META HTTP-EQUIV=\"Content-Type\" CONTENT=\"text/html; CHARSET=UTF-8\">\n"
@@ -303,14 +303,14 @@ write_header (HTMLEngineSaveState *state)
 	if (state->engine->title != NULL
 	    && state->engine->title->str != NULL
 	    && state->engine->title->str[0] != '\0') {
-		if (! html_engine_save_delims_and_vals (state,
+		if (!html_engine_save_delims_and_vals (state,
 				"  <TITLE>", state->engine->title->str,
 				"</TITLE>\n", NULL))
 			return FALSE;
 	}
 
 	/* End of header.  */
-	if (! html_engine_save_output_string (state, "</HEAD>\n"))
+	if (!html_engine_save_output_string (state, "</HEAD>\n"))
 		return FALSE;
 
 	/* Start of body.  */
@@ -325,7 +325,7 @@ write_header (HTMLEngineSaveState *state)
 static gboolean
 write_end (HTMLEngineSaveState *state)
 {
-	if (! html_engine_save_output_string (state, "</BODY>\n</HTML>\n"))
+	if (!html_engine_save_output_string (state, "</BODY>\n</HTML>\n"))
 		return FALSE;
 
 	html_engine_clear_all_class_data (state->engine);
@@ -355,14 +355,14 @@ html_engine_save (HTMLEngine *engine,
 	state.user_data = user_data;
 	state.last_level = 0;
 
-	if (! write_header (&state))
+	if (!write_header (&state))
 		return FALSE;
 
 	html_object_save (engine->clue, &state);
 	if (state.error)
 		return FALSE;
 
-	if (! write_end (&state))
+	if (!write_end (&state))
 		return FALSE;
 
 	return TRUE;
diff --git a/gtkhtml/htmlengine.c b/gtkhtml/htmlengine.c
index 01775b3..0a35a2f 100644
--- a/gtkhtml/htmlengine.c
+++ b/gtkhtml/htmlengine.c
@@ -1226,7 +1226,7 @@ block_end_option (HTMLEngine *e, HTMLObject *clue, HTMLElement *elem)
 {
 	g_return_if_fail (HTML_IS_ENGINE (e));
 
-	if ( e->inOption )
+	if (e->inOption)
 		html_select_set_text (e->formSelect, e->formText->str);
 
 	e->inOption = FALSE;
@@ -1237,7 +1237,7 @@ block_end_select (HTMLEngine *e, HTMLObject *clue, HTMLElement *elem)
 {
 	g_return_if_fail (HTML_IS_ENGINE (e));
 
-	if ( e->inOption )
+	if (e->inOption)
 		html_select_set_text (e->formSelect, e->formText->str);
 
 	e->inOption = FALSE;
@@ -1250,7 +1250,7 @@ block_end_textarea (HTMLEngine *e, HTMLObject *clue, HTMLElement *elem)
 {
 	g_return_if_fail (HTML_IS_ENGINE (e));
 
-	if ( e->inTextArea )
+	if (e->inTextArea)
 		html_textarea_set_text (e->formTextArea, e->formText->str);
 
 	e->inTextArea = FALSE;
@@ -2148,7 +2148,7 @@ element_parse_body (HTMLEngine *e, HTMLObject *clue, const gchar *str)
 			}
 		} else if (g_ascii_strncasecmp (token, "background=", 11) == 0
 			   && token [12]
-			   && ! e->defaultSettings->forceDefault) {
+			   && !e->defaultSettings->forceDefault) {
 			gchar *bgurl;
 
 			bgurl = g_strdup (token + 11);
@@ -2156,36 +2156,36 @@ element_parse_body (HTMLEngine *e, HTMLObject *clue, const gchar *str)
 				html_image_factory_unregister(e->image_factory, e->bgPixmapPtr, NULL);
 			e->bgPixmapPtr = html_image_factory_register(e->image_factory, NULL, bgurl, FALSE);
 			g_free (bgurl);
-		} else if ( g_ascii_strncasecmp( token, "text=", 5 ) == 0
+		} else if (g_ascii_strncasecmp( token, "text=", 5) == 0
 			    && !e->defaultSettings->forceDefault ) {
 			if (html_parse_color (token + 5, &color)) {
 				html_colorset_set_color (e->settings->color_set, &color, HTMLTextColor);
 				push_element (e, ID_BODY, NULL,
 					      html_style_add_color (NULL, html_colorset_get_color (e->settings->color_set, HTMLTextColor)));
 			}
-		} else if ( g_ascii_strncasecmp( token, "link=", 5 ) == 0
+		} else if (g_ascii_strncasecmp( token, "link=", 5) == 0
 			    && !e->defaultSettings->forceDefault ) {
 			html_parse_color (token + 5, &color);
 			html_colorset_set_color (e->settings->color_set, &color, HTMLLinkColor);
-		} else if ( g_ascii_strncasecmp( token, "vlink=", 6 ) == 0
+		} else if (g_ascii_strncasecmp( token, "vlink=", 6) == 0
 			    && !e->defaultSettings->forceDefault ) {
 			html_parse_color (token + 6, &color);
 			html_colorset_set_color (e->settings->color_set, &color, HTMLVLinkColor);
-		} else if ( g_ascii_strncasecmp( token, "alink=", 6 ) == 0
+		} else if (g_ascii_strncasecmp( token, "alink=", 6) == 0
 			    && !e->defaultSettings->forceDefault ) {
 			html_parse_color (token + 6, &color);
 			html_colorset_set_color (e->settings->color_set, &color, HTMLALinkColor);
-		} else if ( g_ascii_strncasecmp( token, "leftmargin=", 11 ) == 0) {
+		} else if (g_ascii_strncasecmp( token, "leftmargin=", 11) == 0) {
 			e->leftBorder = atoi (token + 11);
-		} else if ( g_ascii_strncasecmp( token, "rightmargin=", 12 ) == 0) {
+		} else if (g_ascii_strncasecmp( token, "rightmargin=", 12) == 0) {
 			e->rightBorder = atoi (token + 12);
-		} else if ( g_ascii_strncasecmp( token, "topmargin=", 10 ) == 0) {
+		} else if (g_ascii_strncasecmp( token, "topmargin=", 10) == 0) {
 			e->topBorder = atoi (token + 10);
-		} else if ( g_ascii_strncasecmp( token, "bottommargin=", 13 ) == 0) {
+		} else if (g_ascii_strncasecmp( token, "bottommargin=", 13) == 0) {
 			e->bottomBorder = atoi (token + 13);
-		} else if ( g_ascii_strncasecmp( token, "marginwidth=", 12 ) == 0) {
+		} else if (g_ascii_strncasecmp( token, "marginwidth=", 12) == 0) {
 			e->leftBorder = e->rightBorder = atoi (token + 12);
-		} else if ( g_ascii_strncasecmp( token, "marginheight=", 13 ) == 0) {
+		} else if (g_ascii_strncasecmp( token, "marginheight=", 13) == 0) {
 			e->topBorder = e->bottomBorder = atoi (token + 13);
 		} else if (e->parser_clue && g_ascii_strncasecmp (token, "dir=", 4) == 0) {
 			if (!g_ascii_strncasecmp (token + 4, "ltr", 3))
@@ -2204,11 +2204,11 @@ element_parse_base (HTMLEngine *e, HTMLObject *clue, const gchar *str)
 	g_return_if_fail (HTML_IS_ENGINE (e));
 
 	html_string_tokenizer_tokenize( e->st, str + 5, " >" );
-	while ( html_string_tokenizer_has_more_tokens (e->st) ) {
+	while (html_string_tokenizer_has_more_tokens (e->st)) {
 		const gchar * token = html_string_tokenizer_next_token(e->st);
-		if ( g_ascii_strncasecmp( token, "target=", 7 ) == 0 ) {
+		if (g_ascii_strncasecmp( token, "target=", 7 ) == 0) {
 			g_signal_emit (e, signals [SET_BASE_TARGET], 0, token + 7);
-		} else if ( g_ascii_strncasecmp( token, "href=", 5 ) == 0 ) {
+		} else if (g_ascii_strncasecmp( token, "href=", 5 ) == 0) {
 			g_signal_emit (e, signals [SET_BASE], 0, token + 5);
 		}
 	}
@@ -2259,7 +2259,7 @@ form_begin (HTMLEngine *e,
 	e->form = html_form_new (e, action, method);
 	e->formList = g_list_append (e->formList, e->form);
 
-	if (! e->avoid_para && close_paragraph) {
+	if (!e->avoid_para && close_paragraph) {
 		if (e->flow && HTML_CLUE (e->flow)->head)
 			close_flow (e, clue);
 		e->avoid_para = FALSE;
@@ -2307,56 +2307,56 @@ element_parse_input (HTMLEngine *e, HTMLObject *clue, const gchar *str)
 	while (html_string_tokenizer_has_more_tokens (e->st)) {
 		const gchar *token = html_string_tokenizer_next_token (e->st);
 
-		if ( g_ascii_strncasecmp( token, "type=", 5 ) == 0 ) {
+		if (g_ascii_strncasecmp( token, "type=", 5 ) == 0) {
 			p = token + 5;
-			if ( g_ascii_strncasecmp( p, "checkbox", 8 ) == 0 )
+			if (g_ascii_strncasecmp( p, "checkbox", 8 ) == 0)
 				type = CheckBox;
-			else if ( g_ascii_strncasecmp( p, "password", 8 ) == 0 )
+			else if (g_ascii_strncasecmp( p, "password", 8 ) == 0)
 				type = Password;
-			else if ( g_ascii_strncasecmp( p, "hidden", 6 ) == 0 )
+			else if (g_ascii_strncasecmp( p, "hidden", 6 ) == 0)
 				type = Hidden;
-			else if ( g_ascii_strncasecmp( p, "radio", 5 ) == 0 )
+			else if (g_ascii_strncasecmp( p, "radio", 5 ) == 0)
 				type = Radio;
-			else if ( g_ascii_strncasecmp( p, "reset", 5 ) == 0 )
+			else if (g_ascii_strncasecmp( p, "reset", 5 ) == 0)
 				type = Reset;
-			else if ( g_ascii_strncasecmp( p, "submit", 5 ) == 0 )
+			else if (g_ascii_strncasecmp( p, "submit", 5 ) == 0)
 				type = Submit;
-			else if ( g_ascii_strncasecmp( p, "button", 6 ) == 0 )
+			else if (g_ascii_strncasecmp( p, "button", 6 ) == 0)
 				type = Button;
-			else if ( g_ascii_strncasecmp( p, "text", 5 ) == 0 )
+			else if (g_ascii_strncasecmp( p, "text", 5 ) == 0)
 				type = Text;
-			else if ( g_ascii_strncasecmp( p, "image", 5 ) == 0 )
+			else if (g_ascii_strncasecmp( p, "image", 5 ) == 0)
 				type = Image;
 		}
-		else if ( g_ascii_strncasecmp( token, "name=", 5 ) == 0 ) {
+		else if (g_ascii_strncasecmp( token, "name=", 5 ) == 0) {
 			name = g_strdup(token + 5);
 		}
-		else if ( g_ascii_strncasecmp( token, "value=", 6 ) == 0 ) {
+		else if (g_ascii_strncasecmp( token, "value=", 6 ) == 0) {
 			value = g_strdup(token + 6);
 		}
-		else if ( g_ascii_strncasecmp( token, "size=", 5 ) == 0 ) {
+		else if (g_ascii_strncasecmp( token, "size=", 5 ) == 0) {
 			size = atoi( token + 5 );
 		}
-		else if ( g_ascii_strncasecmp( token, "maxlength=", 10 ) == 0 ) {
+		else if (g_ascii_strncasecmp( token, "maxlength=", 10 ) == 0) {
 			maxLen = atoi( token + 10 );
 		}
-		else if ( g_ascii_strncasecmp( token, "checked", 7 ) == 0 ) {
+		else if (g_ascii_strncasecmp( token, "checked", 7 ) == 0) {
 			checked = TRUE;
 		}
-		else if ( g_ascii_strncasecmp( token, "src=", 4 ) == 0 ) {
+		else if (g_ascii_strncasecmp( token, "src=", 4 ) == 0) {
 			imgSrc = g_strdup (token + 4);
 		}
-		else if ( g_ascii_strncasecmp( token, "onClick=", 8 ) == 0 ) {
+		else if (g_ascii_strncasecmp( token, "onClick=", 8 ) == 0) {
 			/* TODO: Implement Javascript */
 		}
-		else if ( g_ascii_strncasecmp( token, "hspace=", 7 ) == 0 ) {
+		else if (g_ascii_strncasecmp( token, "hspace=", 7 ) == 0) {
 			imgHSpace = atoi (token + 7);
 		}
-		else if ( g_ascii_strncasecmp( token, "vspace=", 7 ) == 0 ) {
+		else if (g_ascii_strncasecmp( token, "vspace=", 7 ) == 0) {
 			imgVSpace = atoi (token + 7);
 		}
 	}
-	switch ( type ) {
+	switch (type) {
 	case CheckBox:
 		element = html_checkbox_new(GTK_WIDGET(e->widget), name, value, checked);
 		break;
@@ -2424,12 +2424,12 @@ element_parse_form (HTMLEngine *e, HTMLObject *clue, const gchar *str)
 	while (html_string_tokenizer_has_more_tokens (e->st)) {
 		const gchar *token = html_string_tokenizer_next_token (e->st);
 
-		if ( g_ascii_strncasecmp( token, "action=", 7 ) == 0 ) {
+		if (g_ascii_strncasecmp( token, "action=", 7 ) == 0) {
 			action = g_strdup (token + 7);
-		} else if ( g_ascii_strncasecmp( token, "method=", 7 ) == 0 ) {
-			if ( g_ascii_strncasecmp( token + 7, "post", 4 ) == 0 )
+		} else if (g_ascii_strncasecmp( token, "method=", 7 ) == 0) {
+			if (g_ascii_strncasecmp( token + 7, "post", 4 ) == 0)
 				method = "POST";
-		} else if ( g_ascii_strncasecmp( token, "target=", 7 ) == 0 ) {
+		} else if (g_ascii_strncasecmp( token, "target=", 7 ) == 0) {
 			target = g_strdup(token + 7);
 		}
 	}
@@ -3471,10 +3471,10 @@ element_parse_caption (HTMLEngine *e, HTMLObject *clue, const gchar *str)
 	*/
 
 	html_string_tokenizer_tokenize( e->st, str + 7, " >" );
-	while ( html_string_tokenizer_has_more_tokens (e->st) ) {
+	while (html_string_tokenizer_has_more_tokens (e->st)) {
 		const gchar * token = html_string_tokenizer_next_token(e->st);
-		if ( g_ascii_strncasecmp( token, "align=", 6 ) == 0) {
-			if ( g_ascii_strncasecmp( token+6, "top", 3 ) == 0)
+		if (g_ascii_strncasecmp( token, "align=", 6) == 0) {
+			if (g_ascii_strncasecmp( token+6, "top", 3) == 0)
 				capAlign = HTML_VALIGN_TOP;
 		}
 	}
@@ -4780,7 +4780,7 @@ html_engine_update_event (HTMLEngine *e)
 	html_engine_calc_size (e, FALSE);
 
 	if (vadjustment == NULL
-	    || ! html_gdk_painter_realized (HTML_GDK_PAINTER (e->painter))) {
+	    || !html_gdk_painter_realized (HTML_GDK_PAINTER (e->painter))) {
 		e->need_update = TRUE;
 		return FALSE;
 	}
@@ -4796,7 +4796,7 @@ html_engine_update_event (HTMLEngine *e)
 	if (e->newPage) {
 		gtk_adjustment_set_value (vadjustment, 0);
 		e->newPage = FALSE;
-		if (! e->parsing && e->editable)
+		if (!e->parsing && e->editable)
 			html_cursor_home (e->cursor, e);
 	}
 
@@ -5447,7 +5447,7 @@ html_engine_set_editable (HTMLEngine *e,
 {
 	g_return_if_fail (HTML_IS_ENGINE (e));
 
-	if ((e->editable && editable) || (! e->editable && ! editable))
+	if ((e->editable && editable) || (!e->editable && !editable))
 		return;
 
 	if (editable)
@@ -5481,7 +5481,7 @@ html_engine_get_editable (HTMLEngine *e)
 {
 	g_return_val_if_fail (HTML_IS_ENGINE (e), FALSE);
 
-	if (e->editable && ! e->parsing && e->timerId == 0)
+	if (e->editable && !e->parsing && e->timerId == 0)
 		return TRUE;
 	else
 		return FALSE;
@@ -5503,9 +5503,9 @@ html_engine_set_focus (HTMLEngine *engine,
 	g_return_if_fail (HTML_IS_ENGINE (engine));
 
 	if (engine->editable || engine->caret_mode) {
-		if (! engine->have_focus && have_focus)
+		if (!engine->have_focus && have_focus)
 			html_engine_setup_blinking_cursor (engine);
-		else if (engine->have_focus && ! have_focus)
+		else if (engine->have_focus && !have_focus)
 			html_engine_stop_blinking_cursor (engine);
 	}
 
@@ -5542,7 +5542,7 @@ html_engine_make_cursor_visible (HTMLEngine *e)
 
 	g_return_val_if_fail (HTML_IS_ENGINE (e), FALSE);
 
-	if (! e->editable && !e->caret_mode)
+	if (!e->editable && !e->caret_mode)
 		return FALSE;
 
 	if (e->cursor->object == NULL)
diff --git a/gtkhtml/htmlgdkpainter.c b/gtkhtml/htmlgdkpainter.c
index b361c66..9ad3002 100644
--- a/gtkhtml/htmlgdkpainter.c
+++ b/gtkhtml/htmlgdkpainter.c
@@ -141,7 +141,7 @@ end (HTMLPainter *painter)
 
 	gdk_painter = HTML_GDK_PAINTER (painter);
 
-	if (! gdk_painter->double_buffer)
+	if (!gdk_painter->double_buffer)
 		return;
 
 	gdk_draw_drawable (gdk_painter->window, gdk_painter->gc,
@@ -162,7 +162,7 @@ clear (HTMLPainter *painter)
 
 	gdk_painter = HTML_GDK_PAINTER (painter);
 
-	if (! gdk_painter->double_buffer) {
+	if (!gdk_painter->double_buffer) {
 		gdk_window_clear (gdk_painter->window);
 	} else {
 		if (gdk_painter->pixmap != NULL)
diff --git a/gtkhtml/htmlimage.c b/gtkhtml/htmlimage.c
index c87dde0..462e5ba 100644
--- a/gtkhtml/htmlimage.c
+++ b/gtkhtml/htmlimage.c
@@ -92,7 +92,7 @@ html_image_get_actual_width (HTMLImage *image, HTMLPainter *painter)
 		width = gdk_pixbuf_animation_get_width (anim) * pixel_size;
 
 		if (image->specified_height > 0 || image->percent_height) {
-			double scale;
+			gdouble scale;
 
 			scale =  ((double) html_image_get_actual_height (image, painter))
 				/ (gdk_pixbuf_animation_get_height (anim) * pixel_size);
@@ -125,7 +125,7 @@ html_image_get_actual_height (HTMLImage *image, HTMLPainter *painter)
 		height = gdk_pixbuf_animation_get_height (anim) * pixel_size;
 
 		if (image->specified_width > 0 || image->percent_width) {
-			double scale;
+			gdouble scale;
 
 			scale = ((double) html_image_get_actual_width (image, painter))
 				/ (gdk_pixbuf_animation_get_width (anim) * pixel_size);
@@ -1147,7 +1147,7 @@ html_image_factory_write_pixbuf (GtkHTMLStream *stream,
 {
 	HTMLImagePointer *p = user_data;
 
-	/* FIXME ! Check return value */
+	/* FIXME !Check return value */
 	gdk_pixbuf_loader_write (p->loader, (const guchar *) buffer, size, NULL);
 }
 
diff --git a/gtkhtml/htmlmarshal.c b/gtkhtml/htmlmarshal.c
index 6571d52..f91d409 100644
--- a/gtkhtml/htmlmarshal.c
+++ b/gtkhtml/htmlmarshal.c
@@ -44,7 +44,7 @@
 #define g_marshal_value_peek_boxed(v)    (v)->data[0].v_pointer
 #define g_marshal_value_peek_pointer(v)  (v)->data[0].v_pointer
 #define g_marshal_value_peek_object(v)   (v)->data[0].v_pointer
-#endif /* !G_ENABLE_DEBUG */
+#endif /* G_ENABLE_DEBUG */
 
 /* BOOL:OBJECT (htmlclosures.list:1) */
 void
diff --git a/gtkhtml/htmlobject.c b/gtkhtml/htmlobject.c
index 1bd68d8..62114bc 100644
--- a/gtkhtml/htmlobject.c
+++ b/gtkhtml/htmlobject.c
@@ -408,7 +408,7 @@ relayout (HTMLObject *self,
 		self->y = self->ascent;
 	} else {
 		/* Relayout our parent starting from us.  */
-		if (! html_object_relayout (self->parent, engine, self))
+		if (!html_object_relayout (self->parent, engine, self))
 			html_engine_queue_draw (engine, self);
 	}
 
@@ -502,7 +502,7 @@ select_range (HTMLObject *self,
 	gboolean changed;
 
 	selected = length > 0 || (length == -1 && start < html_object_get_length (self)) || html_object_is_container (self) ? TRUE : FALSE;
-	changed  = (! selected && self->selected) || (selected && ! self->selected) ? TRUE : FALSE;
+	changed  = (!selected && self->selected) || (selected && !self->selected) ? TRUE : FALSE;
 
 	self->selected = selected;
 
diff --git a/gtkhtml/htmlprinter.c b/gtkhtml/htmlprinter.c
index 374a498..914868a 100644
--- a/gtkhtml/htmlprinter.c
+++ b/gtkhtml/htmlprinter.c
@@ -222,8 +222,8 @@ draw_line (HTMLPainter *painter,
 	   gint x2, gint y2)
 {
 	HTMLPrinter *printer;
-	double printer_x1, printer_y1;
-	double printer_x2, printer_y2;
+	gdouble printer_x1, printer_y1;
+	gdouble printer_x2, printer_y2;
 	cairo_t *cr;
 
 	printer = HTML_PRINTER (painter);
@@ -392,8 +392,8 @@ static void
 draw_pixmap (HTMLPainter *painter, GdkPixbuf *pixbuf, gint x, gint y, gint scale_width, gint scale_height, const GdkColor *color)
 {
 	HTMLPrinter *printer;
-	double print_x, print_y;
-	double print_scale_width, print_scale_height;
+	gdouble print_x, print_y;
+	gdouble print_scale_width, print_scale_height;
 	cairo_t *cr;
 
 	printer = HTML_PRINTER (painter);
@@ -414,8 +414,8 @@ static void
 fill_rect (HTMLPainter *painter, gint x, gint y, gint width, gint height)
 {
 	HTMLPrinter *printer;
-	double printer_x, printer_y;
-	double printer_width, printer_height;
+	gdouble printer_x, printer_y;
+	gdouble printer_width, printer_height;
 	cairo_t *cr;
 
 	printer = HTML_PRINTER (painter);
@@ -448,9 +448,9 @@ draw_lines (HTMLPrinter *printer, double x, double y, double width, PangoAnalysi
 	cairo_set_line_cap (cr, CAIRO_LINE_CAP_BUTT);
 
 	if (properties->underline) {
-		double thickness = pango_units_to_double (pango_font_metrics_get_underline_thickness (metrics));
-		double position = pango_units_to_double (pango_font_metrics_get_underline_position (metrics));
-		double ly = y + position - thickness / 2;
+		gdouble thickness = pango_units_to_double (pango_font_metrics_get_underline_thickness (metrics));
+		gdouble position = pango_units_to_double (pango_font_metrics_get_underline_position (metrics));
+		gdouble ly = y + position - thickness / 2;
 
 		cairo_new_path (cr);
 		cairo_move_to (cr, x, ly + 4);
@@ -460,9 +460,9 @@ draw_lines (HTMLPrinter *printer, double x, double y, double width, PangoAnalysi
 	}
 
 	if (properties->strikethrough) {
-		double thickness = pango_units_to_double (pango_font_metrics_get_strikethrough_thickness (metrics));
-		double position = pango_units_to_double (pango_font_metrics_get_strikethrough_position (metrics));
-		double ly = y + position - thickness / 2;
+		gdouble thickness = pango_units_to_double (pango_font_metrics_get_strikethrough_thickness (metrics));
+		gdouble position = pango_units_to_double (pango_font_metrics_get_strikethrough_position (metrics));
+		gdouble ly = y + position - thickness / 2;
 
 		cairo_new_path (cr);
 		cairo_move_to (cr, x, ly - 8);
@@ -675,7 +675,7 @@ html_printer_new (GtkWidget *widget, GtkPrintContext *context)
 guint
 html_printer_get_page_width (HTMLPrinter *printer)
 {
-	double printer_width;
+	gdouble printer_width;
 	guint engine_width;
 
 	g_return_val_if_fail (printer != NULL, 0);
@@ -690,7 +690,7 @@ html_printer_get_page_width (HTMLPrinter *printer)
 guint
 html_printer_get_page_height (HTMLPrinter *printer)
 {
-	double printer_height;
+	gdouble printer_height;
 	guint engine_height;
 
 	g_return_val_if_fail (printer != NULL, 0);
diff --git a/gtkhtml/htmlstack.c b/gtkhtml/htmlstack.c
index 1ec6040..4ebd9fb 100644
--- a/gtkhtml/htmlstack.c
+++ b/gtkhtml/htmlstack.c
@@ -64,7 +64,7 @@ html_stack_pop (HTMLStack *stack)
 	GList *first;
 	gpointer data;
 
-	g_return_val_if_fail (! html_stack_is_empty (stack), NULL);
+	g_return_val_if_fail (!html_stack_is_empty (stack), NULL);
 
 	first = stack->list;
 	stack->list = g_list_remove_link (stack->list, first);
diff --git a/gtkhtml/htmltablecell.c b/gtkhtml/htmltablecell.c
index 53b6af2..b6d394a 100644
--- a/gtkhtml/htmltablecell.c
+++ b/gtkhtml/htmltablecell.c
@@ -57,7 +57,7 @@ draw_background_helper (HTMLTableCell *cell,
 	cluev = HTML_CLUEV (cell);
 
 	if (cell->have_bg) {
-		if (! cell->bg_allocated) {
+		if (!cell->bg_allocated) {
 			html_painter_alloc_color (p, &cell->bg);
 			cell->bg_allocated = TRUE;
 		}
@@ -249,7 +249,7 @@ set_bg_color (HTMLObject *object, GdkColor *color)
 		return;
 	}
 
-	if (cell->have_bg && ! gdk_color_equal (&cell->bg, color))
+	if (cell->have_bg && !gdk_color_equal (&cell->bg, color))
 		cell->bg_allocated = FALSE;
 
 	cell->bg = *color;
diff --git a/gtkhtml/htmltext.c b/gtkhtml/htmltext.c
index 8d24c6f..1ca512f 100644
--- a/gtkhtml/htmltext.c
+++ b/gtkhtml/htmltext.c
@@ -2397,7 +2397,7 @@ select_range (HTMLObject *self,
 						html_engine_queue_draw (engine, p);
 				}
 			} else {
-				if ((! was_selected && is_selected) || (was_selected && ! is_selected))
+				if ((!was_selected && is_selected) || (was_selected && !is_selected))
 					html_engine_queue_draw (engine, p);
 			}
 		}
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]