systemadm: format dates in local time

[elogind.git] / systemadm.vala

diff --git a/systemadm.vala b/systemadm.vala
index deb1be005a6958bb9350ef4e7196b83a0feaf609..167340cc9ca56251abc37b73f062d3353a5430ed 100644 (file)
--- a/systemadm.vala
+++ b/systemadm.vala
@@ -385,8 +385,19 @@ public class MainWindow : Window {
                 current_unit_id = unit.id;
 
                 unit_id_label.set_text_or_na(current_unit_id);
-                unit_aliases_label.set_text_or_na(string.joinv("\n", unit.names));
 
+                string a = "";
+                foreach (string i in unit.names) {
+                        if (i == current_unit_id)
+                                continue;
+
+                        if (a == "")
+                                a = i;
+                        else
+                                a += "\n" + i;
+                }
+
+                unit_aliases_label.set_text_or_na(a);
                 unit_description_label.set_text_or_na(unit.description);
                 unit_load_state_label.set_text_or_na(unit.load_state);
                 unit_active_state_label.set_text_or_na(unit.active_state);
@@ -395,14 +406,14 @@ public class MainWindow : Window {
 
                 uint64 t = unit.active_enter_timestamp;
                 if (t > 0) {
-                        Time timestamp = Time.gm((time_t) (t / 1000000));
+                        Time timestamp = Time.local((time_t) (t / 1000000));
                         unit_active_enter_timestamp_label.set_text_or_na(timestamp.format("%a, %d %b %Y %H:%M:%S %z"));
                 } else
                         unit_active_enter_timestamp_label.set_text_or_na();
 
                 t = unit.active_exit_timestamp;
                 if (t > 0) {
-                        Time timestamp = Time.gm((time_t) (t / 1000000));
+                        Time timestamp = Time.local((time_t) (t / 1000000));
                         unit_active_exit_timestamp_label.set_text_or_na(timestamp.format("%a, %d %b %Y %H:%M:%S %z"));
                 } else
                         unit_active_exit_timestamp_label.set_text_or_na();