Merge lp:~marcus-lundgren/granite/fix-1008009-1012077 into lp:~elementary-pantheon/granite/granite

[Cody Garver]

[Sergey "Shnatsel" Davidoff (shnatsel)]

This is in fact a direct copypaste from Varka and a fix for bug #958914, the root cause of those bugs

[xapantu (xapantu)]

Looks good to me :)

Feel free to merge it if it works :)

review: Approve

[Rico Tzschichholz (ricotz)]

The copyright statement is wrong, this is coming from plank NOT varka.

I am bit concerned about abi breaks here which should be looked into. And should lead to a soname bump if it is the case.

[lp:~marcus-lundgren/granite/fix-1008009-1012077]

269. By Marcus Lundgren on 2012-06-17

Replaced function bodies with the ones present in plank.

270. By Marcus Lundgren on 2012-06-17

Cleaning up the diff.

271. By Marcus Lundgren on 2012-06-17

Cleaning up the diff.

272. By Marcus Lundgren on 2012-06-17

'Fixed' the problem with renaming files. Read comments in the source for information.

273. By Marcus Lundgren on 2012-06-17

Changed parameters in print_log.

274. By Marcus Lundgren on 2012-06-17

Clean up.

275. By Marcus Lundgren on 2012-06-17

Clean up.

[Rico Tzschichholz (ricotz)]

looks clean and easy enough now

review: Approve

[Marcus Lundgren (marcus-lundgren)]

*For future reference* This is not a direct copy of plank's logger, as it had the same problem as before. The fix is my own creation, as I noticed that creating new LogMessages in the write method threw an exception during certain circumstances. This is why the print_log method is changed to handle a LogLevel and a string instead of a LogMessage.

While I am at it, I don't think this actually fixes the threading problem in the logger, as the enqueuing will try and create a new LogMessage which might throw a similar exception (I was unable to reach this place in the logger during my testing). It is however possible that it will work, since creating a new LogMessage works most of the time, as that is how it worked before this branch was merged.

=== modified file 'lib/Services/Logger.vala'
--- lib/Services/Logger.vala	2012-06-17 17:34:38 +0000
+++ lib/Services/Logger.vala	2012-06-17 23:55:24 +0000
@@ -123,22 +123,22 @@
                         log_queue = new List<LogMessage> ();
                     
                     foreach (var log in logs)
-                        print_log (log);
+                        print_log (log.Level, log.Message);
                 }
                 
-                print_log (new LogMessage (level, msg));
+                print_log (level, msg);
                 
                 is_writing = false;
             }
         }
         
-        static void print_log (LogMessage log) {
+        static void print_log (LogLevel level, string msg) {
         
-            set_color_for_level (log.Level);
-            stdout.printf ("[%s %s]", log.Level.to_string ().substring (27), get_time ());
+            set_color_for_level (level);
+            stdout.printf ("[%s %s]", level.to_string ().substring (27), get_time ());
             
             reset_color ();
-            stdout.printf (" %s\n", log.Message);
+            stdout.printf (" %s\n", msg);
         }
         
         static void set_color_for_level (LogLevel level) {