systemadm: catch exceptions generated by dbus

Otherwise, access-denied dbus errors were not caught, and only
caused a message to be printed out on the console. After this
change a proper popup window pops up :).

diff --git a/src/systemadm.vala b/src/systemadm.vala
index e7fa35402d6385aa6f9951128c8aa400392792cf..d4208008fe2aed334864af93a6b0432b5fa4ee50 100644 (file)
--- a/src/systemadm.vala
+++ b/src/systemadm.vala
@@ -642,7 +642,7 @@ public class MainWindow : Window {
 
                 try {
                         u.start("replace");
 
                 try {
                         u.start("replace");

-                } catch (IOError e) {
+                } catch (Error e) {

                         show_error(e.message);
                 }
         }
                         show_error(e.message);
                 }
         }


@@ -655,7 +655,7 @@ public class MainWindow : Window {
 
                 try {
                         u.stop("replace");
 
                 try {
                         u.stop("replace");

-                } catch (IOError e) {
+                } catch (Error e) {

                         show_error(e.message);
                 }
         }
                         show_error(e.message);
                 }
         }


@@ -668,7 +668,7 @@ public class MainWindow : Window {
 
                 try {
                         u.reload("replace");
 
                 try {
                         u.reload("replace");

-                } catch (IOError e) {
+                } catch (Error e) {

                         show_error(e.message);
                 }
         }
                         show_error(e.message);
                 }
         }


@@ -681,7 +681,7 @@ public class MainWindow : Window {
 
                 try {
                         u.restart("replace");
 
                 try {
                         u.restart("replace");

-                } catch (IOError e) {
+                } catch (Error e) {

                         show_error(e.message);
                 }
         }
                         show_error(e.message);
                 }
         }


@@ -694,7 +694,7 @@ public class MainWindow : Window {
 
                 try {
                         j.cancel();
 
                 try {
                         j.cancel();

-                } catch (IOError e) {
+                } catch (Error e) {

                         show_error(e.message);
                 }
         }
                         show_error(e.message);
                 }
         }


@@ -722,7 +722,7 @@ public class MainWindow : Window {
                                        4, u.sub_state,
                                        5, t != "" ? "→ %s".printf(t) : "",
                                        6, u);
                                        4, u.sub_state,
                                        5, t != "" ? "→ %s".printf(t) : "",
                                        6, u);

-                } catch (IOError e) {
+                } catch (Error e) {

                         show_error(e.message);
                 }
         }
                         show_error(e.message);
                 }
         }


@@ -748,7 +748,7 @@ public class MainWindow : Window {
                         unit_map[id] = u;
 
                         update_unit_iter(iter, id, u);
                         unit_map[id] = u;
 
                         update_unit_iter(iter, id, u);

-                } catch (IOError e) {
+                } catch (Error e) {

                         show_error(e.message);
                 }
         }
                         show_error(e.message);
                 }
         }


@@ -784,7 +784,7 @@ public class MainWindow : Window {
 
                         update_job_iter(iter, id, j);
 
 
                         update_job_iter(iter, id, j);
 

-                } catch (IOError e) {
+                } catch (Error e) {

                         show_error(e.message);
                 }
         }
                         show_error(e.message);
                 }
         }


@@ -866,7 +866,7 @@ public class MainWindow : Window {
 
                         } while (unit_model.iter_next(ref iter));
 
 
                         } while (unit_model.iter_next(ref iter));
 

-                } catch (IOError e) {
+                } catch (Error e) {

                         show_error(e.message);
                 }
         }
                         show_error(e.message);
                 }
         }


@@ -902,7 +902,7 @@ public class MainWindow : Window {
 
                         } while (job_model.iter_next(ref iter));
 
 
                         } while (job_model.iter_next(ref iter));
 

-                } catch (IOError e) {
+                } catch (Error e) {

                         show_error(e.message);
                 }
         }
                         show_error(e.message);
                 }
         }


@@ -957,7 +957,7 @@ public class MainWindow : Window {
         public void on_server_reload() {
                 try {
                         manager.reload();
         public void on_server_reload() {
                 try {
                         manager.reload();

-                } catch (IOError e) {
+                } catch (Error e) {

                         show_error(e.message);
                 }
         }
                         show_error(e.message);
                 }
         }


@@ -969,7 +969,7 @@ public class MainWindow : Window {
                         if (unit_type_combo_box.get_active() != 0)
                                 unit_type_combo_box.set_active(8);
 
                         if (unit_type_combo_box.get_active() != 0)
                                 unit_type_combo_box.set_active(8);
 

-                } catch (IOError e) {
+                } catch (Error e) {

                         show_error(e.message);
                 }
         }
                         show_error(e.message);
                 }
         }


@@ -998,7 +998,7 @@ public class MainWindow : Window {
                         m.destroy();
 
                         show_unit(u);
                         m.destroy();
 
                         show_unit(u);

-                } catch (IOError e) {
+                } catch (Error e) {

                         show_error(e.message);
                 }
         }
                         show_error(e.message);
                 }
         }


@@ -1018,7 +1018,7 @@ public class MainWindow : Window {
                                         path);
 
                         show_unit(u);
                                         path);
 
                         show_unit(u);

-                } catch (IOError e) {
+                } catch (Error e) {

                         show_error(e.message);
                 }
 
                         show_error(e.message);
                 }