Fix signedness difference warnings with gcc 3.5. Patch by Jon Oberheide.

2004-07-31  Christian Persch  <chpe@cvs.gnome.org>

	* src/bookmarks/ephy-bookmark-action.c: (drag_data_get_cb):
	* src/bookmarks/ephy-bookmarks-export.c: (write_topics_list),
	(ephy_bookmarks_export_rdf):
	* src/bookmarks/ephy-bookmarks-import.c: (xbel_parse_bookmark),
	(xbel_parse_folder), (xbel_parse_xbel), (parse_rdf_subjects),
	(parse_rdf_item), (ephy_bookmarks_import_rdf):
	* src/bookmarks/ephy-bookmarks.c: (ephy_bookmarks_save),
	(ephy_bookmarks_init):
	* src/bookmarks/ephy-bookmarksbar-model.c:
	(ephy_bookmarksbar_model_get_node):
	* src/bookmarks/ephy-topic-action.c: (drag_data_get_cb):
	* src/ephy-session.c: (write_tab), (write_window_geometry),
	(write_tool_window), (write_ephy_window), (ephy_session_save),
	(parse_embed), (ephy_session_load):

	Fix signedness difference warnings with gcc 3.5. Patch by Jon Oberheide.

7 files changed, 147 insertions, 91 deletions

diff --git a/src/bookmarks/ephy-bookmark-action.c b/src/bookmarks/ephy-bookmark-action.c
index 2587aef15..101d9e07c 100644
--- a/src/bookmarks/ephy-bookmark-action.c
+++ b/src/bookmarks/ephy-bookmark-action.c
@@ -395,7 +395,7 @@ drag_data_get_cb (GtkWidget *widget, GdkDragContext *context,
 	g_return_if_fail (address != NULL);
 
 	gtk_selection_data_set (selection_data, selection_data->target, 8,
-				address, strlen (address));
+				(unsigned char *) address, strlen (address));
 }
 
 static int
diff --git a/src/bookmarks/ephy-bookmarks-export.c b/src/bookmarks/ephy-bookmarks-export.c
index cd3ae9ccd..a1fc2ac06 100644
--- a/src/bookmarks/ephy-bookmarks-export.c
+++ b/src/bookmarks/ephy-bookmarks-export.c
@@ -70,7 +70,11 @@ write_topics_list (EphyNode *topics,
 			(node, EPHY_NODE_KEYWORD_PROP_NAME);
 
 		ret = xmlTextWriterWriteElementNS
-			(writer, "dc", "subject", NULL, name);
+			(writer, 
+			 (xmlChar *) "dc",
+			 (xmlChar *) "subject",
+			 NULL,
+			 (xmlChar *) name);
 		if (ret < 0) break;
 	}
 
@@ -107,47 +111,75 @@ ephy_bookmarks_export_rdf (EphyBookmarks *bookmarks,
 	ret = xmlTextWriterSetIndent (writer, 1);
 	if (ret < 0) goto out;
 
-	ret = xmlTextWriterSetIndentString (writer, "  ");
+	ret = xmlTextWriterSetIndentString (writer, (xmlChar *) "  ");
 	if (ret < 0) goto out;
 	
 	ret = xmlTextWriterStartDocument (writer, "1.0", NULL, NULL);
 	if (ret < 0) goto out;
 
 	ret = xmlTextWriterStartElementNS
-		(writer, "rdf", "RDF", "http://www.w3.org/1999/02/22-rdf-syntax-ns#");
+		(writer,
+		 (xmlChar *) "rdf",
+		 (xmlChar *) "RDF",
+		 (xmlChar *) "http://www.w3.org/1999/02/22-rdf-syntax-ns#");
 	if (ret < 0) goto out;
 
-	ret = xmlTextWriterWriteAttribute (writer, "xmlns", "http://purl.org/rss/1.0/");
+	ret = xmlTextWriterWriteAttribute
+		(writer,
+		 (xmlChar *) "xmlns",
+		 (xmlChar *) "http://purl.org/rss/1.0/");
 	if (ret < 0) goto out;
 
 	ret = xmlTextWriterWriteAttributeNS
-		(writer, "xmlns", "dc", NULL, "http://purl.org/dc/elements/1.1/");
+		(writer, 
+		 (xmlChar *) "xmlns",
+		 (xmlChar *) "dc",
+		 NULL,
+		 (xmlChar *) "http://purl.org/dc/elements/1.1/");
 	if (ret < 0) goto out;
 
 	ret = xmlTextWriterWriteAttributeNS
-		(writer, "xmlns", "ephy", NULL, "http://gnome.org/ns/epiphany#");
+		(writer,
+		 (xmlChar *) "xmlns",
+		 (xmlChar *) "ephy",
+		 NULL,
+		 (xmlChar *) "http://gnome.org/ns/epiphany#");
 	if (ret < 0) goto out;
 
-	ret = xmlTextWriterStartElement (writer, "channel");
+	ret = xmlTextWriterStartElement (writer, (xmlChar *) "channel");
 	if (ret < 0) goto out;
 
 	/* FIXME is this UTF-8 ? */
 	file_uri = gnome_vfs_get_uri_from_local_path (filename);
-	ret = xmlTextWriterWriteAttributeNS (writer, "rdf", "about", NULL, file_uri);
+	ret = xmlTextWriterWriteAttributeNS
+		(writer,
+		 (xmlChar *) "rdf",
+		 (xmlChar *) "about",
+		 NULL,
+		 (xmlChar *) file_uri);
 	g_free (file_uri);
 	if (ret < 0) goto out;
 
-	ret = xmlTextWriterWriteElement (writer, "title", "Epiphany bookmarks");
+	ret = xmlTextWriterWriteElement 
+		(writer,
+		 (xmlChar *) "title",
+		 (xmlChar *) "Epiphany bookmarks");
 	if (ret < 0) goto out;
 
 	ret = xmlTextWriterWriteElement
-		(writer, "link", "http://www.gnome.org/projects/epiphany/");
+		(writer,
+		 (xmlChar *) "link",
+		 (xmlChar *) "http://www.gnome.org/projects/epiphany/");
 	if (ret < 0) goto out;
 
-	ret = xmlTextWriterStartElement (writer, "items");
+	ret = xmlTextWriterStartElement	(writer, (xmlChar *) "items");
 	if (ret < 0) goto out;
 
-	ret = xmlTextWriterStartElementNS (writer, "rdf", "Seq", NULL);
+	ret = xmlTextWriterStartElementNS
+		(writer,
+		 (xmlChar *) "rdf", 
+		 (xmlChar *) "Seq",
+		 NULL);
 	if (ret < 0) goto out;
 
 	bmks = ephy_bookmarks_get_bookmarks (bookmarks);
@@ -164,7 +196,11 @@ ephy_bookmarks_export_rdf (EphyBookmarks *bookmarks,
 
 		kid = g_ptr_array_index (children, i);
 
-		ret = xmlTextWriterStartElementNS (writer, "rdf", "li", NULL);
+		ret = xmlTextWriterStartElementNS
+			(writer,
+			 (xmlChar *) "rdf",
+			 (xmlChar *) "li",
+			 NULL);
 		if (ret < 0) break;
 
 		smart_url = ephy_node_has_child (smart_bmks, kid);
@@ -188,7 +224,11 @@ ephy_bookmarks_export_rdf (EphyBookmarks *bookmarks,
 		}
 
 		ret = xmlTextWriterWriteAttributeNS
-			(writer, "rdf", "resource", NULL, link ? link : url);
+			(writer,
+			 (xmlChar *) "rdf",
+			 (xmlChar *) "resource",
+			 NULL,
+			 (xmlChar *) (link ? link : url));
 		g_free (link);
 		if (ret < 0) break;
 
@@ -244,22 +284,37 @@ ephy_bookmarks_export_rdf (EphyBookmarks *bookmarks,
 			link = g_strdup (url);
 		}
 
-		ret = xmlTextWriterStartElement (writer, "item");
+		ret = xmlTextWriterStartElement (writer, (xmlChar *) "item");
 		if (ret < 0) break;
 
 		ret = xmlTextWriterWriteAttributeNS
-			(writer, "rdf", "about", NULL, link);
+			(writer,
+			 (xmlChar *) "rdf",
+			 (xmlChar *) "about",
+			 NULL,
+			 (xmlChar *) link);
 		if (ret < 0) break;
 
-		ret = xmlTextWriterWriteElement (writer, "title", title);
+		ret = xmlTextWriterWriteElement
+			(writer,
+			 (xmlChar *) "title",
+			 (xmlChar *) title);
 		if (ret < 0) break;
 
-		ret = xmlTextWriterWriteElement (writer, "link", link);
+		ret = xmlTextWriterWriteElement
+			(writer,
+			 (xmlChar *) "link",
+			 (xmlChar *) link);
 		if (ret < 0) break;
 
 		if (smart_url)
 		{
-			ret = xmlTextWriterWriteElementNS (writer, "ephy", "smartlink", NULL, url);
+			ret = xmlTextWriterWriteElementNS
+				(writer,
+				 (xmlChar *) "ephy",
+				 (xmlChar *) "smartlink",
+				 NULL,
+				 (xmlChar *) url);
 			if (ret < 0) break;
 		}
 
diff --git a/src/bookmarks/ephy-bookmarks-import.c b/src/bookmarks/ephy-bookmarks-import.c
index 85e010575..eed3774cf 100644
--- a/src/bookmarks/ephy-bookmarks-import.c
+++ b/src/bookmarks/ephy-bookmarks-import.c
@@ -145,7 +145,7 @@ xbel_parse_bookmark (EphyBookmarks *eb, xmlTextReaderPtr reader, EphyNode **ret_
 
 		type = xmlTextReaderNodeType (reader);
 
-		if (xmlStrEqual (tag, "#text"))
+		if (xmlStrEqual (tag, (xmlChar *) "#text"))
 		{
 			if (state == STATE_TITLE && title == NULL)
 			{
@@ -161,11 +161,11 @@ xbel_parse_bookmark (EphyBookmarks *eb, xmlTextReaderPtr reader, EphyNode **ret_
 				/* eat it */
 			}
 		}
-		else if (xmlStrEqual (tag, "bookmark"))
+		else if (xmlStrEqual (tag, (xmlChar *) "bookmark"))
 		{
 			if (type == XML_READER_TYPE_ELEMENT && state == STATE_BOOKMARK && address == NULL)
 			{
-				address = xmlTextReaderGetAttribute (reader, "href");
+				address = xmlTextReaderGetAttribute (reader, (xmlChar *) "href");
 			}
 			else if (type == XML_READER_TYPE_END_ELEMENT && state == STATE_BOOKMARK)
 			{
@@ -174,7 +174,7 @@ xbel_parse_bookmark (EphyBookmarks *eb, xmlTextReaderPtr reader, EphyNode **ret_
 				break;
 			}
 		}
-		else if (xmlStrEqual (tag, "title"))
+		else if (xmlStrEqual (tag, (xmlChar *) "title"))
 		{
 			if (type == XML_READER_TYPE_ELEMENT && state == STATE_BOOKMARK && title == NULL)
 			{
@@ -185,7 +185,7 @@ xbel_parse_bookmark (EphyBookmarks *eb, xmlTextReaderPtr reader, EphyNode **ret_
 				state = STATE_BOOKMARK;
 			}
 		}
-		else if (xmlStrEqual (tag, "desc"))
+		else if (xmlStrEqual (tag, (xmlChar *) "desc"))
 		{
 			if (type == XML_READER_TYPE_ELEMENT && state == STATE_BOOKMARK)
 			{
@@ -196,7 +196,7 @@ xbel_parse_bookmark (EphyBookmarks *eb, xmlTextReaderPtr reader, EphyNode **ret_
 				state = STATE_BOOKMARK;
 			}
 		}
-		else if (xmlStrEqual (tag, "info"))
+		else if (xmlStrEqual (tag, (xmlChar *) "info"))
 		{
 			if (type == XML_READER_TYPE_ELEMENT && state == STATE_BOOKMARK)
 			{
@@ -207,7 +207,7 @@ xbel_parse_bookmark (EphyBookmarks *eb, xmlTextReaderPtr reader, EphyNode **ret_
 				state = STATE_BOOKMARK;
 			}
 		}
-		else if (xmlStrEqual (tag, "metadata"))
+		else if (xmlStrEqual (tag, (xmlChar *) "metadata"))
 		{
 			if (type == XML_READER_TYPE_ELEMENT && state == STATE_INFO)
 			{
@@ -218,7 +218,7 @@ xbel_parse_bookmark (EphyBookmarks *eb, xmlTextReaderPtr reader, EphyNode **ret_
 				state = STATE_INFO;
 			}
 		}
-		else if (xmlStrEqual (tag, "smarturl"))
+		else if (xmlStrEqual (tag, (xmlChar *) "smarturl"))
 		{
 			if (type == XML_READER_TYPE_ELEMENT && state == STATE_METADATA)
 			{
@@ -241,14 +241,14 @@ xbel_parse_bookmark (EphyBookmarks *eb, xmlTextReaderPtr reader, EphyNode **ret_
 
 	if (title == NULL)
 	{
-		title = xmlStrdup (_("Untitled"));
+		title = xmlStrdup ((xmlChar *) _("Untitled"));
 	}
 
-	node = bookmark_add (eb, title, address);
+	node = bookmark_add (eb, (const char *) title, (const char *) address);
 	if (node == NULL)
 	{
 		/* probably a duplicate */
-		node = ephy_bookmarks_find_bookmark (eb, address);		
+		node = ephy_bookmarks_find_bookmark (eb, (const char *) address);
 	}
 
 	xmlFree (title);
@@ -280,13 +280,13 @@ xbel_parse_folder (EphyBookmarks *eb, xmlTextReaderPtr reader, char *parent_fold
 		{
 			/* shouldn't happen but does anyway :) */
 		}
-		else if (xmlStrEqual (tag, "#text"))
+		else if (xmlStrEqual (tag, (xmlChar *) "#text"))
 		{
 			if (state == STATE_TITLE && folder == NULL)
 			{
 				char *title;
 
-				title = xmlTextReaderValue (reader);
+				title = (char *) xmlTextReaderValue (reader);
 
 				if (!parent_folder)
 				{
@@ -305,7 +305,7 @@ xbel_parse_folder (EphyBookmarks *eb, xmlTextReaderPtr reader, char *parent_fold
 				/* eat it */
 			}
 		}
-		else if (xmlStrEqual (tag, "bookmark") && type == 1 && state == STATE_FOLDER)
+		else if (xmlStrEqual (tag, (xmlChar *) "bookmark") && type == 1 && state == STATE_FOLDER)
 		{
 			EphyNode *node = NULL, *keyword;
 
@@ -325,7 +325,7 @@ xbel_parse_folder (EphyBookmarks *eb, xmlTextReaderPtr reader, char *parent_fold
 
 			if (ret != 1) break;
 		}
-		else if ((xmlStrEqual (tag, "folder"))
+		else if ((xmlStrEqual (tag, (xmlChar *) "folder"))
 			&& state == STATE_FOLDER)
 		{
 			if (type == XML_READER_TYPE_ELEMENT)
@@ -341,7 +341,7 @@ xbel_parse_folder (EphyBookmarks *eb, xmlTextReaderPtr reader, char *parent_fold
 				break;
 			}
 		}
-		else if (xmlStrEqual (tag, "title"))
+		else if (xmlStrEqual (tag, (xmlChar *) "title"))
 		{
 			if (type == XML_READER_TYPE_ELEMENT && state == STATE_FOLDER)
 			{
@@ -352,7 +352,7 @@ xbel_parse_folder (EphyBookmarks *eb, xmlTextReaderPtr reader, char *parent_fold
 				state = STATE_FOLDER;
 			}
 		}
-		else if (xmlStrEqual (tag, "info"))
+		else if (xmlStrEqual (tag, (xmlChar *) "info"))
 		{
 			if (type == XML_READER_TYPE_ELEMENT && state == STATE_FOLDER)
 			{
@@ -363,7 +363,7 @@ xbel_parse_folder (EphyBookmarks *eb, xmlTextReaderPtr reader, char *parent_fold
 				state = STATE_FOLDER;
 			}
 		}
-		else if (xmlStrEqual (tag, "desc"))
+		else if (xmlStrEqual (tag, (xmlChar *) "desc"))
 		{
 			if (type == XML_READER_TYPE_ELEMENT && state == STATE_FOLDER)
 			{
@@ -408,7 +408,7 @@ xbel_parse_xbel (EphyBookmarks *eb, xmlTextReaderPtr reader)
 		{
 			/* shouldn't happen but does anyway :( */
 		}
-		else if (xmlStrEqual (tag, "bookmark") && type == XML_READER_TYPE_ELEMENT
+		else if (xmlStrEqual (tag, (xmlChar *) "bookmark") && type == XML_READER_TYPE_ELEMENT
 			 && state == STATE_FOLDER)
 		{
 			EphyNode *node = NULL;
@@ -418,7 +418,7 @@ xbel_parse_xbel (EphyBookmarks *eb, xmlTextReaderPtr reader)
 
 			if (ret != 1) break;
 		}
-		else if (xmlStrEqual (tag, "folder") && type == XML_READER_TYPE_ELEMENT
+		else if (xmlStrEqual (tag, (xmlChar *) "folder") && type == XML_READER_TYPE_ELEMENT
 			 && state == STATE_XBEL)
 		{
 			/* this will eat the </folder> too */
@@ -426,17 +426,17 @@ xbel_parse_xbel (EphyBookmarks *eb, xmlTextReaderPtr reader)
 
 			if (ret != 1) break;
 		}
-		else if ((xmlStrEqual (tag, "xbel")) && type == XML_READER_TYPE_ELEMENT
+		else if ((xmlStrEqual (tag, (xmlChar *) "xbel")) && type == XML_READER_TYPE_ELEMENT
 			 && state == STATE_START)
 		{
 			state = STATE_XBEL;
 		}
-		else if ((xmlStrEqual (tag, "xbel")) && type == XML_READER_TYPE_END_ELEMENT
+		else if ((xmlStrEqual (tag, (xmlChar *) "xbel")) && type == XML_READER_TYPE_END_ELEMENT
 			 && state == STATE_XBEL)
 		{
 			state = STATE_STOP;
 		}
-		else if (xmlStrEqual (tag, "title"))
+		else if (xmlStrEqual (tag, (xmlChar *) "title"))
 		{
 			if (type == XML_READER_TYPE_ELEMENT && state == STATE_XBEL)
 			{
@@ -447,7 +447,7 @@ xbel_parse_xbel (EphyBookmarks *eb, xmlTextReaderPtr reader)
 				state = STATE_XBEL;
 			}
 		}
-		else if (xmlStrEqual (tag, "info"))
+		else if (xmlStrEqual (tag, (xmlChar *) "info"))
 		{
 			if (type == XML_READER_TYPE_ELEMENT && state == STATE_XBEL)
 			{
@@ -458,7 +458,7 @@ xbel_parse_xbel (EphyBookmarks *eb, xmlTextReaderPtr reader)
 				state = STATE_XBEL;
 			}
 		}
-		else if (xmlStrEqual (tag, "desc"))
+		else if (xmlStrEqual (tag, (xmlChar *) "desc"))
 		{
 			if (type == XML_READER_TYPE_ELEMENT && state == STATE_XBEL)
 			{
@@ -799,13 +799,13 @@ parse_rdf_subjects (xmlNodePtr node,
 
 	while (child != NULL)
 	{
-		if (xmlStrEqual (child->name, "Bag"))
+		if (xmlStrEqual (child->name, (xmlChar *) "Bag"))
 		{
 			child = child->children;
 
 			while (child != NULL)
 			{
-				if (xmlStrEqual (child->name, "li"))
+				if (xmlStrEqual (child->name, (xmlChar *) "li"))
 				{
 					subject = xmlNodeGetContent (child);
 					*subjects = g_list_append (*subjects, subject);
@@ -842,26 +842,26 @@ parse_rdf_item (EphyBookmarks *bookmarks,
 	child = node->children;
 
 #ifdef OLD_RDF_TEMPORARY_HACK
-	link = xmlGetProp (node, "about");
+	link = xmlGetProp (node, (xmlChar *) "about");
 #endif
 
 	while (child != NULL)
 	{
-		if (xmlStrEqual (child->name, "title"))
+		if (xmlStrEqual (child->name, (xmlChar *) "title"))
 		{
 			title = xmlNodeGetContent (child);
 		}
 #ifndef OLD_RDF_TEMPORARY_HACK
-		else if (xmlStrEqual (child->name, "link"))
+		else if (xmlStrEqual (child->name, (xmlChar *) "link"))
 		{
 			link = xmlNodeGetContent (child);
 		}
 #endif
-		else if (xmlStrEqual (child->name, "subject"))
+		else if (xmlStrEqual (child->name, (xmlChar *) "subject"))
 		{
 			parse_rdf_subjects (child, &subjects);
 		}
-		else if (xmlStrEqual (child->name, "smartlink"))
+		else if (xmlStrEqual (child->name, (xmlChar *) "smartlink"))
 		{
 			if (link) xmlFree (link);
 			link = xmlNodeGetContent (child);
@@ -870,7 +870,7 @@ parse_rdf_item (EphyBookmarks *bookmarks,
 		child = child->next;
 	}
 
-	bmk = bookmark_add (bookmarks, title, link);
+	bmk = bookmark_add (bookmarks, (char *) title, (char *) link);
 	if (bmk)
 	{
 		l = subjects;
@@ -930,7 +930,7 @@ ephy_bookmarks_import_rdf (EphyBookmarks *bookmarks,
 
 	while (child != NULL)
 	{
-		if (xmlStrEqual (child->name, "item"))
+		if (xmlStrEqual (child->name, (xmlChar *) "item"))
 		{
 			parse_rdf_item (bookmarks, child);
 		}
diff --git a/src/bookmarks/ephy-bookmarks.c b/src/bookmarks/ephy-bookmarks.c
index 84c84f92c..cdad943a9 100644
--- a/src/bookmarks/ephy-bookmarks.c
+++ b/src/bookmarks/ephy-bookmarks.c
@@ -307,10 +307,11 @@ ephy_bookmarks_save (EphyBookmarks *eb)
 	LOG ("Saving bookmarks")
 
 	ephy_node_db_write_to_xml_safe
-		(eb->priv->db, eb->priv->xml_file,
-		 EPHY_BOOKMARKS_XML_ROOT,
-		 EPHY_BOOKMARKS_XML_VERSION,
-		 "Do not rely on this file, it's only for internal use. Use bookmarks.rdf instead.",
+		(eb->priv->db,
+		 (xmlChar *) eb->priv->xml_file,
+		 (xmlChar *) EPHY_BOOKMARKS_XML_ROOT,
+		 (xmlChar *) EPHY_BOOKMARKS_XML_VERSION,
+		 (xmlChar *) "Do not rely on this file, it's only for internal use. Use bookmarks.rdf instead.",
 		 eb->priv->keywords,
 		 3, eb->priv->bookmarks, eb->priv->favorites, eb->priv->notcategorized,
 		 eb->priv->bookmarks,
@@ -765,8 +766,8 @@ ephy_bookmarks_init (EphyBookmarks *eb)
 		eb->priv->init_defaults = TRUE;
 	}
 	else if (ephy_node_db_load_from_file (eb->priv->db, eb->priv->xml_file,
-					      EPHY_BOOKMARKS_XML_ROOT,
-					      EPHY_BOOKMARKS_XML_VERSION) == FALSE)
+					      (xmlChar *) EPHY_BOOKMARKS_XML_ROOT,
+					      (xmlChar *) EPHY_BOOKMARKS_XML_VERSION) == FALSE)
 	{
 		/* save the corrupted files so the user can late try to
 		 * manually recover them. See bug #128308.
diff --git a/src/bookmarks/ephy-bookmarksbar-model.c b/src/bookmarks/ephy-bookmarksbar-model.c
index 0e5f17ae4..5cb28a7f2 100755
--- a/src/bookmarks/ephy-bookmarksbar-model.c
+++ b/src/bookmarks/ephy-bookmarksbar-model.c
@@ -165,7 +165,7 @@ ephy_bookmarksbar_model_get_node (EphyBookmarksBarModel *model,
 				  const char *action_name)
 {
 	EphyBookmarks *bookmarks = EPHY_BOOKMARKSBAR_MODEL (model)->priv->bookmarks;
-	long node_id;
+	unsigned long node_id;
 
 	if (!ephy_string_to_int (action_name + strlen ("GoBookmark-"), &node_id))
 	{
diff --git a/src/bookmarks/ephy-topic-action.c b/src/bookmarks/ephy-topic-action.c
index 0406d5c8b..6b162ba39 100644
--- a/src/bookmarks/ephy-topic-action.c
+++ b/src/bookmarks/ephy-topic-action.c
@@ -599,7 +599,7 @@ drag_data_get_cb (GtkWidget *widget, GdkDragContext *context,
 	g_return_if_fail (uri != NULL);
 
 	gtk_selection_data_set (selection_data, selection_data->target, 8,
-				uri, strlen (uri));
+				(unsigned char *) uri, strlen (uri));
 
 	g_free (uri);
 }
diff --git a/src/ephy-session.c b/src/ephy-session.c
index 8fd43f5bf..07b082f92 100644
--- a/src/ephy-session.c
+++ b/src/ephy-session.c
@@ -482,12 +482,12 @@ write_tab (xmlTextWriterPtr writer,
 	char *location;
 	int ret;
 
-	ret = xmlTextWriterStartElement (writer, "embed");
+	ret = xmlTextWriterStartElement (writer, (xmlChar *) "embed");
 	if (ret < 0) return ret;
 
 	embed = ephy_tab_get_embed (tab);
 	location = ephy_embed_get_location (embed, TRUE);
-	ret = xmlTextWriterWriteAttribute (writer, "url", location);
+	ret = xmlTextWriterWriteAttribute (writer, (xmlChar *) "url", (xmlChar *) location);
 	g_free (location);
 	if (ret < 0) return ret;
 
@@ -507,16 +507,16 @@ write_window_geometry (xmlTextWriterPtr writer,
 	gtk_window_get_position (window, &x, &y);
 
 	/* set window properties */
-	ret = xmlTextWriterWriteFormatAttribute (writer, "x", "%d", x);
+	ret = xmlTextWriterWriteFormatAttribute (writer, (xmlChar *) "x", "%d", x);
 	if (ret < 0) return ret;
 
-	ret = xmlTextWriterWriteFormatAttribute (writer, "y", "%d", y);
+	ret = xmlTextWriterWriteFormatAttribute (writer, (xmlChar *) "y", "%d", y);
 	if (ret < 0) return ret;
 
-	ret = xmlTextWriterWriteFormatAttribute (writer, "width", "%d", width);
+	ret = xmlTextWriterWriteFormatAttribute (writer, (xmlChar *) "width", "%d", width);
 	if (ret < 0) return ret;
 
-	ret = xmlTextWriterWriteFormatAttribute (writer, "height", "%d", height);
+	ret = xmlTextWriterWriteFormatAttribute (writer, (xmlChar *) "height", "%d", height);
 	return ret;
 }
 
@@ -527,10 +527,10 @@ write_tool_window (xmlTextWriterPtr writer,
 {
 	int ret;
 
-	ret = xmlTextWriterStartElement (writer, "toolwindow");
+	ret = xmlTextWriterStartElement (writer, (xmlChar *) "toolwindow");
 	if (ret < 0) return ret;
 
-	ret = xmlTextWriterWriteAttribute (writer, "id", id);
+	ret = xmlTextWriterWriteAttribute (writer, (xmlChar *) "id", id);
 	if (ret < 0) return ret;
 
 	ret = write_window_geometry (writer, window);
@@ -554,7 +554,7 @@ write_ephy_window (xmlTextWriterPtr writer,
 	 */
 	if (tabs == NULL) return 0;
 
-	ret = xmlTextWriterStartElement (writer, "window");
+	ret = xmlTextWriterStartElement (writer, (xmlChar *) "window");
 	if (ret < 0) return ret;
 
 	ret = write_window_geometry (writer, GTK_WINDOW (window));
@@ -606,7 +606,7 @@ ephy_session_save (EphySession *session,
 	ret = xmlTextWriterSetIndent (writer, 1);
 	if (ret < 0) goto out;
 
-	ret = xmlTextWriterSetIndentString (writer, "  ");
+	ret = xmlTextWriterSetIndentString (writer, (xmlChar *) "  ");
 	if (ret < 0) goto out;
 
 	START_PROFILER ("Saving session")
@@ -615,7 +615,7 @@ ephy_session_save (EphySession *session,
 	if (ret < 0) goto out;
 
 	/* create and set the root node for the session */
-	ret = xmlTextWriterStartElement (writer, "session");
+	ret = xmlTextWriterStartElement (writer, (xmlChar *) "session");
 	if (ret < 0) goto out;
 
 	/* iterate through all the windows */
@@ -629,11 +629,11 @@ ephy_session_save (EphySession *session,
 		}
 		else if (EPHY_IS_BOOKMARKS_EDITOR (window))
 		{
-			ret = write_tool_window (writer, window, BOOKMARKS_EDITOR_ID);
+			ret = write_tool_window (writer, window, (xmlChar *) BOOKMARKS_EDITOR_ID);
 		}
 		else if (EPHY_IS_HISTORY_WINDOW (window))
 		{
-			ret = write_tool_window (writer, window, HISTORY_WINDOW_ID);
+			ret = write_tool_window (writer, window, (xmlChar *) HISTORY_WINDOW_ID);
 		}
 		if (ret < 0) break;
 	}
@@ -668,15 +668,15 @@ parse_embed (xmlNodePtr child, EphyWindow *window)
 {
 	while (child != NULL)
 	{
-		if (strcmp (child->name, "embed") == 0)
+		if (strcmp ((char *) child->name, "embed") == 0)
 		{
 			xmlChar *url;
 
 			g_return_if_fail (window != NULL);
 
-			url = xmlGetProp (child, "url");
+			url = xmlGetProp (child, (xmlChar *) "url");
 
-			ephy_shell_new_tab (ephy_shell, window, NULL, url,
+			ephy_shell_new_tab (ephy_shell, window, NULL, (char *) url,
 					    EPHY_NEW_TAB_IN_EXISTING_WINDOW |
 					    EPHY_NEW_TAB_OPEN_PAGE |
 					    EPHY_NEW_TAB_APPEND_LAST);
@@ -725,25 +725,25 @@ ephy_session_load (EphySession *session,
 
 	while (child != NULL)
 	{
-		if (xmlStrEqual (child->name, "window"))
+		if (xmlStrEqual (child->name, (xmlChar *) "window"))
 		{
 			widget = GTK_WIDGET (ephy_window_new ());
 			parse_embed (child->children, EPHY_WINDOW (widget));
 		}
-		else if (xmlStrEqual (child->name, "toolwindow"))
+		else if (xmlStrEqual (child->name, (xmlChar *) "toolwindow"))
 		{
 			xmlChar *id;
 
-			id = xmlGetProp (child, "id");
+			id = xmlGetProp (child, (xmlChar *) "id");
 
-			if (id && xmlStrEqual (BOOKMARKS_EDITOR_ID, id))
+			if (id && xmlStrEqual ((xmlChar *) BOOKMARKS_EDITOR_ID, id))
 			{
 				if (!eel_gconf_get_boolean (CONF_LOCKDOWN_DISABLE_BOOKMARK_EDITING))
 				{
 					widget = ephy_shell_get_bookmarks_editor (ephy_shell);
 				}
 			}
-			else if (id && xmlStrEqual (HISTORY_WINDOW_ID, id))
+			else if (id && xmlStrEqual ((xmlChar *) HISTORY_WINDOW_ID, id))
 			{
 				if (eel_gconf_get_boolean (CONF_LOCKDOWN_DISABLE_HISTORY))
 				{
@@ -757,17 +757,17 @@ ephy_session_load (EphySession *session,
 			xmlChar *tmp;
 			gulong x = 0, y = 0, width = 0, height = 0;
 
-			tmp = xmlGetProp (child, "x");
-			ephy_string_to_int (tmp, &x);
+			tmp = xmlGetProp (child, (xmlChar *) "x");
+			ephy_string_to_int ((char *) tmp, &x);
 			xmlFree (tmp);
-			tmp = xmlGetProp (child, "y");
-			ephy_string_to_int (tmp, &y);
+			tmp = xmlGetProp (child, (xmlChar *) "y");
+			ephy_string_to_int ((char *) tmp, &y);
 			xmlFree (tmp);
-			tmp = xmlGetProp (child, "width");
-			ephy_string_to_int (tmp, &width);
+			tmp = xmlGetProp (child, (xmlChar *) "width");
+			ephy_string_to_int ((char *) tmp, &width);
 			xmlFree (tmp);
-			tmp = xmlGetProp (child, "height");
-			ephy_string_to_int (tmp, &height);
+			tmp = xmlGetProp (child, (xmlChar *) "height");
+			ephy_string_to_int ((char *) tmp, &height);
 			xmlFree (tmp);
 			gtk_window_move (GTK_WINDOW (widget), x, y);
 			gtk_window_set_default_size (GTK_WINDOW (widget),