chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
strv: add a couple of gcc hints
[elogind.git]
/
systemadm.vala
diff --git
a/systemadm.vala
b/systemadm.vala
index bc4f9403e62c14709027ede7b7c323cf79e3dd67..b1ac12a85f5c3c10743238f0540e3a1c2f74d16f 100644
(file)
--- a/
systemadm.vala
+++ b/
systemadm.vala
@@
-22,6
+22,8
@@
using GLib;
using DBus;
using Pango;
using DBus;
using Pango;
+static bool session = false;
+
public class LeftLabel : Label {
public LeftLabel(string? text = null) {
if (text != null)
public class LeftLabel : Label {
public LeftLabel(string? text = null) {
if (text != null)
@@
-96,7
+98,6
@@
public class MainWindow : Window {
notebook.append_page(job_vbox, new Label("Jobs"));
job_vbox.set_border_width(12);
notebook.append_page(job_vbox, new Label("Jobs"));
job_vbox.set_border_width(12);
-
unit_model = new ListStore(6, typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(Unit));
job_model = new ListStore(5, typeof(string), typeof(string), typeof(string), typeof(string), typeof(Job));
unit_model = new ListStore(6, typeof(string), typeof(string), typeof(string), typeof(string), typeof(string), typeof(Unit));
job_model = new ListStore(5, typeof(string), typeof(string), typeof(string), typeof(string), typeof(Job));
@@
-210,12
+211,12
@@
public class MainWindow : Window {
bbox.pack_start(cancel_button, false, true, 0);
bbox.pack_start(cancel_button, false, true, 0);
- bus = Bus.get(
BusType.SESSION
);
+ bus = Bus.get(
session ? BusType.SESSION : BusType.SYSTEM
);
manager = bus.get_object(
"org.freedesktop.systemd1",
"/org/freedesktop/systemd1",
manager = bus.get_object(
"org.freedesktop.systemd1",
"/org/freedesktop/systemd1",
- "org.freedesktop.systemd1") as Manager;
+ "org.freedesktop.systemd1
.Manager
") as Manager;
manager.unit_new += on_unit_new;
manager.job_new += on_job_new;
manager.unit_new += on_unit_new;
manager.job_new += on_job_new;
@@
-514,14
+515,23
@@
public class MainWindow : Window {
}
}
}
}
+static const OptionEntry entries[] = {
+ { "session", 0, 0, OptionArg.NONE, out session, "Connect to session bus", null },
+ { "system", 0, OptionFlags.REVERSE, OptionArg.NONE, out session, "Connect to system bus", null },
+ { null }
+};
+
int main (string[] args) {
int main (string[] args) {
- Gtk.init(ref args);
try {
try {
+ Gtk.init_with_args(ref args, "[OPTION...]", entries, "systemadm");
+
MainWindow window = new MainWindow();
window.show_all();
} catch (DBus.Error e) {
message("%s", e.message);
MainWindow window = new MainWindow();
window.show_all();
} catch (DBus.Error e) {
message("%s", e.message);
+ } catch (GLib.Error e) {
+ message("%s", e.message);
}
Gtk.main();
}
Gtk.main();