From 0e935c597fe2e3e00f672b98f77eaebf48660857 Mon Sep 17 00:00:00 2001 From: Jean-François Rameau <jframeau@cvs.gnome.org> Date: Sun, 3 Jul 2005 21:38:55 +0000 Subject: EphyCookie's expires field is now of time_t type (fixes gcc 4.0 warning). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2005-07-03 Jean-François Rameau <jframeau@cvs.gnome.org> * embed/ephy-cookie-manager.h: EphyCookie's expires field is now of time_t type (fixes gcc 4.0 warning). * embed/ephy-favicon-cache.c: * lib/ephy-file-helpers.c: * lib/ephy-langs.c: * lib/ephy-node-db.c: * lib/ephy-node.c: * lib/ephy-state.c: * lib/egg/eggtraymanager.c: * src/ephy-extensions-manager.c: * src/ephy-main.c: * src/ephy-notebook.c: * src/ephy-session.c: * src/ephy-window.c: Fixes more signed/unsigned problems with gcc 4.0. --- lib/ephy-node-db.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'lib/ephy-node-db.c') diff --git a/lib/ephy-node-db.c b/lib/ephy-node-db.c index 613251ef5..af2899664 100644 --- a/lib/ephy-node-db.c +++ b/lib/ephy-node-db.c @@ -303,7 +303,7 @@ ephy_node_db_load_from_file (EphyNodeDb *db, name = xmlTextReaderConstName (reader); type = xmlTextReaderNodeType (reader); - if (xmlStrEqual (name, "node") + if (xmlStrEqual (name, (const xmlChar *)"node") && type == XML_READER_TYPE_ELEMENT) { xmlNodePtr subtree; @@ -324,7 +324,7 @@ ephy_node_db_load_from_file (EphyNodeDb *db, xmlChar *version; /* check version info */ - version = xmlTextReaderGetAttribute (reader, "version"); + version = xmlTextReaderGetAttribute (reader, (const xmlChar *)"version"); if (xmlStrEqual (version, xml_version) == FALSE) { success = FALSE; @@ -368,7 +368,7 @@ ephy_node_db_write_to_xml_valist (EphyNodeDb *db, START_PROFILER ("Saving node db") /* FIXME: do we want to turn compression on ? */ - writer = xmlNewTextWriterFilename (filename, 0); + writer = xmlNewTextWriterFilename ((const char *)filename, 0); if (writer == NULL) { return -1; @@ -377,7 +377,7 @@ ephy_node_db_write_to_xml_valist (EphyNodeDb *db, ret = xmlTextWriterSetIndent (writer, 1); if (ret < 0) goto out; - ret = xmlTextWriterSetIndentString (writer, " "); + ret = xmlTextWriterSetIndentString (writer, (const xmlChar *)" "); if (ret < 0) goto out; ret = xmlTextWriterStartDocument (writer, "1.0", NULL, NULL); @@ -386,7 +386,7 @@ ephy_node_db_write_to_xml_valist (EphyNodeDb *db, ret = xmlTextWriterStartElement (writer, root); if (ret < 0) goto out; - ret = xmlTextWriterWriteAttribute (writer, "version", version); + ret = xmlTextWriterWriteAttribute (writer, (const xmlChar *)"version", version); if (ret < 0) goto out; if (comment != NULL) @@ -484,12 +484,12 @@ ephy_node_db_write_to_xml_safe (EphyNodeDb *db, int ret = 0; char *tmp_file; - tmp_file = g_strconcat (filename, ".tmp", NULL); + tmp_file = g_strconcat ((const gchar *)filename, ".tmp", NULL); va_start (argptr, node); ret = ephy_node_db_write_to_xml_valist - (db, tmp_file, root, version, comment, node, argptr); + (db, (const xmlChar *)tmp_file, root, version, comment, node, argptr); va_end (argptr); @@ -499,7 +499,7 @@ ephy_node_db_write_to_xml_safe (EphyNodeDb *db, goto failed; } - if (ephy_file_switch_temp_file (filename, tmp_file) == FALSE) + if (ephy_file_switch_temp_file ((const char *)filename, tmp_file) == FALSE) { ret = -1; } -- cgit