[evolution-patches] gtkhtml warnings and amd64 build

[Not Zed <notzed ximian com>]

Mostly warnings, but a very very old patch i've had around which i
needed at some point to get it to build on an amd64 system, which needs
the libraries in a lib64 directory.

-- 
adfa(evolution-2.4:20087): gtkhtml-WARNING **: cannot find icon:
'stock_insert-url' in gnome 

Index: components/html-editor/ChangeLog
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/ChangeLog,v
retrieving revision 1.507
diff -u -p -r1.507 ChangeLog
--- components/html-editor/ChangeLog	17 Aug 2005 07:29:44 -0000	1.507
+++ components/html-editor/ChangeLog	23 Aug 2005 03:50:48 -0000
@@ -1,3 +1,15 @@
+2005-08-23  Not Zed  <NotZed Ximian com>
+
+	* gi-colors.c: undefine GDK_DISABLE_DEPRECATED if set, we need it.
+
+	* table.c (changed_cols, changed_rows): add missing casts.
+
+	* replace.c (gtk_html_replace_dialog_new): cast warnings.
+
+	* popup.c: include missing header.
+
+	* engine.c (editor_engine_new): cast away warning.
+
 2005-08-17  Kaushal Kumar  <kakumar novell com>
 
 	* utils.c (url_requested): Added the missing close call for fd.
Index: components/html-editor/engine.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/engine.c,v
retrieving revision 1.27
diff -u -p -r1.27 engine.c
--- components/html-editor/engine.c	3 Jun 2005 04:16:04 -0000	1.27
+++ components/html-editor/engine.c	23 Aug 2005 03:50:48 -0000
@@ -292,7 +292,7 @@ editor_engine_new (GtkHTMLControlData *c
 	 * provide DnD to the composer window's GtkHTML component
 	 */
 
-	g_object_set_data (ee, "html-widget", cd->html);
+	g_object_set_data ((GObject *)ee, "html-widget", cd->html);
 	
 	return ee;
 }
Index: components/html-editor/gi-colors.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/gi-colors.c,v
retrieving revision 1.2
diff -u -p -r1.2 gi-colors.c
--- components/html-editor/gi-colors.c	4 Jun 2004 15:10:55 -0000	1.2
+++ components/html-editor/gi-colors.c	23 Aug 2005 03:50:48 -0000
@@ -26,6 +26,12 @@
  */
 
 #include <config.h>
+
+/* gdk_rgb_xpixel_from_rgb is deprecated */
+#ifdef GDK_DISABLE_DEPRECATED
+#undef GDK_DISABLE_DEPRECATED
+#endif
+
 #include <gdk/gdkrgb.h>
 #include <gtk/gtkwidget.h>
 #include "gi-colors.h"
Index: components/html-editor/popup.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/popup.c,v
retrieving revision 1.87
diff -u -p -r1.87 popup.c
--- components/html-editor/popup.c	17 May 2005 14:48:59 -0000	1.87
+++ components/html-editor/popup.c	23 Aug 2005 03:50:48 -0000
@@ -38,6 +38,7 @@
 #include "htmlengine.h"
 #include "htmltext.h"
 #include "htmlengine-edit.h"
+#include "htmlengine-edit-text.h"
 #include "htmlengine-edit-cut-and-paste.h"
 #include "htmlengine-edit-table.h"
 #include "htmlengine-edit-tablecell.h"
Index: components/html-editor/replace.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/replace.c,v
retrieving revision 1.25
diff -u -p -r1.25 replace.c
--- components/html-editor/replace.c	17 May 2005 14:48:59 -0000	1.25
+++ components/html-editor/replace.c	23 Aug 2005 03:50:48 -0000
@@ -184,11 +184,11 @@ gtk_html_replace_dialog_new (GtkHTML *ht
 
 	gtk_table_set_col_spacings (GTK_TABLE (table), 3);
 	label = gtk_label_new_with_mnemonic (_("R_eplace:"));
-	gtk_label_set_mnemonic_widget (label,dialog-> entry_search);
+	gtk_label_set_mnemonic_widget ((GtkLabel *)label,dialog-> entry_search);
 	gtk_misc_set_alignment (GTK_MISC (label), .0, .5);
 	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
 	label = gtk_label_new_with_mnemonic (_("_With:"));
-	gtk_label_set_mnemonic_widget (label, dialog->entry_replace);
+	gtk_label_set_mnemonic_widget ((GtkLabel *)label, dialog->entry_replace);
 	gtk_misc_set_alignment (GTK_MISC (label), .0, .5);
 	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
 
Index: components/html-editor/table.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/table.c,v
retrieving revision 1.51
diff -u -p -r1.51 table.c
--- components/html-editor/table.c	17 May 2005 14:48:59 -0000	1.51
+++ components/html-editor/table.c	23 Aug 2005 03:50:48 -0000
@@ -193,7 +193,7 @@ changed_cols (GtkWidget *w, GtkHTMLEditT
 	if (d->disable_change || !editor_has_html_object (d->cd, HTML_OBJECT (d->table)))
 		return;
 
-	html_cursor_jump_to (d->cd->html->engine->cursor, d->cd->html->engine, d->table, 1);
+	html_cursor_jump_to (d->cd->html->engine->cursor, d->cd->html->engine, (HTMLObject *)d->table, 1);
 	html_cursor_backward (d->cd->html->engine->cursor, d->cd->html->engine);
 	html_engine_table_set_cols (d->cd->html->engine, gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (d->spin_cols)));
 }
@@ -204,7 +204,7 @@ changed_rows (GtkWidget *w, GtkHTMLEditT
 	if (d->disable_change || !editor_has_html_object (d->cd, HTML_OBJECT (d->table)))
 		return;
 
-	html_cursor_jump_to (d->cd->html->engine->cursor, d->cd->html->engine, d->table, 1);
+	html_cursor_jump_to (d->cd->html->engine->cursor, d->cd->html->engine, (HTMLObject *)d->table, 1);
 	html_cursor_backward (d->cd->html->engine->cursor, d->cd->html->engine);
 	html_engine_table_set_rows (d->cd->html->engine, gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (d->spin_rows)));
 }
Index: src/ChangeLog
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/ChangeLog,v
retrieving revision 1.2146
diff -u -p -r1.2146 ChangeLog
--- src/ChangeLog	22 Aug 2005 14:01:16 -0000	1.2146
+++ src/ChangeLog	23 Aug 2005 03:50:55 -0000
@@ -1,3 +1,15 @@
+2005-08-23  Not Zed  <NotZed Ximian com>
+
+	* test-suite.c (plain_save_receiver): use right type for len.
+
+	* gtkhtml.c (drag_data_get): use right type for g_convert.
+
+2005-01-11  Not Zed  <NotZed Ximian com>
+
+	* Makefile.am: put the version in pkgconfig_DATA and remove the
+	install-data-hook.  This was breaking on amd64 systems with a
+	different libdir.
+
 2005-08-22  David Malcolm  <dmalcolm redhat com>
 
 	* gtkhtml.c (gtk_html_im_retrieve_surrounding_cb): Remove assumption
Index: src/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/Makefile.am,v
retrieving revision 1.158
diff -u -p -r1.158 Makefile.am
--- src/Makefile.am	22 Aug 2005 02:15:02 -0000	1.158
+++ src/Makefile.am	23 Aug 2005 03:50:55 -0000
@@ -234,6 +234,9 @@ gtest_LDFLAGS =
 gtest_LDADD =	\
 	libgtkhtml- GTKHTML_API_VERSION@.la
 
+%- GTKHTML_API_VERSION@.pc: %.pc
+	 cp $< $@
+
 test_suite_SOURCES = \
 	test-suite.c
 test_suite_LDFLAGS =
@@ -248,7 +251,7 @@ test_stress_LDADD =	\
 
 pkgconfig_in_files = libgtkhtml.pc.in
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = $(pkgconfig_in_files:.pc.in=.pc)
+pkgconfig_DATA = $(pkgconfig_in_files: pc in=- GTKHTML_API_VERSION@.pc)
 
 keybindingsdir = $(datadir)/gtkhtml- GTKHTML_API_VERSION@
 keybindings_DATA =		\
@@ -258,12 +261,6 @@ EXTRA_DIST =			\
 	htmlclosures.list	\
 	$(keybindings_DATA)	\
 	$(NULL)
-
-install-data-hook:
-	mv $(DESTDIR)$(libdir)/pkgconfig/libgtkhtml.pc $(DESTDIR)$(libdir)/pkgconfig/libgtkhtml- GTKHTML_API_VERSION@.pc
-
-uninstall-hook:
-	rm -f $(DESTDIR)$(libdir)/pkgconfig/libgtkhtml- GTKHTML_API_VERSION@.pc	
 
 htmlmarshal.h:	htmlclosures.list
 	glib-genmarshal --header --prefix=html_g_cclosure_marshal $< > $@
Index: src/gtkhtml.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/gtkhtml.c,v
retrieving revision 1.608
diff -u -p -r1.608 gtkhtml.c
--- src/gtkhtml.c	22 Aug 2005 14:01:16 -0000	1.608
+++ src/gtkhtml.c	23 Aug 2005 03:50:56 -0000
@@ -2510,7 +2510,7 @@ drag_data_get (GtkWidget *widget, GdkDra
 					 */
 					char *ucs2;
 					char *utf8;
-					int written_len;
+					gsize written_len;
 
 					if (HTML_IS_TEXT (obj)) {
 						Link *link = html_text_get_link_at_offset (HTML_TEXT (obj), offset);
Index: src/test-suite.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/src/test-suite.c,v
retrieving revision 1.15
diff -u -p -r1.15 test-suite.c
--- src/test-suite.c	31 Mar 2005 12:44:42 -0000	1.15
+++ src/test-suite.c	23 Aug 2005 03:50:57 -0000
@@ -78,7 +78,7 @@ static void load_editable (GtkHTML *html
 }
 
 static gboolean
-plain_save_receiver (gpointer engine, const char *data, unsigned int len, gpointer user_data)
+plain_save_receiver (gpointer engine, const char *data, size_t len, gpointer user_data)
 {
 	GString *str = (GString *) user_data;