from galeon. Don't assume sizeof(gsize) == sizeof(guint) makes epiphany

2003-04-19  Marco Pesenti Gritti  <marco@it.gnome.org>

	* embed/mozilla/FilePicker.cpp:

	from galeon. Don't assume sizeof(gsize) == sizeof(guint)
        makes epiphany build better on 64-bit architectures

2 files changed, 11 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 24c5f4679..aa425f8bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-04-19  Marco Pesenti Gritti  <marco@it.gnome.org>
+
+	* embed/mozilla/FilePicker.cpp:
+
+	from galeon. Don't assume sizeof(gsize) == sizeof(guint)
+        makes epiphany build better on 64-bit architectures
+
 2003-04-19  Erich Lesh <eclesh@pacbell.net>
 
 	* data/starthere/smartbookmarks.xml.in:
diff --git a/embed/mozilla/FilePicker.cpp b/embed/mozilla/FilePicker.cpp
index 277a5a3a3..8ae5429f7 100644
--- a/embed/mozilla/FilePicker.cpp
+++ b/embed/mozilla/FilePicker.cpp
@@ -143,9 +143,9 @@ NS_IMETHODIMP GFilePicker::SetFilterIndex(PRInt32 aFilterIndex)
 /* attribute wstring defaultString; */
 NS_IMETHODIMP GFilePicker::GetDefaultString(PRUnichar * *aDefaultString)
 {
-	guint bytesRead(0), bytesWritten(0);
+	gsize bytesWritten;
 	gchar *utf8DefaultString = g_filename_to_utf8(mDefaultString.get(), -1,
-						      &bytesRead,
+						      NULL,
 						      &bytesWritten, NULL);
 
 	*aDefaultString = ToNewUnicode(NS_ConvertUTF8toUCS2(utf8DefaultString));
@@ -157,10 +157,10 @@ NS_IMETHODIMP GFilePicker::SetDefaultString(const PRUnichar *aDefaultString)
 {
 	if (aDefaultString)
 	{
-		guint bytesRead(0), bytesWritten(0);
+		gsize bytesWritten;
 		gchar *localeDefaultString =
 			g_filename_from_utf8(NS_ConvertUCS2toUTF8(aDefaultString).get(),
-					     -1, &bytesRead,
+					     -1, NULL,
 					     &bytesWritten, NULL);
 		mDefaultString = localeDefaultString;					     
 		g_free(localeDefaultString);