From 285427e21f0bc403f37b980b478a2c44cec46a55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Crozat?= <fcrozat@src.gnome.org>
Date: Fri, 6 Feb 2004 10:53:58 +0000
Subject: [PATCH] 64bits fixes.

        * capplets/font/main.c: (sample_expose):
        * gnome-settings-daemon/gnome-settings-gtk1theme.c:
        (apply_settings):
        * vfs-methods/themus/theme-method.c:
        64bits fixes.
---
 ChangeLog                                        | 8 ++++++++
 capplets/font/main.c                             | 2 +-
 gnome-settings-daemon/gnome-settings-gtk1theme.c | 2 +-
 vfs-methods/themus/theme-method.c                | 1 +
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5efab62a0..1c2f279cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-02-06  Frederic Crozat  <fcrozat@mandrakesoft.com>
+
+	* capplets/font/main.c: (sample_expose):
+	* gnome-settings-daemon/gnome-settings-gtk1theme.c:
+	(apply_settings):
+	* vfs-methods/themus/theme-method.c:
+	64bits fixes.
+
 2004-02-03  Carlos Perelló Marín <carlos@gnome.org>
 
 	* configure.in, capplets/Makefile.am: Removed the localization capplet
diff --git a/capplets/font/main.c b/capplets/font/main.c
index c6de94d5f..d38ffc83b 100644
--- a/capplets/font/main.c
+++ b/capplets/font/main.c
@@ -86,7 +86,7 @@ sample_size_request (GtkWidget      *darea,
 
 static void
 sample_expose (GtkWidget      *darea,
-	       GdkEventExpose  expose)
+	       GdkEventExpose *expose)
 {
 	GdkPixbuf *pixbuf = g_object_get_data (G_OBJECT (darea), "sample-pixbuf");
 	int width = gdk_pixbuf_get_width (pixbuf);
diff --git a/gnome-settings-daemon/gnome-settings-gtk1theme.c b/gnome-settings-daemon/gnome-settings-gtk1theme.c
index f4b05280e..394b21f0e 100644
--- a/gnome-settings-daemon/gnome-settings-gtk1theme.c
+++ b/gnome-settings-daemon/gnome-settings-gtk1theme.c
@@ -151,7 +151,7 @@ apply_settings (void)
 	gchar *theme_filename;
 	gchar *rc_filename;
 	gchar *current_contents;
-	gint current_length;
+	gsize current_length;
 	gchar *new_contents;
 	GError *err = NULL;
 
diff --git a/vfs-methods/themus/theme-method.c b/vfs-methods/themus/theme-method.c
index 7fe942de6..567685f7a 100644
--- a/vfs-methods/themus/theme-method.c
+++ b/vfs-methods/themus/theme-method.c
@@ -21,6 +21,7 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <libintl.h>
 
 #include <glib/gi18n.h>
 #include <libgnomevfs/gnome-vfs.h>