? autom4te.cache
? depcomp
? gtkhtml-zip
? stamp-h1
? warnings-icc
? warnings-icc-after
? src/libgtkhtml-3.8.pc
? src/test-stress
? src/test-suite
Index: MAINTAINERS
===================================================================
RCS file: /cvs/gnome/gtkhtml/MAINTAINERS,v
retrieving revision 1.3
diff -u -p -r1.3 MAINTAINERS
--- MAINTAINERS	22 Jul 2005 09:59:51 -0000	1.3
+++ MAINTAINERS	3 Dec 2005 13:58:04 -0000
@@ -1,4 +1,3 @@
 Email: kakumar@novell.com
-Email: ettore@ximian.com
 Email:   rodo@ximian.com
 Email: lewing@ximian.com
Index: a11y/html.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/a11y/html.c,v
retrieving revision 1.9
diff -u -p -r1.9 html.c
--- a11y/html.c	17 May 2005 14:47:56 -0000	1.9
+++ a11y/html.c	3 Dec 2005 13:58:04 -0000
@@ -43,8 +43,6 @@ static AtkStateSet * html_a11y_ref_state
 static gint html_a11y_get_n_children (AtkObject *accessible);
 static AtkObject * html_a11y_ref_child (AtkObject *accessible, gint index);
 
-void html_a11y_get_size (AtkComponent *component, gint *width, gint *height);
-
 static AtkObjectClass *parent_class = NULL;
 
 GType
Index: components/html-editor/body.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/body.c,v
retrieving revision 1.55
diff -u -p -r1.55 body.c
--- components/html-editor/body.c	14 Oct 2005 12:13:50 -0000	1.55
+++ components/html-editor/body.c	3 Dec 2005 13:58:04 -0000
@@ -236,7 +236,6 @@ body_properties (GtkHTMLControlData *cd,
 {
 	GtkHTMLEditBodyProperties *data = g_new0 (GtkHTMLEditBodyProperties, 1);
 	GtkWidget *main_vbox, *hbox, *combo, *label, *t1;
-	GSList *group;
 	HTMLColor *color;
 	gint i;
 
@@ -250,7 +249,6 @@ body_properties (GtkHTMLControlData *cd,
 	gtk_table_set_col_spacings (GTK_TABLE (t1), 6);
 	gtk_table_set_row_spacings (GTK_TABLE (t1), 6);
 
-	group = NULL;
 	i = 0;
 #define ADD_COLOR(x, ct, g) \
         color = html_colorset_get_color (cd->html->engine->settings->color_set, ct); \
Index: components/html-editor/htmlsourceview.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/htmlsourceview.c,v
retrieving revision 1.9
diff -u -p -r1.9 htmlsourceview.c
--- components/html-editor/htmlsourceview.c	17 May 2005 14:48:59 -0000	1.9
+++ components/html-editor/htmlsourceview.c	3 Dec 2005 13:58:04 -0000
@@ -74,7 +74,6 @@ html_source_view_load (HTMLSourceView *v
 	CORBA_Object pstream;
 	const char *text;
 	char *html;
-	size_t len;
 
 	CORBA_exception_init (&ev);
 
@@ -85,7 +84,6 @@ html_source_view_load (HTMLSourceView *v
 	bonobo_stream_client_write (BONOBO_OBJREF (smem), "", 1, &ev);
 
         text = bonobo_stream_mem_get_buffer (BONOBO_STREAM_MEM (smem));
-	len  = bonobo_stream_mem_get_size (BONOBO_STREAM_MEM (smem));
 
 	if (!view->priv->as_html) {
 		html = e_text_to_html_full (text, E_TEXT_TO_HTML_PRE | E_TEXT_TO_HTML_CONVERT_SPACES, 0);
Index: components/html-editor/image.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/image.c,v
retrieving revision 1.64
diff -u -p -r1.64 image.c
--- components/html-editor/image.c	11 Sep 2005 04:04:18 -0000	1.64
+++ components/html-editor/image.c	3 Dec 2005 13:58:04 -0000
@@ -346,7 +346,7 @@ static GtkWidget *
 image_widget (GtkHTMLEditImageProperties *d, gboolean insert)
 {
 	GladeXML *xml;
-	GtkWidget *frame_template, *button;
+	GtkWidget *button;
 	gchar *filename;
 
 	filename = g_build_filename (GLADE_DATADIR, "gtkhtml-editor-properties.glade", NULL);
@@ -356,7 +356,6 @@ image_widget (GtkHTMLEditImageProperties
 		g_error (_("Could not load glade file."));
 
 	d->page = glade_xml_get_widget (xml, "image_page");
-	frame_template = glade_xml_get_widget (xml, "frame_image_template");
 
 	d->option_align = glade_xml_get_widget (xml, "option_image_align");
 	g_signal_connect (gtk_option_menu_get_menu (GTK_OPTION_MENU (d->option_align)),
Index: src/gtkhtml.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/gtkhtml.c,v
retrieving revision 1.611
diff -u -p -r1.611 gtkhtml.c
--- src/gtkhtml.c	11 Sep 2005 04:24:32 -0000	1.611
+++ src/gtkhtml.c	3 Dec 2005 13:58:05 -0000
@@ -1692,7 +1692,6 @@ button_press_event (GtkWidget *widget,
 				gtk_adjustment_set_value (vadj, value);
 			}
 			return TRUE;
-			break;
 		case 5:
 			/* Mouse wheel scroll down.  */
 			if (event->state & GDK_CONTROL_MASK) 
@@ -1706,7 +1705,6 @@ button_press_event (GtkWidget *widget,
 				gtk_adjustment_set_value (vadj, value);
 			}
 			return TRUE;
-			break;
 		case 2:
 			if (html_engine_get_editable (engine)) {
 				html_engine_disable_selection (html->engine);
@@ -1953,7 +1951,6 @@ static char *
 get_selection_string (GtkHTML *html, int *len, gboolean selection, gboolean primary, gboolean html_format, gboolean order_marker)
 {
 	HTMLObject *selection_object = NULL;
-	guint selection_object_len = 0;
 	char *selection_string = NULL;
 	gboolean free_object = FALSE;
 
@@ -1965,12 +1962,10 @@ get_selection_string (GtkHTML *html, int
 		if (primary) {
 			if (html->engine->primary) {
 				selection_object = html->engine->primary;
-				selection_object_len = html->engine->primary_len;
 			}			
 		} else	/* CLIPBOARD */ {
 			if (html->engine->clipboard) {
 				selection_object = html->engine->clipboard;
-				selection_object_len = html->engine->clipboard_len;
 			}
 		}
 	}
@@ -2320,43 +2315,6 @@ client_notify_spell_widget (GConfClient*
 	}
 }
 
-static GtkHTMLClassProperties *
-get_class_properties (GtkHTML *html)
-{
-	GtkHTMLClass *klass;
-  
-	klass = GTK_HTML_CLASS (GTK_WIDGET_GET_CLASS (html));
-	if (!klass->properties) {
-		klass->properties = gtk_html_class_properties_new (GTK_WIDGET (html));
-		
-		if (!gconf_is_initialized ()) {
-			char *argv[] = { "gtkhtml", NULL };
-			
-			g_warning ("gconf is not initialized, please call gconf_init before using GtkHTML library. "
-				   "Meanwhile it's initialized by gtkhtml itself.");
-			gconf_init (1, argv, &gconf_error);
-			if (gconf_error)
-				g_error ("gconf error: %s\n", gconf_error->message);
-		}
-		
-		gconf_client = gconf_client_get_default ();
-		if (!gconf_client)
-			g_error ("cannot create gconf_client\n");
-		gconf_client_add_dir (gconf_client, GTK_HTML_GCONF_DIR, GCONF_CLIENT_PRELOAD_ONELEVEL, &gconf_error);
-		if (gconf_error)
-			g_error ("gconf error: %s\n", gconf_error->message);
-		gconf_client_add_dir (gconf_client, GNOME_SPELL_GCONF_DIR, GCONF_CLIENT_PRELOAD_ONELEVEL, &gconf_error);
-		if (gconf_error)
-			g_error ("gconf error: %s\n", gconf_error->message);
-		gtk_html_class_properties_load (klass->properties, gconf_client);
-
-		if (gconf_error)
-			g_warning ("gconf error: %s\n", gconf_error->message);
-	}
-	
-	return klass->properties;
-}
-
 static void
 set_focus_child (GtkContainer *containter, GtkWidget *w)
 {
@@ -2548,29 +2506,6 @@ drag_data_delete (GtkWidget *widget, Gdk
 	GTK_HTML (widget)->priv->dnd_url = NULL;
 }
 
-static gchar *
-next_uri (guchar **uri_list, gint *len, gint *list_len)
-{
-	guchar *uri, *begin;
-
-	begin = *uri_list;
-	*len = 0;
-	while (**uri_list && **uri_list != '\n' && **uri_list != '\r' && *list_len) {
-		(*uri_list) ++;
-		(*len) ++;
-		(*list_len) --;
-	}
-
-	uri = g_strndup (begin, *len);
-
-	while ((!**uri_list || **uri_list == '\n' || **uri_list == '\r') && *list_len) {
-		(*uri_list) ++;
-		(*list_len) --;
-	}	
-
-	return uri;
-}
-
 static gchar *known_protocols [] = {
 	"http://",
 	"ftp://",
@@ -2581,40 +2516,6 @@ static gchar *known_protocols [] = {
 	NULL
 };
 
-static HTMLObject *
-new_obj_from_uri (HTMLEngine *e, char *uri, char *title, gint len)
-{
-	gint i;
-
-	if (!strncmp (uri, "file:", 5)) {
-		if (!HTML_IS_PLAIN_PAINTER(e->painter)) {
-			GdkPixbuf *pixbuf = NULL;
-			char *img_path = g_filename_from_uri (uri, NULL, NULL);
-			if (img_path) {
-				pixbuf = gdk_pixbuf_new_from_file(img_path, NULL);
-				g_free(img_path);
-			}
-			if (pixbuf) {
-				g_object_unref (pixbuf);
-				return html_image_new (html_engine_get_image_factory (e), uri,
-						       NULL, NULL, -1, -1, FALSE, FALSE, 0,
-						       html_colorset_get_color (e->settings->color_set, HTMLTextColor),
-						       HTML_VALIGN_BOTTOM, TRUE);
-			}
-		}
-	}
-
-	for (i = 0; known_protocols [i]; i++) {
-		if (!strncmp (uri, known_protocols [i], strlen (known_protocols [i]))) {
-			if (!title)
-				title = uri;
-			return html_engine_new_link (e, title, len, uri);
-		}
-	}	
-
-	return NULL;
-}
-
 static void
 move_before_paste (GtkWidget *widget, gint x, gint y)
 {
@@ -2745,7 +2646,9 @@ gtk_html_direction_changed (GtkWidget *w
 static void
 gtk_html_class_init (GtkHTMLClass *klass)
 {
+#ifdef USE_PROPS
 	GObjectClass      *gobject_class;
+#endif
 	GtkHTMLClass      *html_class;
 	GtkWidgetClass    *widget_class;
 	GtkObjectClass    *object_class;
@@ -2754,7 +2657,9 @@ gtk_html_class_init (GtkHTMLClass *klass
 	gchar *filename;
 	
 	html_class = (GtkHTMLClass *) klass;
+#ifdef USE_PROPS
 	gobject_class = (GObjectClass *) klass;
+#endif
 	widget_class = (GtkWidgetClass *) klass;
 	object_class = (GtkObjectClass *) klass;
 	layout_class = (GtkLayoutClass *) klass;
@@ -3116,10 +3021,6 @@ gtk_html_class_init (GtkHTMLClass *klass
 static void
 init_properties_widget (GtkHTML *html)
 {
-	GtkHTMLClassProperties *prop;
-
-	prop = get_class_properties (html);
-
 	html->priv->notify_spell_id = gconf_client_notify_add (gconf_client, GNOME_SPELL_GCONF_DIR,
 							       client_notify_spell_widget, html, NULL, &gconf_error);
 	if (gconf_error) {
Index: src/gtkhtmldebug.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/gtkhtmldebug.c,v
retrieving revision 1.51
diff -u -p -r1.51 gtkhtmldebug.c
--- src/gtkhtmldebug.c	13 Apr 2005 15:35:32 -0000	1.51
+++ src/gtkhtmldebug.c	3 Dec 2005 13:58:05 -0000
@@ -291,8 +291,6 @@ gtk_html_debug_dump_object (HTMLObject *
 		g_print ("Location: %s\n", HTML_IMAGE (obj)->image_ptr->url);
 		break;
 	case HTML_TYPE_FRAMESET: {
-		gint i;
-
 		for (i = 0; i < HTML_FRAMESET (obj)->frames->len; i++)
 			gtk_html_debug_dump_tree (g_ptr_array_index (HTML_FRAMESET (obj)->frames, i), level + 1);
 		}
Index: src/htmlbutton.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/htmlbutton.c,v
retrieving revision 1.19
diff -u -p -r1.19 htmlbutton.c
--- src/htmlbutton.c	17 May 2005 14:47:36 -0000	1.19
+++ src/htmlbutton.c	3 Dec 2005 13:58:05 -0000
@@ -122,11 +122,9 @@ html_button_init (HTMLButton *button, 
 		  HTMLButtonType type)
 {
 	HTMLEmbedded *element;
-	HTMLObject *object;
 	GtkWidget  *widget;
 
 	element = HTML_EMBEDDED (button);
-	object = HTML_OBJECT (button);
 	widget = NULL;
 
 	html_embedded_init (element, HTML_EMBEDDED_CLASS (klass), parent, name, value);
Index: src/htmlcheckbox.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/htmlcheckbox.c,v
retrieving revision 1.12
diff -u -p -r1.12 htmlcheckbox.c
--- src/htmlcheckbox.c	11 Apr 2001 08:59:30 -0000	1.12
+++ src/htmlcheckbox.c	3 Dec 2005 13:58:05 -0000
@@ -110,11 +110,9 @@ html_checkbox_init (HTMLCheckBox *checkb
 		    gboolean checked) 
 {
 	HTMLEmbedded *element;
-	HTMLObject *object;
 	GtkWidget  *check;
 
 	element = HTML_EMBEDDED (checkbox);
-	object = HTML_OBJECT (checkbox);
 
 	if (value == NULL)
 		value = g_strdup ("on");
Index: src/htmlclue.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/htmlclue.c,v
retrieving revision 1.108
diff -u -p -r1.108 htmlclue.c
--- src/htmlclue.c	11 Mar 2005 15:16:10 -0000	1.108
+++ src/htmlclue.c	3 Dec 2005 13:58:05 -0000
@@ -221,9 +221,7 @@ static void
 split (HTMLObject *self, HTMLEngine *e, HTMLObject *child, gint offset, gint level, GList **left, GList **right)
 {
 	HTMLObject *dup;
-	HTMLClue *clue;
 
-	clue = HTML_CLUE (self);
 	dup  = html_object_dup (self);
 
 	HTML_CLUE (dup)->tail  = HTML_CLUE (self)->tail;
Index: src/htmlclueflow.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/htmlclueflow.c,v
retrieving revision 1.325
diff -u -p -r1.325 htmlclueflow.c
--- src/htmlclueflow.c	13 Jul 2005 08:56:10 -0000	1.325
+++ src/htmlclueflow.c	3 Dec 2005 13:58:05 -0000
@@ -55,7 +55,6 @@ static HTMLClueClass *parent_class = NUL
 
 #define HCF_CLASS(x) HTML_CLUEFLOW_CLASS (HTML_OBJECT (x)->klass)
 
-inline HTMLHAlignType html_clueflow_get_halignment          (HTMLClueFlow *flow);
 static gchar *        get_item_marker_str                   (HTMLClueFlow *flow, gboolean ascii_only);
 static guint          get_post_padding                      (HTMLClueFlow *flow, 
 							     guint pad);
@@ -818,6 +817,40 @@ update_top_height (HTMLObject *begin, HT
 	}
 }
 
+inline HTMLHAlignType
+html_clueflow_get_halignment (HTMLClueFlow *flow)
+{
+        g_return_val_if_fail (flow != NULL, HTML_HALIGN_NONE);
+
+        if (HTML_CLUE (flow)->halign == HTML_HALIGN_NONE) {
+                HTMLHAlignType halign;
+
+                if (HTML_OBJECT (flow)->parent && HTML_IS_TABLE_CELL (HTML_OBJECT (flow)->parent))
+                        halign = HTML_CLUE (HTML_OBJECT (flow)->parent)->halign == HTML_HALIGN_NONE
+                                ? HTML_TABLE_CELL (HTML_OBJECT (flow)->parent)->heading ? HTML_HALIGN_CENTER : HTML_HALIGN_NONE
+                                : HTML_CLUE (HTML_OBJECT (flow)->parent)->halign;
+                else
+                        halign = HTML_CLUE (HTML_OBJECT (flow)->parent)->halign;
+
+                if (halign == HTML_HALIGN_NONE) {
+                        switch (html_object_get_direction (HTML_OBJECT (flow))) {
+                        case HTML_DIRECTION_LTR:
+                                halign = HTML_HALIGN_LEFT;
+                                break;
+                        case HTML_DIRECTION_RTL:
+                                halign = HTML_HALIGN_RIGHT;
+                                break;
+                        default:
+                                break;
+                        }
+                }
+
+                return halign;
+
+        } else
+                return HTML_CLUE (flow)->halign;
+}
+
 static inline void
 update_line_positions (HTMLObject *clue, HTMLObject *begin, HTMLObject *end, gint left, gint a, gint d, gint height)
 {
@@ -1299,7 +1332,7 @@ draw_item (HTMLObject *self, HTMLPainter
 
 	marker = get_item_marker_str (flow, HTML_IS_PLAIN_PAINTER (painter));
 	if (marker) {
-		gint width, len, asc, dsc, x_pos, space_width;
+		gint len, asc, dsc, x_pos, space_width;
 		
 		len   = g_utf8_strlen (marker, -1);
 		html_painter_set_font_style (painter, html_clueflow_get_default_font_style (flow));
@@ -1457,12 +1490,6 @@ write_indent (HTMLEngineSaveState *state
 	return TRUE;
 }
 
-inline static gint
-get_level (HTMLClueFlow *cf)
-{
-	return cf->levels->len;
-}
-
 static gchar *
 get_list_start_tag (HTMLClueFlow *self)
 {
@@ -1524,30 +1551,32 @@ get_start_tag (HTMLClueFlow *self)
 static const char *
 get_start_indent_item (HTMLListType type)
 {
-	switch (type) {
-	case HTML_LIST_TYPE_UNORDERED:
-	case HTML_LIST_TYPE_MENU:
-	case HTML_LIST_TYPE_DIR:
-		return "UL";
-	case HTML_LIST_TYPE_ORDERED_LOWER_ALPHA:
-		return "OL TYPE=a";
-	case HTML_LIST_TYPE_ORDERED_UPPER_ALPHA:
-		return "OL TYPE=A";
-	case HTML_LIST_TYPE_ORDERED_LOWER_ROMAN:
-		return "OL TYPE=i";
-	case HTML_LIST_TYPE_ORDERED_UPPER_ROMAN:
+	if (type) {
+		switch (type) {
+		case HTML_LIST_TYPE_UNORDERED:
+		case HTML_LIST_TYPE_MENU:
+		case HTML_LIST_TYPE_DIR:
+			return "UL";
+		case HTML_LIST_TYPE_ORDERED_LOWER_ALPHA:
+			return "OL TYPE=a";
+		case HTML_LIST_TYPE_ORDERED_UPPER_ALPHA:
+			return "OL TYPE=A";
+		case HTML_LIST_TYPE_ORDERED_LOWER_ROMAN:
+			return "OL TYPE=i";
+		case HTML_LIST_TYPE_ORDERED_UPPER_ROMAN:
 		return "OL TYPE=I";
-	case HTML_LIST_TYPE_ORDERED_ARABIC:
-		return "OL TYPE=1";
-	case HTML_LIST_TYPE_GLOSSARY_DD:
-	case HTML_LIST_TYPE_GLOSSARY_DL:
-		return "DL";
-	case HTML_LIST_TYPE_BLOCKQUOTE_CITE:
-		return "BLOCKQUOTE TYPE=CITE";
-	case HTML_LIST_TYPE_BLOCKQUOTE:
-		return "BLOCKQUOTE";
-	}
-	return "";		
+		case HTML_LIST_TYPE_ORDERED_ARABIC:
+			return "OL TYPE=1";
+		case HTML_LIST_TYPE_GLOSSARY_DD:
+		case HTML_LIST_TYPE_GLOSSARY_DL:
+			return "DL";
+		case HTML_LIST_TYPE_BLOCKQUOTE_CITE:
+			return "BLOCKQUOTE TYPE=CITE";
+		case HTML_LIST_TYPE_BLOCKQUOTE:
+			return "BLOCKQUOTE";
+		}
+	} else 
+		return "";
 }
 
 static const char *
@@ -1631,7 +1660,6 @@ get_p_str (HTMLClueFlow *self, HTMLEngin
 static gboolean
 write_flow_tag (HTMLClueFlow *self, HTMLEngineSaveState *state) 
 {
-	int d;
 	HTMLClueFlow *next = NULL;
 	HTMLClueFlow *prev = NULL;
 	HTMLHAlignType halign;
@@ -1666,7 +1694,6 @@ write_flow_tag (HTMLClueFlow *self, HTML
 		}
 	}
 
-	d = get_similar_depth (self, prev);
 	if (is_item (self)) {
 		char *li = get_list_start_tag (self);
 
@@ -1988,9 +2015,8 @@ save_plain (HTMLObject *self,
 			offset = 0;
 			for (i = 0; i < n_items; i ++) {
 				PangoItem tmp_item;
-				int start_i, start_offset;
+				int start_offset;
 
-				start_i = i;
 				start_offset = offset;
 				offset += items [i]->num_chars;
 				tmp_item = *items [i];
@@ -2751,40 +2777,6 @@ html_clueflow_set_halignment (HTMLClueFl
 	HTML_CLUE (flow)->halign = alignment;
 
 	relayout_and_draw (HTML_OBJECT (flow), engine);
-}
-
-inline HTMLHAlignType
-html_clueflow_get_halignment (HTMLClueFlow *flow)
-{
-	g_return_val_if_fail (flow != NULL, HTML_HALIGN_NONE);
-
-	if (HTML_CLUE (flow)->halign == HTML_HALIGN_NONE) {
-		HTMLHAlignType halign;
-
-		if (HTML_OBJECT (flow)->parent && HTML_IS_TABLE_CELL (HTML_OBJECT (flow)->parent))
-			halign = HTML_CLUE (HTML_OBJECT (flow)->parent)->halign == HTML_HALIGN_NONE
-				? HTML_TABLE_CELL (HTML_OBJECT (flow)->parent)->heading ? HTML_HALIGN_CENTER : HTML_HALIGN_NONE
-				: HTML_CLUE (HTML_OBJECT (flow)->parent)->halign;
-		else
-			halign = HTML_CLUE (HTML_OBJECT (flow)->parent)->halign;
-
-		if (halign == HTML_HALIGN_NONE) {
-			switch (html_object_get_direction (HTML_OBJECT (flow))) {
-			case HTML_DIRECTION_LTR:
-				halign = HTML_HALIGN_LEFT;
-				break;
-			case HTML_DIRECTION_RTL:
-				halign = HTML_HALIGN_RIGHT;
-				break;
-			default:
-				break;
-			}
-		}
-
-		return halign;
-
-	} else
-		return HTML_CLUE (flow)->halign;
 }
 
 void
Index: src/htmlcluev.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/htmlcluev.c,v
retrieving revision 1.83
diff -u -p -r1.83 htmlcluev.c
--- src/htmlcluev.c	29 Apr 2005 06:51:14 -0000	1.83
+++ src/htmlcluev.c	3 Dec 2005 13:58:05 -0000
@@ -486,8 +486,8 @@ check_point (HTMLObject *self,
 		parent = HTML_OBJECT (clue)->parent;
 		obj = html_object_check_point (HTML_OBJECT (clue),
 					       painter,
-					       x - HTML_OBJECT (clue)->parent->x,
-					       y - HTML_OBJECT (clue)->parent->y + HTML_OBJECT (clue)->parent->ascent,
+					       x - parent->x,
+					       y - parent->y + parent->ascent,
 					       offset_return,
 					       for_cursor);
 		if (obj != NULL) {
@@ -503,8 +503,8 @@ check_point (HTMLObject *self,
 		parent = HTML_OBJECT (clue)->parent;
 		obj = html_object_check_point (HTML_OBJECT (clue),
 					       painter,
-					       x - HTML_OBJECT (clue)->parent->x,
-					       y - HTML_OBJECT (clue)->parent->y + HTML_OBJECT (clue)->parent->ascent,
+					       x - parent->x,
+					       y - parent->y + parent->ascent,
 					       offset_return,
 					       for_cursor);
 		if (obj != NULL) {
Index: src/htmlcursor.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/htmlcursor.c,v
retrieving revision 1.74
diff -u -p -r1.74 htmlcursor.c
--- src/htmlcursor.c	31 Mar 2005 12:44:42 -0000	1.74
+++ src/htmlcursor.c	3 Dec 2005 13:58:05 -0000
@@ -298,7 +298,6 @@ html_cursor_up (HTMLCursor *cursor,
 	gint prev_x, prev_y;
 	gint x, y;
 	gint target_x;
-	gint orig_y;
 	gboolean new_line;
 
 	gtk_html_im_reset (engine->widget);
@@ -330,8 +329,6 @@ html_cursor_up (HTMLCursor *cursor,
 
 	target_x = cursor->target_x;
 
-	orig_y = y;
-
 	new_line = FALSE;
 
 	while (1) {
@@ -416,7 +413,6 @@ html_cursor_down (HTMLCursor *cursor,
 	gint prev_x, prev_y;
 	gint x, y;
 	gint target_x;
-	gint orig_y;
 	gboolean new_line;
 
 	gtk_html_im_reset (engine->widget);
@@ -447,8 +443,6 @@ html_cursor_down (HTMLCursor *cursor,
 	}
 
 	target_x = cursor->target_x;
-
-	orig_y = y;
 
 	new_line = FALSE;
 
Index: src/htmlembedded.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/htmlembedded.c,v
retrieving revision 1.56
diff -u -p -r1.56 htmlembedded.c
--- src/htmlembedded.c	17 May 2005 14:47:36 -0000	1.56
+++ src/htmlembedded.c	3 Dec 2005 13:58:05 -0000
@@ -161,7 +161,7 @@ html_embedded_real_calc_size (HTMLObject
 	GtkWidget *widget;
 	HTMLEmbedded *emb = HTML_EMBEDDED (self);
 	gint pixel_size;
-	gint old_width, old_ascent, old_descent;
+	gint old_width, old_ascent;
 	GtkRequisition requisition;
 
 	widget = emb->widget;
@@ -172,7 +172,6 @@ html_embedded_real_calc_size (HTMLObject
 
 	old_width = self->width;
 	old_ascent = self->ascent;
-	old_descent = self->descent;
 
 	requisition.width = requisition.height = 0;
 	gtk_widget_size_request (widget, &requisition);
Index: src/htmlengine-edit-cursor.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/htmlengine-edit-cursor.c,v
retrieving revision 1.27
diff -u -p -r1.27 htmlengine-edit-cursor.c
--- src/htmlengine-edit-cursor.c	11 Aug 2004 17:25:52 -0000	1.27
+++ src/htmlengine-edit-cursor.c	3 Dec 2005 13:58:05 -0000
@@ -164,10 +164,8 @@ html_engine_draw_image_cursor (HTMLEngin
 	io    = e->cursor->object;
 
 	if (io && HTML_IS_IMAGE (e->cursor->object)) {
-		HTMLImage *image;
 		static gint offset = 3;
 
-		image = HTML_IMAGE (io);
 		if (io != cr->object) {
 			if (cr->object)
 				refresh_under_cursor (e, cr, &enabled);
Index: src/htmlengine-edit-cut-and-paste.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/htmlengine-edit-cut-and-paste.c,v
retrieving revision 1.114
diff -u -p -r1.114 htmlengine-edit-cut-and-paste.c
--- src/htmlengine-edit-cut-and-paste.c	22 Aug 2005 02:15:02 -0000	1.114
+++ src/htmlengine-edit-cut-and-paste.c	3 Dec 2005 13:58:05 -0000
@@ -123,10 +123,8 @@ static GList *
 point_get_parent_list (HTMLPoint *point, gint level, gboolean include_offset)
 {
 	GList *list;
-	HTMLObject *o;
 
 	list = include_offset ? g_list_prepend (NULL, GINT_TO_POINTER (point->offset)) : NULL;
-	o    = point->object;
 
 	object_get_parent_list (point->object, level, &list);
 
@@ -1494,9 +1492,6 @@ change_link (HTMLObject *o, HTMLEngine *
 	changed = d->url ? html_object_set_link (o, d->color, d->url, d->target) : html_object_remove_link (o, d->color);
 	if (changed) {
 		if (o->parent) {
-			HTMLObject *prev;
-
-			prev = o->prev;
 			g_assert (HTML_OBJECT_TYPE (o->parent) == HTML_TYPE_CLUEFLOW);
 
 			html_clue_append_after (HTML_CLUE (o->parent), changed, o);
Index: src/htmlengine-edit-fontstyle.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/htmlengine-edit-fontstyle.c,v
retrieving revision 1.66
diff -u -p -r1.66 htmlengine-edit-fontstyle.c
--- src/htmlengine-edit-fontstyle.c	4 Jun 2004 15:05:48 -0000	1.66
+++ src/htmlengine-edit-fontstyle.c	3 Dec 2005 13:58:05 -0000
@@ -67,7 +67,7 @@ get_font_style_from_selection (HTMLEngin
 		if (html_object_is_text (p.object) && p.offset != html_object_get_length (p.object)) {
 			gint index = 0;
 			if (first) {
-				gint index = g_utf8_offset_to_pointer (HTML_TEXT (p.object)->text, offset) - HTML_TEXT (p.object)->text;
+				index = g_utf8_offset_to_pointer (HTML_TEXT (p.object)->text, offset) - HTML_TEXT (p.object)->text;
 				style = html_text_get_fontstyle_at_index (HTML_TEXT (p.object), index);
 				first = FALSE;
 			}
Index: src/htmlengine-edit-table.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/htmlengine-edit-table.c,v
retrieving revision 1.78
diff -u -p -r1.78 htmlengine-edit-table.c
--- src/htmlengine-edit-table.c	11 May 2005 07:36:54 -0000	1.78
+++ src/htmlengine-edit-table.c	3 Dec 2005 13:58:06 -0000
@@ -240,7 +240,7 @@ html_table_insert_column (HTMLTable *t, 
 	html_table_alloc_cell (t, 0, t->totalCols);
 	for (c = t->totalCols - 1; c > col; c --) {
 		for (r = 0; r < t->totalRows; r ++) {
-			HTMLTableCell *cell = t->cells [r][c - 1];
+			cell = t->cells [r][c - 1];
 
 			if (cell) {
 				if (cell->col == c - 1) {
@@ -483,7 +483,7 @@ html_table_insert_row (HTMLTable *t, HTM
 	html_table_alloc_cell (t, t->totalRows, 0);
 	for (r = t->totalRows; r > row; r --) {
 		for (c = 0; c < t->totalCols; c ++) {
-			HTMLTableCell *cell = t->cells [r - 1][c];
+			cell = t->cells [r - 1][c];
 
 			if (cell) {
 				if (cell->row == r - 1) {
Index: src/htmlengine-edit.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/htmlengine-edit.c,v
retrieving revision 1.111
diff -u -p -r1.111 htmlengine-edit.c
--- src/htmlengine-edit.c	21 Sep 2005 10:20:42 -0000	1.111
+++ src/htmlengine-edit.c	3 Dec 2005 13:58:06 -0000
@@ -624,7 +624,6 @@ html_engine_fill_pre_line (HTMLEngine *e
 	guint position;
 	guint line_offset;
 	guint last_space;
-	HTMLObject *flow;
 	gunichar uc;
 
 	g_assert (e->cursor->object);
@@ -640,7 +639,6 @@ html_engine_fill_pre_line (HTMLEngine *e
 
 	html_cursor_beginning_of_paragraph (e->cursor, e);
 
-	flow = e->cursor->object->parent;
 	while (html_cursor_forward (e->cursor, e) && (e->cursor->position < position - 1)) {
 		uc = html_cursor_get_current_char (e->cursor);
 		line_offset = inc_line_offset (line_offset, uc);
Index: src/htmlengine-save.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/htmlengine-save.c,v
retrieving revision 1.56
diff -u -p -r1.56 htmlengine-save.c
--- src/htmlengine-save.c	5 May 2005 11:21:47 -0000	1.56
+++ src/htmlengine-save.c	3 Dec 2005 13:58:06 -0000
@@ -222,7 +222,6 @@ get_body (HTMLEngine *e)
 	gchar *bg;
 	gchar *bg_image;
 	gchar *link;
-	char *dir = NULL;
 	gchar *lm, *rm, *tm, *bm;
 	gchar *url = NULL;
 
@@ -235,12 +234,6 @@ get_body (HTMLEngine *e)
 						     (e->widget, ((HTMLImagePointer *) e->bgPixmapPtr)->url))
 		: g_strdup ("");
 	g_free (url);
-	if (HTML_CLUEV (e->clue)->dir != HTML_DIRECTION_DERIVED) {
-		if (HTML_CLUEV (e->clue)->dir == HTML_DIRECTION_RTL)
-			dir = " DIR=RTL";
-		else
-			dir = " DIR=LTR";
-	}
 
 	lm = e->leftBorder != LEFT_BORDER ? g_strdup_printf (" LEFTMARGIN=\"%d\"", e->leftBorder) : g_strdup ("");
 	rm = e->rightBorder != RIGHT_BORDER ? g_strdup_printf (" RIGHTMARGIN=\"%d\"", e->rightBorder) : g_strdup ("");
Index: src/htmlengine.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/htmlengine.c,v
retrieving revision 1.639
diff -u -p -r1.639 htmlengine.c
--- src/htmlengine.c	11 Sep 2005 04:05:25 -0000	1.639
+++ src/htmlengine.c	3 Dec 2005 13:58:06 -0000
@@ -867,7 +867,6 @@ insert_text (HTMLEngine *e,
 	GtkHTMLFontStyle font_style;
 	HTMLObject *prev;
 	HTMLColor *color;
-	gchar *face;
 	gboolean create_link;
 	gint last_pos = 0;
 	gint last_bytes = 0;
@@ -888,7 +887,6 @@ insert_text (HTMLEngine *e,
 
 	font_style = current_font_style (e);
 	color = current_color (e);
-	face = current_font_face (e);
 
 	if ((create_link || e->flow == NULL || HTML_CLUE (e->flow)->head == NULL) && !e->inPre) {
 		while (*text == ' ')
@@ -1471,7 +1469,6 @@ element_parse_object (HTMLEngine *e, HTM
 	char *classid = NULL;
 	char *name    = NULL;
 	char *type    = NULL;
-	char *str     = NULL;
 	char *data    = NULL;
 	char *value   = NULL;
 	int width=-1,height=-1;
@@ -1540,7 +1537,7 @@ element_parse_object (HTMLEngine *e, HTM
 			html_form_add_element (e->form, HTML_EMBEDDED (el));
 
 		/* throw away the contents we can deal with the object */
-		str = discard_body (e, end);
+		discard_body (e, end);
 	} else {
 		html_object_destroy (HTML_OBJECT (el));
 	}
@@ -1688,9 +1685,10 @@ element_parse_iframe (HTMLEngine *e, HTM
 		if (scroll != GTK_POLICY_AUTOMATIC)
 			html_iframe_set_scrolling (HTML_IFRAME (iframe), scroll);
 		
-		if (halign != HTML_HALIGN_NONE) {
+		if (halign != HTML_HALIGN_NONE || valign != HTML_VALIGN_NONE) {
 			HTMLClueAligned *aligned = HTML_CLUEALIGNED (html_cluealigned_new (NULL, 0, 0, clue->max_width, 100));
 			HTML_CLUE (aligned)->halign = halign;
+			HTML_CLUE (aligned)->valign = valign;
 			html_clue_append (HTML_CLUE (aligned), HTML_OBJECT (iframe));
 			append_element (e, clue, HTML_OBJECT (aligned));
 		} else {
@@ -2633,14 +2631,14 @@ element_parse_meta (HTMLEngine *e, HTMLO
 	int refresh_delay = 0;
 	gchar *refresh_url = NULL;
 	
-	html_string_tokenizer_tokenize( e->st, str + 5, " >" );
-	while ( html_string_tokenizer_has_more_tokens (e->st) ) {
+	html_string_tokenizer_tokenize(e->st, str + 5, " >");
+	while (html_string_tokenizer_has_more_tokens (e->st)) {
 
 		const gchar* token = html_string_tokenizer_next_token(e->st);
-		if ( g_ascii_strncasecmp( token, "http-equiv=", 11 ) == 0 ) {
-			if ( g_ascii_strncasecmp( token + 11, "refresh", 7 ) == 0 )
+		if (g_ascii_strncasecmp(token, "http-equiv=", 11) == 0 ) {
+			if (g_ascii_strncasecmp(token + 11, "refresh", 7) == 0 )
 				refresh = 1;
-		} else if ( g_ascii_strncasecmp( token, "content=", 8 ) == 0 ) {
+		} else if (g_ascii_strncasecmp(token, "content=", 8) == 0) {
 			if (refresh) {
 				const gchar *content;
 				content = token + 8;
@@ -2649,9 +2647,9 @@ element_parse_meta (HTMLEngine *e, HTMLO
 				refresh_delay = atoi(content);
 				
 				html_string_tokenizer_tokenize(e->st, content, ",;> ");
-				while ( html_string_tokenizer_has_more_tokens (e->st) ) {
-					const gchar* token = html_string_tokenizer_next_token(e->st);
-					if ( g_ascii_strncasecmp( token, "url=", 4 ) == 0 )
+				while (html_string_tokenizer_has_more_tokens (e->st)) {
+					token = html_string_tokenizer_next_token(e->st);
+					if (g_ascii_strncasecmp( token, "url=", 4 ) == 0)
 						refresh_url = g_strdup (token + 4);
 				}
 				
@@ -2711,11 +2709,9 @@ static void
 element_parse_li (HTMLEngine *e, HTMLObject *clue, const gchar *str)
 {
 	HTMLListType listType;
-	gint listLevel;
 	gint itemNumber;
 	
 	listType = HTML_LIST_TYPE_UNORDERED;
-	listLevel = 1;
 	itemNumber = 1;
 	
 	pop_element (e, ID_LI);
@@ -3614,7 +3610,7 @@ typedef struct _HTMLDispatchEntry {
 	HTMLParseFunc func;
 } HTMLDispatchEntry;
 
-HTMLDispatchEntry basic_table[] = {
+static HTMLDispatchEntry basic_table[] = {
 	{ID_A,                element_parse_a},
 	{"area",              element_parse_area},
 	{ID_ADDRESS,          element_parse_address},
@@ -3979,8 +3975,6 @@ html_engine_set_property (GObject *objec
 	HTMLEngine *engine = HTML_ENGINE (object);
 
 	if (id == 1) {
-		GtkHTMLClassProperties *prop;
-
 		engine->widget          = GTK_HTML (g_value_get_object (value));
 		engine->painter         = html_gdk_painter_new (GTK_WIDGET (engine->widget), TRUE);
 		engine->settings        = html_settings_new (GTK_WIDGET (engine->widget));
@@ -3988,8 +3982,6 @@ html_engine_set_property (GObject *objec
 
 		engine->insertion_color = html_colorset_get_color (engine->settings->color_set, HTMLTextColor);
 		html_color_ref (engine->insertion_color);
-
-		prop = GTK_HTML_CLASS (GTK_WIDGET_GET_CLASS (engine->widget))->properties;
 	}
 }
 
@@ -4443,7 +4435,7 @@ html_engine_stop (HTMLEngine *e)
 	html_object_forall (e->clue, e, html_engine_stop_forall, NULL);
 }
 
-char *engine_content_types[]= {"text/html", NULL};
+static char *engine_content_types[]= {"text/html", NULL};
 
 static char **
 html_engine_stream_types (GtkHTMLStream *handle,
@@ -4639,7 +4631,6 @@ static gboolean
 html_engine_timer_event (HTMLEngine *e)
 {
 	static const gchar *end[] = { NULL };
-	gint lastHeight;
 	gboolean retval = TRUE;
 
 	DI (printf ("html_engine_timer_event idle %p\n", e);)
@@ -4650,12 +4641,9 @@ html_engine_timer_event (HTMLEngine *e)
 		goto out;
 	}
 
-	/* Getting height */
-	lastHeight = html_engine_get_doc_height (e);
-
 	e->parseCount = e->granularity;
 
-	/* Parsing body height */
+	/* Parsing body */
 	new_parse_body (e, end);
 
 	e->begin = FALSE;
@@ -5773,7 +5761,6 @@ html_engine_get_spell_word (HTMLEngine *
 	GString *text;
 	HTMLCursor *cursor;
 	gchar *word;
-	gint pos;
 	gunichar uc;
 	gboolean cited, cited_tmp, cited2;
 
@@ -5783,7 +5770,6 @@ html_engine_get_spell_word (HTMLEngine *
 		return NULL;
 
 	cursor = html_cursor_dup (e->cursor);
-	pos    = cursor->position;
 	text   = g_string_new (NULL);
 
 	/* move to the beginning of word */
Index: src/htmlframe.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/htmlframe.c,v
retrieving revision 1.38
diff -u -p -r1.38 htmlframe.c
--- src/htmlframe.c	22 Jul 2004 13:15:14 -0000	1.38
+++ src/htmlframe.c	3 Dec 2005 13:58:06 -0000
@@ -436,7 +436,6 @@ html_frame_init (HTMLFrame *frame,
 	GtkHTML   *new_html;
 	GtkHTML   *parent_html;
 	GtkWidget *scrolled_window;
-	gint depth;
 
 	g_assert (GTK_IS_HTML (parent));
 	parent_html = GTK_HTML (parent);
@@ -465,7 +464,7 @@ html_frame_init (HTMLFrame *frame,
 	frame->height = height;
 	frame->gdk_painter = NULL;
 	gtk_html_set_base (new_html, src);
-	depth = gtk_html_set_iframe_parent (new_html, parent, HTML_OBJECT (frame));
+	gtk_html_set_iframe_parent (new_html, parent, HTML_OBJECT (frame));
 	gtk_container_add (GTK_CONTAINER (scrolled_window), new_widget);
 	gtk_widget_show (new_widget);
 
Index: src/htmlhidden.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/htmlhidden.c,v
retrieving revision 1.8
diff -u -p -r1.8 htmlhidden.c
--- src/htmlhidden.c	13 Dec 2000 23:10:51 -0000	1.8
+++ src/htmlhidden.c	3 Dec 2005 13:58:06 -0000
@@ -61,10 +61,8 @@ void html_hidden_class_init (HTMLHiddenC
 			     guint object_size)
 {
 	HTMLEmbeddedClass *element_class;
-	HTMLObjectClass *object_class;
 
 	element_class = HTML_EMBEDDED_CLASS (klass);
-	object_class = HTML_OBJECT_CLASS (klass);
 
 	html_embedded_class_init (element_class, type, object_size);
 
Index: src/htmliframe.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/htmliframe.c,v
retrieving revision 1.88
diff -u -p -r1.88 htmliframe.c
--- src/htmliframe.c	5 May 2005 11:21:47 -0000	1.88
+++ src/htmliframe.c	3 Dec 2005 13:58:06 -0000
@@ -261,10 +261,8 @@ static HTMLObject *
 op_copy (HTMLObject *self, HTMLObject *parent, HTMLEngine *e, GList *from, GList *to, guint *len)
 {
 	HTMLObject *dup, *clue;
-	GtkHTML *html;
 
 	dup = html_object_dup (self);
-	html = GTK_HTML (HTML_IFRAME (dup)->html);
 	clue = GTK_HTML (HTML_IFRAME (self)->html)->engine->clue;
 	GTK_HTML (HTML_IFRAME (dup)->html)->engine->clue =
 		html_object_op_copy (clue, dup, GTK_HTML (HTML_IFRAME (self)->html)->engine,
@@ -472,8 +470,6 @@ save (HTMLObject *s,
 		}
 		html_engine_save_buffer_free (buffer, TRUE);
 	} else {
-		HTMLEngine *e = GTK_HTML (iframe->html)->engine;
-
 		if (!html_engine_save_output_string (state, "<IFRAME SRC=\"%s\"", iframe->url))
 			 return FALSE;
         
Index: src/htmlimage.h
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/htmlimage.h,v
retrieving revision 1.49
diff -u -p -r1.49 htmlimage.h
--- src/htmlimage.h	20 May 2003 15:17:13 -0000	1.49
+++ src/htmlimage.h	3 Dec 2005 13:58:06 -0000
@@ -59,10 +59,10 @@ struct _HTMLImage {
 
 	gint16 specified_width;
 	gint16 specified_height;
-	gboolean percent_width  : 1;
-	gboolean percent_height : 1;
-	gboolean ismap : 1;
-	gboolean animation_active : 1;
+	guint percent_width  : 1;
+	guint percent_height : 1;
+	guint ismap : 1;
+	guint animation_active : 1;
 
 	gint8 hspace;
 	gint8 vspace;
Index: src/htmlinterval.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/htmlinterval.c,v
retrieving revision 1.21
diff -u -p -r1.21 htmlinterval.c
--- src/htmlinterval.c	13 Apr 2005 15:35:32 -0000	1.21
+++ src/htmlinterval.c	3 Dec 2005 13:58:06 -0000
@@ -329,12 +329,6 @@ html_object_children_max (HTMLObject *a,
 	return a;
 }
 
-static inline HTMLObject *
-html_object_children_min (HTMLObject *a, HTMLObject *b)
-{
-	return a == html_object_children_max (b, a) ? b : a;
-}
-
 HTMLPoint *
 html_point_max (HTMLPoint *a, HTMLPoint *b)
 {
Index: src/htmlprinter.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/htmlprinter.c,v
retrieving revision 1.85
diff -u -p -r1.85 htmlprinter.c
--- src/htmlprinter.c	22 Oct 2005 10:25:26 -0000	1.85
+++ src/htmlprinter.c	3 Dec 2005 13:58:07 -0000
@@ -504,15 +504,11 @@ static void
 draw_pixmap (HTMLPainter *painter, GdkPixbuf *pixbuf, gint x, gint y, gint scale_width, gint scale_height, const GdkColor *color)
 {
 	HTMLPrinter *printer;
-	gint width, height;
 	double print_x, print_y;
 	double print_scale_width, print_scale_height;
 
 	printer = HTML_PRINTER (painter);
 	g_return_if_fail (printer->context != NULL);
-
-	width = gdk_pixbuf_get_width (pixbuf);
-	height = gdk_pixbuf_get_height (pixbuf);
 
 	html_printer_coordinates_to_gnome_print (printer, x, y, &print_x, &print_y);
 
Index: src/htmlradio.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/htmlradio.c,v
retrieving revision 1.13
diff -u -p -r1.13 htmlradio.c
--- src/htmlradio.c	6 Jun 2001 06:34:31 -0000	1.13
+++ src/htmlradio.c	3 Dec 2005 13:58:07 -0000
@@ -113,11 +113,9 @@ html_radio_init (HTMLRadio *radio, 
 		 HTMLForm *form)
 {
 	HTMLEmbedded *element;
-	HTMLObject *object;
 	GtkWidget *widget;
 
 	element = HTML_EMBEDDED (radio);
-	object = HTML_OBJECT (radio);
 
 	if (value == NULL)
 		value = g_strdup ("on");
Index: src/htmlselect.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/htmlselect.c,v
retrieving revision 1.23
diff -u -p -r1.23 htmlselect.c
--- src/htmlselect.c	2 Jun 2003 18:22:53 -0000	1.23
+++ src/htmlselect.c	3 Dec 2005 13:58:07 -0000
@@ -285,11 +285,9 @@ html_select_init (HTMLSelect *select,
 {
 
 	HTMLEmbedded *element;
-	HTMLObject *object;
 	GtkWidget *widget;
 
 	element = HTML_EMBEDDED (select);
-	object = HTML_OBJECT (select);
 
 	html_embedded_init (element, HTML_EMBEDDED_CLASS (klass),
 			   parent, name, NULL);
@@ -422,10 +420,10 @@ html_select_set_text (HTMLSelect *select
 		/* Add width of scrollbar */
 
 		if ((item + 1) > select->size && GTK_SCROLLED_WINDOW(w)->vscrollbar) {
-			GtkRequisition req;
+			GtkRequisition scrollbar_req;
 
-			gtk_widget_size_request (GTK_SCROLLED_WINDOW(w)->vscrollbar, &req);
-			HTML_OBJECT (select)->width += req.width + 8;
+			gtk_widget_size_request (GTK_SCROLLED_WINDOW(w)->vscrollbar, &scrollbar_req);
+			HTML_OBJECT (select)->width += scrollbar_req.width + 8;
 		}
 
 		gtk_widget_set_size_request (w, HTML_OBJECT(select)->width, -1);
Index: src/htmltablecell.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/htmltablecell.c,v
retrieving revision 1.100
diff -u -p -r1.100 htmltablecell.c
--- src/htmltablecell.c	27 Jan 2005 13:44:41 -0000	1.100
+++ src/htmltablecell.c	3 Dec 2005 13:58:07 -0000
@@ -50,14 +50,12 @@ draw_background_helper (HTMLTableCell *c
 {
 	HTMLObject *o;
 	HTMLClueV *cluev;
-	HTMLTable  *t;
 	GdkPixbuf  *pixbuf = NULL;
 	GdkColor   *color = NULL;
 	int pixel_size = html_painter_get_pixel_size (p);
 
 	o = HTML_OBJECT (cell);
 	cluev = HTML_CLUEV (cell);
-	t = HTML_IS_TABLE (o->parent) ? HTML_TABLE (o->parent) : NULL;
 
 	if (cell->have_bg) {
 		if (! cell->bg_allocated) {
Index: src/htmltablecell.h
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/htmltablecell.h,v
retrieving revision 1.30
diff -u -p -r1.30 htmltablecell.h
--- src/htmltablecell.h	11 Nov 2004 17:09:38 -0000	1.30
+++ src/htmltablecell.h	3 Dec 2005 13:58:07 -0000
@@ -38,8 +38,8 @@ struct _HTMLTableCell {
 
 	gint fixed_width;
 	gint fixed_height;
-	gboolean percent_width  : 1;
-	gboolean percent_height : 1;
+	guint percent_width  : 1;
+	guint percent_height : 1;
 	gboolean no_wrap;
 	gboolean heading;
 
Index: src/htmltext.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/htmltext.c,v
retrieving revision 1.285
diff -u -p -r1.285 htmltext.c
--- src/htmltext.c	26 Sep 2005 07:07:21 -0000	1.285
+++ src/htmltext.c	3 Dec 2005 13:58:07 -0000
@@ -1227,7 +1227,6 @@ html_text_prepare_attrs (HTMLText *text,
 		GSList *l;
 
 		for (l = text->links; l; l = l->next) {
-			PangoAttribute *attr;
 			Link *link;
 
 			link = (Link *) l->data;
Index: src/htmltextarea.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/htmltextarea.c,v
retrieving revision 1.15
diff -u -p -r1.15 htmltextarea.c
--- src/htmltextarea.c	17 Apr 2003 15:10:19 -0000	1.15
+++ src/htmltextarea.c	3 Dec 2005 13:58:07 -0000
@@ -137,12 +137,10 @@ html_textarea_init (HTMLTextArea *ta,
 {
 	GtkWidget *sw;
 	HTMLEmbedded *element;
-	HTMLObject *object;
 	PangoLayout *layout;
 	gint width, height;
 
 	element = HTML_EMBEDDED (ta);
-	object = HTML_OBJECT (ta);
 
 	html_embedded_init (element, HTML_EMBEDDED_CLASS (klass),
 			   parent, name, NULL);
Index: src/htmltextinput.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/htmltextinput.c,v
retrieving revision 1.24
diff -u -p -r1.24 htmltextinput.c
--- src/htmltextinput.c	17 Apr 2003 15:10:19 -0000	1.24
+++ src/htmltextinput.c	3 Dec 2005 13:58:07 -0000
@@ -176,11 +176,9 @@ html_text_input_init (HTMLTextInput *ti,
 		      gboolean password)
 {
 	HTMLEmbedded *element;
-	HTMLObject *object;
 	GtkWidget *entry;
 
 	element = HTML_EMBEDDED (ti);
-	object = HTML_OBJECT (ti);
 
 	html_embedded_init (element, HTML_EMBEDDED_CLASS (klass),
 			   parent, name, value);
Index: src/htmltextslave.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/htmltextslave.c,v
retrieving revision 1.193
diff -u -p -r1.193 htmltextslave.c
--- src/htmltextslave.c	3 May 2005 11:09:58 -0000	1.193
+++ src/htmltextslave.c	3 Dec 2005 13:58:07 -0000
@@ -63,7 +63,6 @@ split (HTMLTextSlave *slave, guint offse
 	HTMLObject *obj;
 	HTMLObject *new;
 
-	g_return_if_fail (offset >= 0);
 	g_return_if_fail (offset < slave->posLen);
 
 	obj = HTML_OBJECT (slave);
@@ -913,7 +912,6 @@ draw (HTMLObject *o,
 	HTMLTextSlave *slave;
 	HTMLText *owner;
 	GtkHTMLFontStyle font_style;
-	guint end;
 	GdkRectangle paint;
 
 	/* printf ("slave draw %p\n", o); */
@@ -925,7 +923,6 @@ draw (HTMLObject *o,
 	owner = slave->owner;
 	font_style = html_text_get_font_style (owner);
 
-	end = slave->posStart + slave->posLen;
 	draw_text (slave, p, font_style, x, y, width, height, tx, ty);
 	
 	if (HTML_OBJECT (owner)->draw_focused)
@@ -1110,11 +1107,9 @@ html_text_slave_init (HTMLTextSlave *sla
 		      guint posStart,
 		      guint posLen)
 {
-	HTMLText *owner_text;
 	HTMLObject *object;
 
 	object = HTML_OBJECT (slave);
-	owner_text = HTML_TEXT (owner);
 
 	html_object_init (object, HTML_OBJECT_CLASS (klass));
 
Index: src/test-stress.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/test-stress.c,v
retrieving revision 1.1
diff -u -p -r1.1 test-stress.c
--- src/test-stress.c	11 Mar 2005 15:10:46 -0000	1.1
+++ src/test-stress.c	3 Dec 2005 13:58:07 -0000
@@ -154,10 +154,7 @@ static int test_level_1 (GtkHTML *html)
 			/* delete text */
 			printf ("delete text\n");
 			html_cursor_jump_to_position (html->engine->cursor, html->engine, pos + len);
-			for (j = 0; j < len; j ++) {
-				char ch [2];
-				ch [0] = 'a' + (int) (26.0*rand()/(RAND_MAX+1.0));
-				ch [1] = 0;
+			for (j = 0; j < len; j++) {
 				gtk_html_command (html, "delete");
 			}
 			total_len -= len;
Index: src/testgtkhtml.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/testgtkhtml.c,v
retrieving revision 1.123
diff -u -p -r1.123 testgtkhtml.c
--- src/testgtkhtml.c	11 Sep 2005 04:05:25 -0000	1.123
+++ src/testgtkhtml.c	3 Dec 2005 13:58:07 -0000
@@ -112,8 +112,6 @@ static HTMLURL *baseURL = NULL;
 static GList *go_list;
 static int go_position;
 
-static gboolean use_redirect_filter;
-
 static gboolean slow_loading = FALSE;
 
 static gint redirect_timerId = 0;
@@ -843,8 +841,6 @@ goto_url(const char *url, int back_or_fo
 	}
 
 	/* TODO2 gnome_animator_start (GNOME_ANIMATOR (animator)); */
-
-	use_redirect_filter = TRUE;
 
 	html_stream_handle = gtk_html_begin_content (html, "text/html; charset=utf-8");
 
