aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2005-08-13 18:49:03 +0800
committerChristian Persch <chpe@src.gnome.org>2005-08-13 18:49:03 +0800
commit08477cd1a9ef1958f993bb626339d6a96b85d0b8 (patch)
treeed4ea61b0929f4c99c0140d3e6b50df509d4e156
parentbc6426fdd145e1233628987bd39f8fe2060b9558 (diff)
downloadgsoc2013-epiphany-08477cd1a9ef1958f993bb626339d6a96b85d0b8.tar
gsoc2013-epiphany-08477cd1a9ef1958f993bb626339d6a96b85d0b8.tar.gz
gsoc2013-epiphany-08477cd1a9ef1958f993bb626339d6a96b85d0b8.tar.bz2
gsoc2013-epiphany-08477cd1a9ef1958f993bb626339d6a96b85d0b8.tar.lz
gsoc2013-epiphany-08477cd1a9ef1958f993bb626339d6a96b85d0b8.tar.xz
gsoc2013-epiphany-08477cd1a9ef1958f993bb626339d6a96b85d0b8.tar.zst
gsoc2013-epiphany-08477cd1a9ef1958f993bb626339d6a96b85d0b8.zip
More gcc4 fixes.
2005-08-13 Christian Persch <chpe@cvs.gnome.org> * embed/ephy-favicon-cache.c: (ephy_favicon_cache_get): * lib/ephy-dnd.c: (ephy_dnd_drag_data_get): More gcc4 fixes.
-rw-r--r--ChangeLog7
-rw-r--r--embed/ephy-favicon-cache.c2
-rw-r--r--lib/ephy-dnd.c2
3 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ec767d3c3..6c6c014c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-08-13 Christian Persch <chpe@cvs.gnome.org>
+
+ * embed/ephy-favicon-cache.c: (ephy_favicon_cache_get):
+ * lib/ephy-dnd.c: (ephy_dnd_drag_data_get):
+
+ More gcc4 fixes.
+
2005-08-10 Christian Persch <chpe@cvs.gnome.org>
* src/ephy-lockdown.c: (update_location_editable):
diff --git a/embed/ephy-favicon-cache.c b/embed/ephy-favicon-cache.c
index 7ff754afc..e720bb7a8 100644
--- a/embed/ephy-favicon-cache.c
+++ b/embed/ephy-favicon-cache.c
@@ -749,7 +749,7 @@ ephy_favicon_cache_get (EphyFaviconCache *cache,
{
if (g_file_get_contents (pix_file, &buf, &count, NULL))
{
- gdk_pixbuf_loader_write (loader, buf, count, NULL);
+ gdk_pixbuf_loader_write (loader, (const guchar *) buf, count, NULL);
g_free (buf);
}
diff --git a/lib/ephy-dnd.c b/lib/ephy-dnd.c
index 68510d85f..ae610ca45 100644
--- a/lib/ephy-dnd.c
+++ b/lib/ephy-dnd.c
@@ -109,7 +109,7 @@ ephy_dnd_drag_data_get (GtkWidget *widget,
gtk_selection_data_set (selection_data,
selection_data->target,
- 8, result->str, result->len);
+ 8, (const guchar *) result->str, result->len);
g_string_free (result, TRUE);