From 0e935c597fe2e3e00f672b98f77eaebf48660857 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Rameau?= 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 * 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. --- src/ephy-extensions-manager.c | 10 +++++----- src/ephy-main.c | 2 +- src/ephy-notebook.c | 2 +- src/ephy-session.c | 4 +++- src/ephy-window.c | 4 +++- 5 files changed, 13 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/ephy-extensions-manager.c b/src/ephy-extensions-manager.c index a140ad34d..6a19e8464 100644 --- a/src/ephy-extensions-manager.c +++ b/src/ephy-extensions-manager.c @@ -392,7 +392,7 @@ ephy_extensions_manager_load_string (EphyExtensionsManager *manager, * put the schema validation on the Doc Tree and then pass that to the * reader. (maybe switch to RelaxNG?) */ - doc = xmlParseDoc (xml); + doc = xmlParseDoc ((const xmlChar *)xml); if (doc == NULL) { @@ -561,7 +561,7 @@ ephy_extensions_manager_load_string (EphyExtensionsManager *manager, else if (state == STATE_URL && type == XML_READER_TYPE_TEXT) { - einfo->url = xmlTextReaderValue (reader); + einfo->url = (char *)xmlTextReaderValue (reader); } else if (state == STATE_AUTHOR && type == XML_READER_TYPE_END_ELEMENT && @@ -648,8 +648,8 @@ ephy_extensions_manager_load_string (EphyExtensionsManager *manager, xmlFreeDoc (doc); /* assign localised strings */ - einfo->description = description.string; - einfo->name = name.string; + einfo->description = (char *)description.string; + einfo->name = (char *)name.string; /* sanity check */ if (ret < 0 || state != STATE_STOP || @@ -838,7 +838,7 @@ load_extension (EphyExtensionsManager *manager, if (info->load_failed) return; /* get a loader */ - loader = get_loader_for_type (manager, info->loader_type); + loader = get_loader_for_type (manager, (const char *)info->loader_type); if (loader == NULL) { g_message ("No loader found for extension '%s' of type '%s'\n", diff --git a/src/ephy-main.c b/src/ephy-main.c index d60d15a52..e5b9094b2 100644 --- a/src/ephy-main.c +++ b/src/ephy-main.c @@ -174,7 +174,7 @@ slowly_and_stupidly_obtain_timestamp (Display *xdisplay) XChangeProperty (xdisplay, xwindow, atom_name, atom_type, - 8, PropModeReplace, name, strlen (name)); + 8, PropModeReplace, (unsigned char *)name, strlen (name)); } XWindowEvent (xdisplay, diff --git a/src/ephy-notebook.c b/src/ephy-notebook.c index bd953fca7..82e13203d 100644 --- a/src/ephy-notebook.c +++ b/src/ephy-notebook.c @@ -725,7 +725,7 @@ notebook_drag_data_received_cb (GtkWidget* widget, GdkDragContext *context, char **split; /* URL_TYPE has format: url \n title */ - split = g_strsplit (selection_data->data, "\n", 2); + split = g_strsplit ((const gchar *)selection_data->data, "\n", 1); if (split != NULL && split[0] != NULL && split[0][0] != '\0') { ephy_link_open (EPHY_LINK (notebook), split[0], tab, diff --git a/src/ephy-session.c b/src/ephy-session.c index a54e81401..96e016137 100644 --- a/src/ephy-session.c +++ b/src/ephy-session.c @@ -593,7 +593,9 @@ write_ephy_window (xmlTextWriterPtr writer, role = gtk_window_get_role (GTK_WINDOW (window)); if (role != NULL) { - ret = xmlTextWriterWriteAttribute (writer, "role", role); + ret = xmlTextWriterWriteAttribute (writer, + (const xmlChar *)"role", + (const xmlChar *)role); if (ret < 0) return ret; } diff --git a/src/ephy-window.c b/src/ephy-window.c index 54a7bce81..186458fbd 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -1538,11 +1538,13 @@ popup_menu_at_coords (GtkMenu *menu, gint *x, gint *y, gboolean *push_in, { GtkWidget *window = GTK_WIDGET (user_data); EphyEmbedEvent *event; + guint ux, uy; event = g_object_get_data (G_OBJECT (window), "context_event"); g_return_if_fail (event != NULL); - ephy_embed_event_get_coords (event, x, y); + ephy_embed_event_get_coords (event, &ux, &uy); + *x = ux; *y = uy; /* FIXME: better position the popup within the window bounds? */ ephy_gui_sanitise_popup_position (menu, window, x, y); -- cgit v1.2.3