GNOME.org
 

[evolution-patches] Patch to clean up warnings from sparse in gtkhtml

Patch attached.

Cheers
Kjartan


? autom4te.cache
? depcomp
? warnings
Index: components/html-editor/editor-control-factory.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/editor-control-factory.c,v
retrieving revision 1.143
diff -u -p -r1.143 editor-control-factory.c
--- components/html-editor/editor-control-factory.c	4 Jun 2004 15:10:55 -0000	1.143
+++ components/html-editor/editor-control-factory.c	29 Sep 2004 20:49:08 -0000
@@ -788,7 +788,7 @@ editor_api_create_input_line (GtkHTML *h
 }
 
 static void
-new_editor_api ()
+new_editor_api (void)
 {
 	editor_api = g_new (GtkHTMLEditorAPI, 1);
 
Index: components/html-editor/htmlsourceview.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/htmlsourceview.c,v
retrieving revision 1.7
diff -u -p -r1.7 htmlsourceview.c
--- components/html-editor/htmlsourceview.c	12 May 2003 20:46:48 -0000	1.7
+++ components/html-editor/htmlsourceview.c	29 Sep 2004 20:49:08 -0000
@@ -238,7 +238,7 @@ html_source_view_class_init (HTMLSourceV
 }
 
 GtkType
-html_source_view_get_type ()
+html_source_view_get_type (void)
 {
 	static GType view_type = 0;
 	
Index: components/html-editor/menubar.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/menubar.c,v
retrieving revision 1.105.2.1
diff -u -p -r1.105.2.1 menubar.c
--- components/html-editor/menubar.c	20 Sep 2004 16:15:14 -0000	1.105.2.1
+++ components/html-editor/menubar.c	29 Sep 2004 20:49:08 -0000
@@ -519,7 +519,7 @@ static struct {
 	{"style-itemroman", "HeadingRomanList"},
 	{"style-itemdigit", "HeadingNumberedList"},
 	{"style-itemalpha", "HeadingAlphabeticalList"},
-	{0, NULL}
+	{NULL, NULL}
 };
 
 static struct {
Index: components/html-editor/popup.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/popup.c,v
retrieving revision 1.84
diff -u -p -r1.84 popup.c
--- components/html-editor/popup.c	25 Jun 2004 15:59:51 -0000	1.84
+++ components/html-editor/popup.c	29 Sep 2004 20:49:08 -0000
@@ -37,6 +37,7 @@
 #include "htmlengine-edit-cut-and-paste.h"
 #include "htmlengine-edit-table.h"
 #include "htmlengine-edit-tablecell.h"
+#include "htmlengine-edit-text.h"
 #include "htmlimage.h"
 #include "htmlselection.h"
 #include "htmltable.h"
Index: components/html-editor/spell.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/spell.c,v
retrieving revision 1.43
diff -u -p -r1.43 spell.c
--- components/html-editor/spell.c	8 Dec 2003 18:36:54 -0000	1.43
+++ components/html-editor/spell.c	29 Sep 2004 20:49:08 -0000
@@ -235,7 +235,7 @@ ignore_cb (BonoboListener *listener, con
 }
 
 gboolean
-spell_has_control ()
+spell_has_control (void)
 {
 	GtkWidget *control;
 	gboolean rv;
Index: src/gtkhtml-embedded.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/gtkhtml-embedded.c,v
retrieving revision 1.13
diff -u -p -r1.13 gtkhtml-embedded.c
--- src/gtkhtml-embedded.c	5 Nov 2002 19:39:01 -0000	1.13
+++ src/gtkhtml-embedded.c	29 Sep 2004 20:49:08 -0000
@@ -85,7 +85,7 @@ gtk_html_embedded_finalize (GObject *obj
 {
 	GtkHTMLEmbedded *eb = GTK_HTML_EMBEDDED(object);
 
-	g_hash_table_foreach (eb->params, free_param, 0);
+	g_hash_table_foreach (eb->params, free_param, NULL);
 	g_hash_table_destroy (eb->params);
 	g_free(eb->classid);
 	g_free(eb->type);
Index: src/gtkhtml-properties.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/gtkhtml-properties.c,v
retrieving revision 1.97
diff -u -p -r1.97 gtkhtml-properties.c
--- src/gtkhtml-properties.c	22 Mar 2004 18:32:07 -0000	1.97
+++ src/gtkhtml-properties.c	29 Sep 2004 20:49:08 -0000
@@ -36,7 +36,7 @@ Boston, MA 02111-1307, USA.
 
 /* this function is reworked gal:e-iconv.c:e_iconv_locale_language */
 static gchar *
-get_locale_language ()
+get_locale_language (void)
 {
 	gchar *locale;
 	gchar *locale_language = NULL;
@@ -76,7 +76,8 @@ get_locale_language ()
 		} else {
 			/* invalid language */
 			g_free (lang);
-		}
+		}60
+
 	}
 
 	return locale_language;
@@ -142,7 +143,7 @@ static GEnumValue _gtk_html_cursor_skip_
 };
 
 GType
-gtk_html_cursor_skip_get_type ()
+gtk_html_cursor_skip_get_type (void)
 {
 	static GType cursor_skip_type = 0;
 
@@ -307,7 +308,7 @@ static GEnumValue _gtk_html_command_valu
 };
 
 GType
-gtk_html_command_get_type ()
+gtk_html_command_get_type (void)
 {
 	static GType command_type = 0;
 
Index: src/htmlclue.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/htmlclue.c,v
retrieving revision 1.106
diff -u -p -r1.106 htmlclue.c
--- src/htmlclue.c	1 Jun 2004 15:24:45 -0000	1.106
+++ src/htmlclue.c	29 Sep 2004 20:49:08 -0000
@@ -391,7 +391,7 @@ find_anchor (HTMLObject *self, const cha
 	*x -= self->x;
 	*y -= self->y - self->ascent;
 
-	return 0;
+	return NULL;
 }
 
 static HTMLObject*
Index: src/htmlclueflow.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/htmlclueflow.c,v
retrieving revision 1.308.4.1
diff -u -p -r1.308.4.1 htmlclueflow.c
--- src/htmlclueflow.c	28 Sep 2004 20:04:30 -0000	1.308.4.1
+++ src/htmlclueflow.c	29 Sep 2004 20:49:09 -0000
@@ -55,7 +55,7 @@ static HTMLClueClass *parent_class = NUL
 
 #define HCF_CLASS(x) HTML_CLUEFLOW_CLASS (HTML_OBJECT (x)->klass)
 
-inline HTMLHAlignType html_clueflow_get_halignment          (HTMLClueFlow *flow);
+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);
Index: src/htmlcluev.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/htmlcluev.c,v
retrieving revision 1.77
diff -u -p -r1.77 htmlcluev.c
--- src/htmlcluev.c	4 Jun 2004 15:05:48 -0000	1.77
+++ src/htmlcluev.c	29 Sep 2004 20:49:09 -0000
@@ -40,7 +40,7 @@ remove_aligned_by_parent ( HTMLClueV *cl
     HTMLClueAligned *tmp;
 	HTMLObject *obj;
 
-    tmp = 0;
+    tmp = NULL;
     obj = cluev->align_left_list;
 
     while ( obj ) {
@@ -51,7 +51,7 @@ remove_aligned_by_parent ( HTMLClueV *cl
 			} else {
 				cluev->align_left_list
 					= HTML_OBJECT (HTML_CLUEALIGNED (obj)->next_aligned);
-				tmp = 0;
+				tmp = NULL;
 			}
 		} else {
 			tmp = HTML_CLUEALIGNED (obj);
@@ -60,7 +60,7 @@ remove_aligned_by_parent ( HTMLClueV *cl
 		obj = HTML_OBJECT (HTML_CLUEALIGNED (obj)->next_aligned);
     }
 
-    tmp = 0;
+    tmp = NULL;
     obj = cluev->align_right_list;
 
     while ( obj ) {
@@ -71,7 +71,7 @@ remove_aligned_by_parent ( HTMLClueV *cl
 			} else {
 				cluev->align_right_list
 					= HTML_OBJECT (HTML_CLUEALIGNED (obj)->next_aligned);
-				tmp = 0;
+				tmp = NULL;
 			}
 		} else {
 			tmp = HTML_CLUEALIGNED (obj);
@@ -497,7 +497,7 @@ relayout (HTMLObject *self,
 
 	if (child == NULL)
 		child = HTML_CLUE (self)->head;
-	html_object_calc_size (child, engine->painter, FALSE);
+	html_object_calc_size (child, engine->painter, NULL);
 
 	HTML_CLUE (self)->curr = NULL;
 
@@ -505,7 +505,7 @@ relayout (HTMLObject *self,
 	prev_ascent = self->ascent;
 	prev_descent = self->descent;
 
-	changed = html_cluev_do_layout (self, engine->painter, FALSE, FALSE);
+	changed = html_cluev_do_layout (self, engine->painter, FALSE, NULL);
 	if (changed)
 		html_engine_queue_draw (engine, self);
 
@@ -872,10 +872,10 @@ html_cluev_init (HTMLClueV *cluev,
 
 	clue->valign = HTML_VALIGN_BOTTOM;
 	clue->halign = HTML_HALIGN_LEFT;
-	clue->head = clue->tail = clue->curr = 0;
+	clue->head = clue->tail = clue->curr = NULL;
 
-	cluev->align_left_list = 0;
-	cluev->align_right_list = 0;
+	cluev->align_left_list = NULL;
+	cluev->align_right_list = NULL;
 	cluev->padding = 0;
 }
 
Index: src/htmlembedded.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/htmlembedded.c,v
retrieving revision 1.53
diff -u -p -r1.53 htmlembedded.c
--- src/htmlembedded.c	12 Aug 2004 13:40:56 -0000	1.53
+++ src/htmlembedded.c	29 Sep 2004 20:49:09 -0000
@@ -350,7 +350,7 @@ html_embedded_object_changed (GtkHTMLEmb
 
 	object = HTML_OBJECT (g_object_get_data (G_OBJECT (eb), "embeddedelement"));
 	if (object)
-		html_object_calc_size (object, e->painter, FALSE);
+		html_object_calc_size (object, e->painter, NULL);
 	
 	html_engine_schedule_update(e);
 }
Index: src/htmlengine.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/htmlengine.c,v
retrieving revision 1.618
diff -u -p -r1.618 htmlengine.c
--- src/htmlengine.c	27 Aug 2004 12:59:50 -0000	1.618
+++ src/htmlengine.c	29 Sep 2004 20:49:10 -0000
@@ -922,7 +922,7 @@ html_element_push (HTMLElement *node, HT
 		/* close anon p elements */
 		pop_element (e, ID_P);
 		html_stack_push (e->span_stack, node);
-#if TESTING
+#ifdef TESTING
 		if (node->style->bg_color) {
 			HTMLTableCell *cell;
 			cell = html_table_cell_new (1, 1, 0);
@@ -1373,7 +1373,7 @@ discard_body (HTMLEngine *p, const gchar
 		}
 	}
 
-	return 0;
+	return NULL;
 }
 
 static gboolean
@@ -1463,7 +1463,7 @@ element_parse_object (HTMLEngine *e, HTM
 	char *data    = NULL;
 	char *value   = NULL;
 	int width=-1,height=-1;
-	static const gchar *end[] = { "</object", 0};
+	static const gchar *end[] = { "</object", NULL};
 	GtkHTMLEmbedded *eb;
 	HTMLEmbedded *el;
 	gboolean object_found;
@@ -1607,7 +1607,7 @@ element_parse_iframe (HTMLEngine *e, HTM
 	char *value = NULL;
 	char *src   = NULL;
 	HTMLObject *iframe;
-	static const gchar *end[] = { "</iframe", 0};
+	static const gchar *end[] = { "</iframe", NULL};
 	gint width           = -1;
 	gint height          = -1;
 	gint border          = TRUE;
@@ -2448,7 +2448,7 @@ static void
 element_parse_img (HTMLEngine *e, HTMLObject *clue, const gchar *str)
 {
 	HTMLElement *element;
-	HTMLObject *image = 0;
+	HTMLObject *image = NULL;
 	HTMLHAlignType align = HTML_HALIGN_NONE;
 	HTMLVAlignType valign = HTML_VALIGN_NONE;
 	HTMLColor *color = NULL;
@@ -3188,7 +3188,7 @@ element_parse_caption (HTMLEngine *e, HT
 	
 	caption = HTML_CLUEV (html_cluev_new (0, 0, 100));
 	
-	e->flow = 0;
+	e->flow = NULL;
 	
 	style = html_style_add_text_align (style, HTML_HALIGN_CENTER);
 	
@@ -4429,7 +4429,7 @@ html_engine_update_event (HTMLEngine *e)
 
 	if (html_engine_get_editable (e))
 		html_engine_hide_cursor (e);
-	html_engine_calc_size (e, FALSE);
+	html_engine_calc_size (e, NULL);
 
 	if (GTK_LAYOUT (e->widget)->vadjustment == NULL
 	    || ! html_gdk_painter_realized (HTML_GDK_PAINTER (e->painter))) {
@@ -6439,7 +6439,7 @@ html_engine_refresh_fonts (HTMLEngine *e
 	if (e->clue) {
 		html_object_forall (e->clue, e, calc_font_size, NULL);
 		html_object_change_set_down (e->clue, HTML_CHANGE_ALL);
-		html_engine_calc_size (e, FALSE);
+		html_engine_calc_size (e, NULL);
 		html_engine_schedule_update (e);
 	}
 }
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	29 Sep 2004 20:49:10 -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/htmlobject.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/htmlobject.c,v
retrieving revision 1.178
diff -u -p -r1.178 htmlobject.c
--- src/htmlobject.c	17 Jun 2004 14:47:19 -0000	1.178
+++ src/htmlobject.c	29 Sep 2004 20:49:10 -0000
@@ -231,14 +231,14 @@ html_object_real_calc_size (HTMLObject *
 static gint
 calc_min_width (HTMLObject *o, HTMLPainter *painter)
 {
-	html_object_calc_size (o, painter, FALSE);
+	html_object_calc_size (o, painter, NULL);
 	return o->width;
 }
 
 static gint
 calc_preferred_width (HTMLObject *o, HTMLPainter *painter)
 {
-	html_object_calc_size (o, painter, FALSE);
+	html_object_calc_size (o, painter, NULL);
 	return o->width;
 }
 	
@@ -373,7 +373,7 @@ relayout (HTMLObject *self,
 		self->y -= prev_ascent + prev_descent;
 	}
 
-	changed = html_object_calc_size (self, engine->painter, FALSE);
+	changed = html_object_calc_size (self, engine->painter, NULL);
 
 	if (prev_width == self->width
 	    && prev_ascent == self->ascent
Index: src/htmlprinter.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/htmlprinter.c,v
retrieving revision 1.77.4.1
diff -u -p -r1.77.4.1 htmlprinter.c
--- src/htmlprinter.c	20 Sep 2004 16:18:00 -0000	1.77.4.1
+++ src/htmlprinter.c	29 Sep 2004 20:49:10 -0000
@@ -795,7 +795,7 @@ draw_embedded (HTMLPainter *p, HTMLEmbed
  
 	embedded_widget = html_embedded_get_widget(o);
 	if (embedded_widget && GTK_IS_HTML_EMBEDDED (embedded_widget)) {
-		g_signal_emit_by_name(GTK_OBJECT (embedded_widget), 0,
+		g_signal_emit_by_name(GTK_OBJECT (embedded_widget), NULL,
 				      "draw_print", 
 				      printer->context);
 	}
Index: src/htmlstringtokenizer.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/htmlstringtokenizer.c,v
retrieving revision 1.3
diff -u -p -r1.3 htmlstringtokenizer.c
--- src/htmlstringtokenizer.c	13 Dec 2000 23:10:51 -0000	1.3
+++ src/htmlstringtokenizer.c	29 Sep 2004 20:49:10 -0000
@@ -74,7 +74,7 @@ html_string_tokenizer_tokenize (HTMLStri
 	gint str_length;
 
 	if (*str == '\0') {
-		t->pos = 0;
+		t->pos = NULL;
 		return;
 	}
 	
Index: src/htmltable.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/htmltable.c,v
retrieving revision 1.179.2.1
diff -u -p -r1.179.2.1 htmltable.c
--- src/htmltable.c	16 Sep 2004 17:23:06 -0000	1.179.2.1
+++ src/htmltable.c	29 Sep 2004 20:49:11 -0000
@@ -1813,7 +1813,7 @@ find_anchor (HTMLObject *self, const cha
 	*x -= self->x;
 	*y -= self->y - self->ascent;
 
-	return 0;
+	return NULL;
 }
 
 
Index: src/htmltablecell.h
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/htmltablecell.h,v
retrieving revision 1.29
diff -u -p -r1.29 htmltablecell.h
--- src/htmltablecell.h	18 Mar 2004 20:06:32 -0000	1.29
+++ src/htmltablecell.h	29 Sep 2004 20:49:11 -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/htmltype.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/htmltype.c,v
retrieving revision 1.22
diff -u -p -r1.22 htmltype.c
--- src/htmltype.c	16 Sep 2003 21:05:40 -0000	1.22
+++ src/htmltype.c	29 Sep 2004 20:49:11 -0000
@@ -57,7 +57,7 @@ static gboolean types_inited = FALSE;
 static GHashTable *type_names = NULL;
 
 static void
-build_type_names_table ()
+build_type_names_table (void)
 {
 	HTMLType t;
 
Index: src/htmlurl.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/htmlurl.c,v
retrieving revision 1.16
diff -u -p -r1.16 htmlurl.c
--- src/htmlurl.c	21 May 2003 03:43:12 -0000	1.16
+++ src/htmlurl.c	29 Sep 2004 20:49:11 -0000
@@ -303,7 +303,7 @@ html_url_set_port (HTMLURL *url, gushort
 const gchar *					\
 html_url_get_##member (const HTMLURL *url)	\
 {						\
-	g_return_val_if_fail (url != NULL, 0);	\
+	g_return_val_if_fail (url != NULL, NULL);	\
 						\
 	return url->member;			\
 }
Index: src/testgtkhtml.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/testgtkhtml.c,v
retrieving revision 1.120
diff -u -p -r1.120 testgtkhtml.c
--- src/testgtkhtml.c	4 Jun 2004 15:05:48 -0000	1.120
+++ src/testgtkhtml.c	29 Sep 2004 20:49:11 -0000
@@ -123,44 +123,44 @@ static GnomeUIInfo file_menu [] = {
 
 static GnomeUIInfo test_menu[] = {
 	{ GNOME_APP_UI_ITEM, "Test 1", "Run test 1",
-	  test_cb, GINT_TO_POINTER (1), NULL, 0, 0, 0, 0},
+	  test_cb, GINT_TO_POINTER (1), NULL, 0, NULL, 0, 0},
 	{ GNOME_APP_UI_ITEM, "Test 2", "Run test 2",
-	  test_cb, GINT_TO_POINTER (2), NULL, 0, 0, 0, 0},
+	  test_cb, GINT_TO_POINTER (2), NULL, 0, NULL, 0, 0},
 	{ GNOME_APP_UI_ITEM, "Test 3", "Run test 3",
-	  test_cb, GINT_TO_POINTER (3), NULL, 0, 0, 0, 0},
+	  test_cb, GINT_TO_POINTER (3), NULL, 0, NULL, 0, 0},
 	{ GNOME_APP_UI_ITEM, "Test 4", "Run test 4",
-	  test_cb, GINT_TO_POINTER (4), NULL, 0, 0, 0, 0},
+	  test_cb, GINT_TO_POINTER (4), NULL, 0, NULL, 0, 0},
 	{ GNOME_APP_UI_ITEM, "Test 5", "Run test 5",
-	  test_cb, GINT_TO_POINTER (5), NULL, 0, 0, 0, 0},
+	  test_cb, GINT_TO_POINTER (5), NULL, 0, NULL, 0, 0},
 	{ GNOME_APP_UI_ITEM, "Test 6", "Run test 6",
-	  test_cb, GINT_TO_POINTER (6), NULL, 0, 0, 0, 0},
+	  test_cb, GINT_TO_POINTER (6), NULL, 0, NULL, 0, 0},
 	{ GNOME_APP_UI_ITEM, "Test 7", "Run test 7 (FreshMeat)",
-	  test_cb, GINT_TO_POINTER (7), NULL, 0, 0, 0, 0},
+	  test_cb, GINT_TO_POINTER (7), NULL, 0, NULL, 0, 0},
 	{ GNOME_APP_UI_ITEM, "Test 8", "Run test 8 (local test)",
-	  test_cb, GINT_TO_POINTER (8), NULL, 0, 0, 0, 0},
+	  test_cb, GINT_TO_POINTER (8), NULL, 0, NULL, 0, 0},
 	{ GNOME_APP_UI_ITEM, "Test 9", "Run test 9 (Form Test)",
-	  test_cb, GINT_TO_POINTER (9), NULL, 0, 0, 0, 0},
+	  test_cb, GINT_TO_POINTER (9), NULL, 0, NULL, 0, 0},
 	{ GNOME_APP_UI_ITEM, "Test 10", "Run test 10 (Object Test)",
-	  test_cb, GINT_TO_POINTER (10), NULL, 0, 0, 0, 0},
+	  test_cb, GINT_TO_POINTER (10), NULL, 0, NULL, 0, 0},
 	{ GNOME_APP_UI_ITEM, "Test 11", "Run test 11 (Nowrap)",
-	  test_cb, GINT_TO_POINTER (11), NULL, 0, 0, 0, 0},
+	  test_cb, GINT_TO_POINTER (11), NULL, 0, NULL, 0, 0},
 	GNOMEUIINFO_END
 };
 
 static GnomeUIInfo debug_menu[] = {
 	{ GNOME_APP_UI_ITEM, "Show bug list", "Show the layout bug list",
-	  bug_cb, NULL, NULL, 0, 0, 0, 0},
+	  bug_cb, NULL, NULL, 0, NULL, 0, 0},
 	{ GNOME_APP_UI_ITEM, "Dump Object tree", "Dump Object tree to stdout",
-	  dump_cb, NULL, NULL, 0, 0, 0, 0},
+	  dump_cb, NULL, NULL, 0, NULL, 0, 0},
 	{ GNOME_APP_UI_ITEM, "Dump Object tree (simple)", "Dump Simple Object tree to stdout",
-	  dump_simple_cb, NULL, NULL, 0, 0, 0, 0},
+	  dump_simple_cb, NULL, NULL, 0, NULL, 0, 0},
 	GNOMEUIINFO_TOGGLEITEM("Slow loading", "Load documents slowly", slow_cb, NULL),
 	{ GNOME_APP_UI_ITEM, "Force resize", "Force a resize event",
-	  resize_cb, NULL, NULL, 0, 0, 0 },
+	  resize_cb, NULL, NULL, 0, NULL, 0 },
 	{ GNOME_APP_UI_ITEM, "Force repaint", "Force a repaint event",
-	  redraw_cb, NULL, NULL, 0, 0, 0 },
+	  redraw_cb, NULL, NULL, 0, NULL, 0 },
 	{ GNOME_APP_UI_ITEM, "Select all", "Select all",
-	  select_all_cb, NULL, NULL, 0, 0, 0 },
+	  select_all_cb, NULL, NULL, 0, NULL, 0 },
 	GNOMEUIINFO_TOGGLEITEM ("Disable Animations", "Disable Animated Images",  animate_cb, NULL),
 	 
 	GNOMEUIINFO_END
@@ -168,11 +168,11 @@ static GnomeUIInfo debug_menu[] = {
 
 static GnomeUIInfo go_menu[] = {
 	{ GNOME_APP_UI_ITEM, "Back", "Return to the previous page in history list",
-	  back_cb, NULL, NULL, 0, 0, 0, 0},
+	  back_cb, NULL, NULL, 0, NULL, 0, 0},
 	{ GNOME_APP_UI_ITEM, "Forward", "Go to the next page in history list", 
-	  forward_cb, NULL, NULL, 0, 0, 0, 0},
+	  forward_cb, NULL, NULL, 0, NULL, 0, 0},
 	{ GNOME_APP_UI_ITEM, "Home", "Go to the homepage",
-	  home_cb, NULL, NULL, 0, 0, 0 },
+	  home_cb, NULL, NULL, 0, NULL, 0 },
 	GNOMEUIINFO_SEPARATOR,
 	GNOMEUIINFO_END
 };
@@ -357,7 +357,7 @@ static void
 resize_cb (GtkWidget *widget, gpointer data)
 {
 	g_print ("forcing resize\n");
-	html_engine_calc_size (html->engine, FALSE);
+	html_engine_calc_size (html->engine, NULL);
 }
 
 static void
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]