chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
execute: fix bad jump
[elogind.git]
/
systemadm.vala
diff --git
a/systemadm.vala
b/systemadm.vala
index 167340cc9ca56251abc37b73f062d3353a5430ed..fdc84648dc2cb1108ee214f5b1d761274b918c22 100644
(file)
--- a/
systemadm.vala
+++ b/
systemadm.vala
@@
-486,7
+486,7
@@
public class MainWindow : Window {
try {
u.start("replace");
} catch (DBus.Error e) {
try {
u.start("replace");
} catch (DBus.Error e) {
-
message("%s",
e.message);
+
show_error(
e.message);
}
}
}
}
@@
-499,7
+499,7
@@
public class MainWindow : Window {
try {
u.stop("replace");
} catch (DBus.Error e) {
try {
u.stop("replace");
} catch (DBus.Error e) {
-
message("%s",
e.message);
+
show_error(
e.message);
}
}
}
}
@@
-512,7
+512,7
@@
public class MainWindow : Window {
try {
u.reload("replace");
} catch (DBus.Error e) {
try {
u.reload("replace");
} catch (DBus.Error e) {
-
message("%s",
e.message);
+
show_error(
e.message);
}
}
}
}
@@
-525,7
+525,7
@@
public class MainWindow : Window {
try {
u.restart("replace");
} catch (DBus.Error e) {
try {
u.restart("replace");
} catch (DBus.Error e) {
-
message("%s",
e.message);
+
show_error(
e.message);
}
}
}
}
@@
-538,7
+538,7
@@
public class MainWindow : Window {
try {
j.cancel();
} catch (DBus.Error e) {
try {
j.cancel();
} catch (DBus.Error e) {
-
message("%s",
e.message);
+
show_error(
e.message);
}
}
}
}
@@
-683,7
+683,7
@@
public class MainWindow : Window {
try {
manager.reload();
} catch (DBus.Error e) {
try {
manager.reload();
} catch (DBus.Error e) {
-
message("%s",
e.message);
+
show_error(
e.message);
}
}
}
}
@@
-695,9
+695,19
@@
public class MainWindow : Window {
unit_type_combo_box.set_active(8);
} catch (DBus.Error e) {
unit_type_combo_box.set_active(8);
} catch (DBus.Error e) {
-
message("%s",
e.message);
+
show_error(
e.message);
}
}
}
}
+
+ public void show_error(string e) {
+ var m = new MessageDialog(this,
+ DialogFlags.DESTROY_WITH_PARENT,
+ MessageType.ERROR,
+ ButtonsType.CLOSE, "%s", e);
+ m.run();
+ m.destroy();
+ }
+
}
static const OptionEntry entries[] = {
}
static const OptionEntry entries[] = {
@@
-706,6
+716,12
@@
static const OptionEntry entries[] = {
{ null }
};
{ null }
};
+void show_error(string e) {
+ var m = new MessageDialog(null, 0, MessageType.ERROR, ButtonsType.CLOSE, "%s", e);
+ m.run();
+ m.destroy();
+}
+
int main (string[] args) {
try {
int main (string[] args) {
try {
@@
-716,9
+732,9
@@
int main (string[] args) {
Gtk.main();
} catch (DBus.Error e) {
Gtk.main();
} catch (DBus.Error e) {
-
message("%s",
e.message);
+
show_error(
e.message);
} catch (GLib.Error e) {
} catch (GLib.Error e) {
-
message("%s",
e.message);
+
show_error(
e.message);
}
return 0;
}
return 0;