From 7a1337c760ed6302ff884b87e9a1a59afbeeafae Mon Sep 17 00:00:00 2001
From: Hylke Bons <hylkebons@gmail.com>
Date: Thu, 21 Oct 2010 18:49:53 +0100
Subject: [PATCH] [log] align timestamps to the right

---
 SparkleShare/SparkleDialog.cs |  6 +++---
 SparkleShare/SparkleLog.cs    | 26 ++++++++++++++++++--------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/SparkleShare/SparkleDialog.cs b/SparkleShare/SparkleDialog.cs
index a317b9df..d59785de 100644
--- a/SparkleShare/SparkleDialog.cs
+++ b/SparkleShare/SparkleDialog.cs
@@ -92,10 +92,10 @@ Contributors:
 	Steven Harms (sharms@ubuntu.com)
 	Vincent Untz (vuntz@gnome.org)
 
-Thanks very much!
+Thanks very much!";
 
 
-Git# is Copyright © 2007-2009 by the Git Development Community
+/* Git# is Copyright © 2007-2009 by the Git Development Community
 See source file headers for specific contributor copyrights.
 
 All rights reserved.
@@ -144,7 +144,7 @@ version 2.1 of the License, or (at your option) any later version.
 This library is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU Lesser General Public License for more details.";
+GNU Lesser General Public License for more details."; */
 
 			VBox wrapper = new VBox (false, 0);
 
diff --git a/SparkleShare/SparkleLog.cs b/SparkleShare/SparkleLog.cs
index 48c01e16..3bbec069 100644
--- a/SparkleShare/SparkleLog.cs
+++ b/SparkleShare/SparkleLog.cs
@@ -129,6 +129,7 @@ namespace SparkleShare {
 				dialog_buttons.Add (open_folder_button);
 				dialog_buttons.Add (close_button);
 
+			LayoutVertical.PackStart (new HSeparator (), false, false, 0);
 			// We have to hide the menubar somewhere...
 			LayoutVertical.PackStart (MenuBar, false, false, 0);
 			LayoutVertical.PackStart (dialog_buttons, false, false, 0);
@@ -381,15 +382,24 @@ namespace SparkleShare {
 
 					}
 
-					Label change_set_info = new Label ("<b>" + change_set.UserName + "</b>\n" +
-					                                   "<span fgcolor='" + secondary_text_color +"'><small>" +
-					                                   "at " + change_set.DateTime.ToString ("H:mm") +
-					                                   "</small></span>") {
-						UseMarkup = true,
-						Xalign = 0
-					};
+					HBox change_set_info_hbox = new HBox (false, 0);
 
-					log_entry.PackStart (change_set_info, false, false, 0);
+						Label change_set_info = new Label ("<b>" + change_set.UserName + "</b>") {
+							UseMarkup = true,
+							Xalign = 0
+						};
+					
+						Label change_set_time = new Label ("<span fgcolor='" + secondary_text_color +"'><small>" +
+							                               change_set.DateTime.ToString ("H:mm") +
+							                               "</small></span>") {
+							Xalign = 1,
+							UseMarkup = true
+						};
+
+					change_set_info_hbox.PackStart (change_set_info, true, true, 0);
+					change_set_info_hbox.PackStart (change_set_time, false, false, 0);
+
+					log_entry.PackStart (change_set_info_hbox, false, false, 0);
 					                   
 					if (edited_files.Children.Length > 0) {