X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fsystemadm.vala;h=5971ac07e5c46b404bb4e057b9eb1399bcce2666;hb=9ba353983adc026b75a503c1381f6e5c8062f3e0;hp=11189995c88a4f49cc725bdd0ac64fc68e11e5c0;hpb=fe7e28146f30ec442c0dd7f71002a1b482d910a9;p=elogind.git
diff --git a/src/systemadm.vala b/src/systemadm.vala
index 11189995c..5971ac07e 100644
--- a/src/systemadm.vala
+++ b/src/systemadm.vala
@@ -452,7 +452,7 @@ public class MainWindow : Window {
unit_cgroup_label.set_text_or_na();
}
- public string format_unit_link(string i) {
+ public string format_unit_link(string i, bool link) {
Unit? u = get_unit(i);
if(u == null)
return "" + i + ""
+ i + "(" +
u.sub_state + ")" + "";
- return " " + span + "";
+ if(link)
+ return " " + span + "";
+ else
+ return span;
}
@@ -493,7 +496,7 @@ public class MainWindow : Window {
first = false;
}
- r += format_unit_link(i);
+ r += format_unit_link(i, true);
}
return r;
@@ -502,7 +505,7 @@ public class MainWindow : Window {
public void show_unit(Unit unit) {
current_unit_id = unit.id;
- string id_display = current_unit_id;
+ string id_display = format_unit_link(current_unit_id, false);
bool has_alias = false;
foreach (string i in unit.names) {
if (i == current_unit_id)
@@ -518,7 +521,7 @@ public class MainWindow : Window {
if(has_alias)
id_display += ")";
- unit_id_label.set_text_or_na(id_display);
+ unit_id_label.set_markup_or_na(id_display);
string[]
requires = unit.requires,
@@ -564,7 +567,9 @@ public class MainWindow : Window {
string fp = unit.fragment_path;
if (fp != "")
- unit_fragment_path_label.set_markup_or_na("" + fp + "" );
+ unit_fragment_path_label.set_markup_or_na(
+ "" +
+ "" + fp + "");
else
unit_fragment_path_label.set_text_or_na();