Merge lp:~mterry/unity-greeter/garbage-state into lp:unity-greeter

[Michael Terry]

[Robert Ancell (robert-ancell)]

review: Approve

=== modified file 'src/unity-greeter.vala'
--- src/unity-greeter.vala	2012-04-20 16:50:55 +0000
+++ src/unity-greeter.vala	2012-05-29 16:45:24 +0000
@@ -36,7 +36,7 @@
 
     private static Timer log_timer;
 
-    private File state_file;
+    private string state_file;
     private KeyFile state;
 
     private static Cairo.XlibSurface background_surface;
@@ -119,16 +119,16 @@
         var state_dir = Path.build_filename (Environment.get_user_cache_dir (), "unity-greeter");
         DirUtils.create_with_parents (state_dir, 0775);
 
-        state_file = File.new_for_path (Path.build_filename (state_dir, "state"));
+        state_file = Path.build_filename (state_dir, "state");
         state = new KeyFile ();
         try
         {
-            state.load_from_file (state_file.get_path (), KeyFileFlags.NONE);
+            state.load_from_file (state_file, KeyFileFlags.NONE);
         }
         catch (Error e)
         {
             if (!(e is FileError.NOENT))
-                warning ("Failed to load state from %s: %s\n", state_file.get_path (), e.message);
+                warning ("Failed to load state from %s: %s\n", state_file, e.message);
         }
         var last_user = "";
         try
@@ -490,7 +490,7 @@
         var data = state.to_data ();
         try
         {
-            state_file.replace_contents ((uint8[])data, null, false, FileCreateFlags.NONE, null);
+            FileUtils.set_contents (state_file, data);
         }
         catch (Error e)
         {