summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjacob berkman <jacob@ximian.com>2002-04-25 16:25:07 +0000
committerJacob Berkman <jberkman@src.gnome.org>2002-04-25 16:25:07 +0000
commite691b664e3cd92651264e67a6b40b7c9e1b67db2 (patch)
tree4dff60ec851ec45ce10fd76536d9a5d5328ee295
parent4ee70f07802de8eaec95f4a78bbdf3d6177b9cf6 (diff)
downloadmetacity-e691b664e3cd92651264e67a6b40b7c9e1b67db2.tar.gz
g_file_get_contents() takes a gsize not int (fixes bus error on 64-bit
2002-04-25 jacob berkman <jacob@ximian.com> * src/session.c (load_state): g_file_get_contents() takes a gsize not int (fixes bus error on 64-bit platforms)
-rw-r--r--ChangeLog5
-rw-r--r--src/session.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3905730a..6eb0f6f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-25 jacob berkman <jacob@ximian.com>
+
+ * src/session.c (load_state): g_file_get_contents() takes a gsize
+ not int (fixes bus error on 64-bit platforms)
+
2002-04-22 Havoc Pennington <hp@redhat.com>
* src/main.c (main): call setlocale ourselves because due to a
diff --git a/src/session.c b/src/session.c
index 748cdbf1..5facaea9 100644
--- a/src/session.c
+++ b/src/session.c
@@ -976,7 +976,7 @@ load_state (const char *previous_save_file)
GError *error;
ParseData parse_data;
char *text;
- int length;
+ gsize length;
char *session_file;
session_file = g_strconcat (g_get_home_dir (),