aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--embed/ephy-history.c6
-rw-r--r--src/epiphany.override4
3 files changed, 12 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index d98278757..094b48d79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-07-31 Jean-François Rameau <jframeau@cvs.gnome.org>
+
+ * src/epiphany.override: (_wrap_ephy_embed_event_get_coords):
+ * embed/ephy-history.c:
+
+ Fix gcc 4.0 warnings.
+
2005-07-31 Christian Persch <chpe@cvs.gnome.org>
* src/Makefile.am:
diff --git a/embed/ephy-history.c b/embed/ephy-history.c
index f35b0f87a..d3c64d286 100644
--- a/embed/ephy-history.c
+++ b/embed/ephy-history.c
@@ -34,8 +34,8 @@
#include <glib/gi18n.h>
#include <libgnomevfs/gnome-vfs-uri.h>
-#define EPHY_HISTORY_XML_ROOT "ephy_history"
-#define EPHY_HISTORY_XML_VERSION "1.0"
+#define EPHY_HISTORY_XML_ROOT (const xmlChar *)"ephy_history"
+#define EPHY_HISTORY_XML_VERSION (const xmlChar *)"1.0"
/* how often to save the history, in milliseconds */
#define HISTORY_SAVE_INTERVAL (5 * 60 * 1000)
@@ -277,7 +277,7 @@ ephy_history_save (EphyHistory *eb)
LOG ("Saving history db");
ret = ephy_node_db_write_to_xml_safe
- (eb->priv->db, eb->priv->xml_file,
+ (eb->priv->db, (const xmlChar *)eb->priv->xml_file,
EPHY_HISTORY_XML_ROOT,
EPHY_HISTORY_XML_VERSION,
NULL, /* comment */
diff --git a/src/epiphany.override b/src/epiphany.override
index f6b8d15b7..439ca3c2e 100644
--- a/src/epiphany.override
+++ b/src/epiphany.override
@@ -205,10 +205,10 @@ override ephy_embed_event_get_coords noargs
static PyObject *
_wrap_ephy_embed_event_get_coords(PyGObject *self)
{
- gint x, y;
+ guint x, y;
ephy_embed_event_get_coords (EPHY_EMBED_EVENT(self->obj), &x, &y);
- return Py_BuildValue("(ii)", x, y);
+ return Py_BuildValue("(ll)", x, y);
}
%%
override ephy_window_get_tabs noargs