|
Michal Schmidt |
e43452 |
From 328238ca7c52a658089aa5c8ba0d63dfeaf3c2bd Mon Sep 17 00:00:00 2001
|
|
Michal Schmidt |
e43452 |
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
Michal Schmidt |
e43452 |
Date: Thu, 24 Feb 2011 16:30:55 +0100
|
|
Michal Schmidt |
f1996e |
Subject: [PATCH] systemadm: catch exceptions generated by dbus
|
|
Michal Schmidt |
e43452 |
|
|
Michal Schmidt |
e43452 |
Otherwise, access-denied dbus errors were not caught, and only
|
|
Michal Schmidt |
e43452 |
caused a message to be printed out on the console. After this
|
|
Michal Schmidt |
e43452 |
change a proper popup window pops up :).
|
|
Michal Schmidt |
e43452 |
(cherry picked from commit 734b60d7961a28adab45ef141807a0f3e0ba11e5)
|
|
Michal Schmidt |
e43452 |
---
|
|
Michal Schmidt |
e43452 |
src/systemadm.vala | 28 ++++++++++++++--------------
|
|
Michal Schmidt |
e43452 |
1 files changed, 14 insertions(+), 14 deletions(-)
|
|
Michal Schmidt |
e43452 |
|
|
Michal Schmidt |
e43452 |
diff --git a/src/systemadm.vala b/src/systemadm.vala
|
|
Michal Schmidt |
e43452 |
index e7fa354..d420800 100644
|
|
Michal Schmidt |
e43452 |
--- a/src/systemadm.vala
|
|
Michal Schmidt |
e43452 |
+++ b/src/systemadm.vala
|
|
Michal Schmidt |
e43452 |
@@ -642,7 +642,7 @@ public class MainWindow : Window {
|
|
Michal Schmidt |
e43452 |
|
|
Michal Schmidt |
e43452 |
try {
|
|
Michal Schmidt |
e43452 |
u.start("replace");
|
|
Michal Schmidt |
e43452 |
- } catch (IOError e) {
|
|
Michal Schmidt |
e43452 |
+ } catch (Error e) {
|
|
Michal Schmidt |
e43452 |
show_error(e.message);
|
|
Michal Schmidt |
e43452 |
}
|
|
Michal Schmidt |
e43452 |
}
|
|
Michal Schmidt |
e43452 |
@@ -655,7 +655,7 @@ public class MainWindow : Window {
|
|
Michal Schmidt |
e43452 |
|
|
Michal Schmidt |
e43452 |
try {
|
|
Michal Schmidt |
e43452 |
u.stop("replace");
|
|
Michal Schmidt |
e43452 |
- } catch (IOError e) {
|
|
Michal Schmidt |
e43452 |
+ } catch (Error e) {
|
|
Michal Schmidt |
e43452 |
show_error(e.message);
|
|
Michal Schmidt |
e43452 |
}
|
|
Michal Schmidt |
e43452 |
}
|
|
Michal Schmidt |
e43452 |
@@ -668,7 +668,7 @@ public class MainWindow : Window {
|
|
Michal Schmidt |
e43452 |
|
|
Michal Schmidt |
e43452 |
try {
|
|
Michal Schmidt |
e43452 |
u.reload("replace");
|
|
Michal Schmidt |
e43452 |
- } catch (IOError e) {
|
|
Michal Schmidt |
e43452 |
+ } catch (Error e) {
|
|
Michal Schmidt |
e43452 |
show_error(e.message);
|
|
Michal Schmidt |
e43452 |
}
|
|
Michal Schmidt |
e43452 |
}
|
|
Michal Schmidt |
e43452 |
@@ -681,7 +681,7 @@ public class MainWindow : Window {
|
|
Michal Schmidt |
e43452 |
|
|
Michal Schmidt |
e43452 |
try {
|
|
Michal Schmidt |
e43452 |
u.restart("replace");
|
|
Michal Schmidt |
e43452 |
- } catch (IOError e) {
|
|
Michal Schmidt |
e43452 |
+ } catch (Error e) {
|
|
Michal Schmidt |
e43452 |
show_error(e.message);
|
|
Michal Schmidt |
e43452 |
}
|
|
Michal Schmidt |
e43452 |
}
|
|
Michal Schmidt |
e43452 |
@@ -694,7 +694,7 @@ public class MainWindow : Window {
|
|
Michal Schmidt |
e43452 |
|
|
Michal Schmidt |
e43452 |
try {
|
|
Michal Schmidt |
e43452 |
j.cancel();
|
|
Michal Schmidt |
e43452 |
- } catch (IOError e) {
|
|
Michal Schmidt |
e43452 |
+ } catch (Error e) {
|
|
Michal Schmidt |
e43452 |
show_error(e.message);
|
|
Michal Schmidt |
e43452 |
}
|
|
Michal Schmidt |
e43452 |
}
|
|
Michal Schmidt |
e43452 |
@@ -722,7 +722,7 @@ public class MainWindow : Window {
|
|
Michal Schmidt |
e43452 |
4, u.sub_state,
|
|
Michal Schmidt |
e43452 |
5, t != "" ? "→ %s".printf(t) : "",
|
|
Michal Schmidt |
e43452 |
6, u);
|
|
Michal Schmidt |
e43452 |
- } catch (IOError e) {
|
|
Michal Schmidt |
e43452 |
+ } catch (Error e) {
|
|
Michal Schmidt |
e43452 |
show_error(e.message);
|
|
Michal Schmidt |
e43452 |
}
|
|
Michal Schmidt |
e43452 |
}
|
|
Michal Schmidt |
e43452 |
@@ -748,7 +748,7 @@ public class MainWindow : Window {
|
|
Michal Schmidt |
e43452 |
unit_map[id] = u;
|
|
Michal Schmidt |
e43452 |
|
|
Michal Schmidt |
e43452 |
update_unit_iter(iter, id, u);
|
|
Michal Schmidt |
e43452 |
- } catch (IOError e) {
|
|
Michal Schmidt |
e43452 |
+ } catch (Error e) {
|
|
Michal Schmidt |
e43452 |
show_error(e.message);
|
|
Michal Schmidt |
e43452 |
}
|
|
Michal Schmidt |
e43452 |
}
|
|
Michal Schmidt |
e43452 |
@@ -784,7 +784,7 @@ public class MainWindow : Window {
|
|
Michal Schmidt |
e43452 |
|
|
Michal Schmidt |
e43452 |
update_job_iter(iter, id, j);
|
|
Michal Schmidt |
e43452 |
|
|
Michal Schmidt |
e43452 |
- } catch (IOError e) {
|
|
Michal Schmidt |
e43452 |
+ } catch (Error e) {
|
|
Michal Schmidt |
e43452 |
show_error(e.message);
|
|
Michal Schmidt |
e43452 |
}
|
|
Michal Schmidt |
e43452 |
}
|
|
Michal Schmidt |
e43452 |
@@ -866,7 +866,7 @@ public class MainWindow : Window {
|
|
Michal Schmidt |
e43452 |
|
|
Michal Schmidt |
e43452 |
} while (unit_model.iter_next(ref iter));
|
|
Michal Schmidt |
e43452 |
|
|
Michal Schmidt |
e43452 |
- } catch (IOError e) {
|
|
Michal Schmidt |
e43452 |
+ } catch (Error e) {
|
|
Michal Schmidt |
e43452 |
show_error(e.message);
|
|
Michal Schmidt |
e43452 |
}
|
|
Michal Schmidt |
e43452 |
}
|
|
Michal Schmidt |
e43452 |
@@ -902,7 +902,7 @@ public class MainWindow : Window {
|
|
Michal Schmidt |
e43452 |
|
|
Michal Schmidt |
e43452 |
} while (job_model.iter_next(ref iter));
|
|
Michal Schmidt |
e43452 |
|
|
Michal Schmidt |
e43452 |
- } catch (IOError e) {
|
|
Michal Schmidt |
e43452 |
+ } catch (Error e) {
|
|
Michal Schmidt |
e43452 |
show_error(e.message);
|
|
Michal Schmidt |
e43452 |
}
|
|
Michal Schmidt |
e43452 |
}
|
|
Michal Schmidt |
e43452 |
@@ -957,7 +957,7 @@ public class MainWindow : Window {
|
|
Michal Schmidt |
e43452 |
public void on_server_reload() {
|
|
Michal Schmidt |
e43452 |
try {
|
|
Michal Schmidt |
e43452 |
manager.reload();
|
|
Michal Schmidt |
e43452 |
- } catch (IOError e) {
|
|
Michal Schmidt |
e43452 |
+ } catch (Error e) {
|
|
Michal Schmidt |
e43452 |
show_error(e.message);
|
|
Michal Schmidt |
e43452 |
}
|
|
Michal Schmidt |
e43452 |
}
|
|
Michal Schmidt |
e43452 |
@@ -969,7 +969,7 @@ public class MainWindow : Window {
|
|
Michal Schmidt |
e43452 |
if (unit_type_combo_box.get_active() != 0)
|
|
Michal Schmidt |
e43452 |
unit_type_combo_box.set_active(8);
|
|
Michal Schmidt |
e43452 |
|
|
Michal Schmidt |
e43452 |
- } catch (IOError e) {
|
|
Michal Schmidt |
e43452 |
+ } catch (Error e) {
|
|
Michal Schmidt |
e43452 |
show_error(e.message);
|
|
Michal Schmidt |
e43452 |
}
|
|
Michal Schmidt |
e43452 |
}
|
|
Michal Schmidt |
e43452 |
@@ -998,7 +998,7 @@ public class MainWindow : Window {
|
|
Michal Schmidt |
e43452 |
m.destroy();
|
|
Michal Schmidt |
e43452 |
|
|
Michal Schmidt |
e43452 |
show_unit(u);
|
|
Michal Schmidt |
e43452 |
- } catch (IOError e) {
|
|
Michal Schmidt |
e43452 |
+ } catch (Error e) {
|
|
Michal Schmidt |
e43452 |
show_error(e.message);
|
|
Michal Schmidt |
e43452 |
}
|
|
Michal Schmidt |
e43452 |
}
|
|
Michal Schmidt |
e43452 |
@@ -1018,7 +1018,7 @@ public class MainWindow : Window {
|
|
Michal Schmidt |
e43452 |
path);
|
|
Michal Schmidt |
e43452 |
|
|
Michal Schmidt |
e43452 |
show_unit(u);
|
|
Michal Schmidt |
e43452 |
- } catch (IOError e) {
|
|
Michal Schmidt |
e43452 |
+ } catch (Error e) {
|
|
Michal Schmidt |
e43452 |
show_error(e.message);
|
|
Michal Schmidt |
e43452 |
}
|
|
Michal Schmidt |
e43452 |
|
|
Michal Schmidt |
e43452 |
--
|
|
Michal Schmidt |
e43452 |
1.7.7.5
|
|
Michal Schmidt |
e43452 |
|