[gtkhtml] Fix several types of pedantic compiler warnings.

[Matthew Barnes <mbarnes src gnome org>]

commit b3bef5a06cc38c398bc91fc905f8bf710b0b3cc3
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat May 16 08:04:47 2009 -0400

    Fix several types of pedantic compiler warnings.
---
 gtkhtml/gtkhtml-enums.h             |    6 +++---
 gtkhtml/gtkhtml.c                   |    2 +-
 gtkhtml/htmlclueflow.c              |    4 ++--
 gtkhtml/htmlcursor.c                |    2 +-
 gtkhtml/htmlengine-edit-table.c     |    2 +-
 gtkhtml/htmlengine-edit-tablecell.c |    2 +-
 gtkhtml/htmltext.c                  |    2 +-
 gtkhtml/htmlurl.c                   |    2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/gtkhtml/gtkhtml-enums.h b/gtkhtml/gtkhtml-enums.h
index 1c1956d..5e09d85 100644
--- a/gtkhtml/gtkhtml-enums.h
+++ b/gtkhtml/gtkhtml-enums.h
@@ -228,7 +228,7 @@ typedef enum {
 
 	GTK_HTML_COMMAND_IS_SELECTION_ACTIVE,
 	GTK_HTML_COMMAND_SCROLL_FORWARD,
-	GTK_HTML_COMMAND_SCROLL_BACKWARD,
+	GTK_HTML_COMMAND_SCROLL_BACKWARD
 } GtkHTMLCommandType;
 
 typedef enum {
@@ -256,7 +256,7 @@ typedef enum {
 	GTK_HTML_FONT_STYLE_SHIFT_FIXED,
 	GTK_HTML_FONT_STYLE_SHIFT_SUBSCRIPT,
 	GTK_HTML_FONT_STYLE_SHIFT_SUPERSCRIPT,
-	GTK_HTML_FONT_STYLE_SHIFT_LAST = GTK_HTML_FONT_STYLE_SHIFT_SUPERSCRIPT,
+	GTK_HTML_FONT_STYLE_SHIFT_LAST = GTK_HTML_FONT_STYLE_SHIFT_SUPERSCRIPT
 } GtkHTMLFontStyleShift;
 
 typedef enum {
@@ -275,7 +275,7 @@ typedef enum {
 	GTK_HTML_FONT_STYLE_STRIKEOUT   = 1 << GTK_HTML_FONT_STYLE_SHIFT_STRIKEOUT,
 	GTK_HTML_FONT_STYLE_FIXED       = 1 << GTK_HTML_FONT_STYLE_SHIFT_FIXED,
 	GTK_HTML_FONT_STYLE_SUBSCRIPT   = 1 << GTK_HTML_FONT_STYLE_SHIFT_SUBSCRIPT,
-	GTK_HTML_FONT_STYLE_SUPERSCRIPT = 1 << GTK_HTML_FONT_STYLE_SHIFT_SUPERSCRIPT,
+	GTK_HTML_FONT_STYLE_SUPERSCRIPT = 1 << GTK_HTML_FONT_STYLE_SHIFT_SUPERSCRIPT
 } GtkHTMLFontStyle;
 
 typedef enum {
diff --git a/gtkhtml/gtkhtml.c b/gtkhtml/gtkhtml.c
index cc168b2..b839e52 100644
--- a/gtkhtml/gtkhtml.c
+++ b/gtkhtml/gtkhtml.c
@@ -80,7 +80,7 @@ enum DndTargetType {
 	DND_TARGET_TYPE_TEXT_HTML,
 	DND_TARGET_TYPE_UTF8_STRING,
 	DND_TARGET_TYPE_TEXT_PLAIN,
-	DND_TARGET_TYPE_STRING,
+	DND_TARGET_TYPE_STRING
 };
 
 static GtkTargetEntry dnd_link_sources [] = {
diff --git a/gtkhtml/htmlclueflow.c b/gtkhtml/htmlclueflow.c
index ecffeef..4537157 100644
--- a/gtkhtml/htmlclueflow.c
+++ b/gtkhtml/htmlclueflow.c
@@ -2856,7 +2856,7 @@ html_clueflow_get_indentation (HTMLClueFlow *flow)
 {
 	g_return_val_if_fail (flow != NULL, 0);
 
-	// FIXME levels
+	/* FIXME levels */
 	return flow->levels->len;
 }
 
@@ -2891,7 +2891,7 @@ html_clueflow_get_properties (HTMLClueFlow *flow,
 	if (style_return != NULL)
 		*style_return = flow->style;
 	if (indentation_return != NULL)
-		// FIXME levels
+		/* FIXME levels */
 		*indentation_return = flow->levels->len;
 	if (alignment_return != NULL)
 		*alignment_return = HTML_CLUE (flow)->halign;
diff --git a/gtkhtml/htmlcursor.c b/gtkhtml/htmlcursor.c
index 44f2c7e..bbc3d94 100644
--- a/gtkhtml/htmlcursor.c
+++ b/gtkhtml/htmlcursor.c
@@ -69,7 +69,7 @@ debug_location (const HTMLCursor *cursor)
 
 	g_print ("Cursor in %s (%p), offset %d, position %d\n",
 		 html_type_name (HTML_OBJECT_TYPE (object)),
-		 object, cursor->offset, cursor->position);
+		 (gpointer) object, cursor->offset, cursor->position);
 }
 #else
 #define debug_location(cursor)
diff --git a/gtkhtml/htmlengine-edit-table.c b/gtkhtml/htmlengine-edit-table.c
index 3e1cf4f..c4e7fad 100644
--- a/gtkhtml/htmlengine-edit-table.c
+++ b/gtkhtml/htmlengine-edit-table.c
@@ -719,7 +719,7 @@ typedef enum {
 	HTML_TABLE_WIDTH,
 	HTML_TABLE_BGCOLOR,
 	HTML_TABLE_BGPIXMAP,
-	HTML_TABLE_ALIGN,
+	HTML_TABLE_ALIGN
 } HTMLTableAttrType;
 
 union _HTMLTableUndoAttr {
diff --git a/gtkhtml/htmlengine-edit-tablecell.c b/gtkhtml/htmlengine-edit-tablecell.c
index 90b002f..e522c5d 100644
--- a/gtkhtml/htmlengine-edit-tablecell.c
+++ b/gtkhtml/htmlengine-edit-tablecell.c
@@ -51,7 +51,7 @@ typedef enum {
 	HTML_TABLE_CELL_HEADING,
 	HTML_TABLE_CELL_HALIGN,
 	HTML_TABLE_CELL_VALIGN,
-	HTML_TABLE_CELL_WIDTH,
+	HTML_TABLE_CELL_WIDTH
 } HTMLTableCellAttrType;
 
 union _HTMLTableCellUndoAttr {
diff --git a/gtkhtml/htmltext.c b/gtkhtml/htmltext.c
index 1bc222b..fccb422 100644
--- a/gtkhtml/htmltext.c
+++ b/gtkhtml/htmltext.c
@@ -2490,7 +2490,7 @@ html_text_get_cursor_base (HTMLObject *self,
 	if (slave)
 		html_text_slave_get_cursor_base (slave, painter, offset - slave->posStart, x, y);
 	else {
-		g_warning ("Getting cursor base for an HTMLText with no slaves -- %p\n", self);
+		g_warning ("Getting cursor base for an HTMLText with no slaves -- %p\n", (gpointer) self);
 		html_object_calc_abs_position (self, x, y);
 	}
 }
diff --git a/gtkhtml/htmlurl.c b/gtkhtml/htmlurl.c
index 137bc70..9224bca 100644
--- a/gtkhtml/htmlurl.c
+++ b/gtkhtml/htmlurl.c
@@ -97,7 +97,7 @@ scan_host_info (HTMLURL *url, const gchar *s)
 	} else {
 		guint port;
 
-		if (sscanf (colon_ptr + 1, "%d", &port) == 1)
+		if (sscanf (colon_ptr + 1, "%ud", &port) == 1)
 			url->port = (guint16) port;
 
 		url->hostname = strndup_nonempty_or_null