From 328238ca7c52a658089aa5c8ba0d63dfeaf3c2bd Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>

Date: Thu, 24 Feb 2011 16:30:55 +0100

Subject: [PATCH] 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 :).

(cherry picked from commit 734b60d7961a28adab45ef141807a0f3e0ba11e5)

---

 src/systemadm.vala |   28 ++++++++++++++--------------

 1 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/systemadm.vala b/src/systemadm.vala

index e7fa354..d420800 100644

--- a/src/systemadm.vala

+++ b/src/systemadm.vala

@@ -642,7 +642,7 @@ public class MainWindow : Window {

                 try {

                         u.start("replace");

-                } catch (IOError e) {

+                } catch (Error e) {

                         show_error(e.message);

                 }

         }

@@ -655,7 +655,7 @@ public class MainWindow : Window {

                 try {

                         u.stop("replace");

-                } catch (IOError e) {

+                } catch (Error e) {

                         show_error(e.message);

                 }

         }

@@ -668,7 +668,7 @@ public class MainWindow : Window {

                 try {

                         u.reload("replace");

-                } catch (IOError e) {

+                } catch (Error e) {

                         show_error(e.message);

                 }

         }

@@ -681,7 +681,7 @@ public class MainWindow : Window {

                 try {

                         u.restart("replace");

-                } catch (IOError e) {

+                } catch (Error e) {

                         show_error(e.message);

                 }

         }

@@ -694,7 +694,7 @@ public class MainWindow : Window {

                 try {

                         j.cancel();

-                } catch (IOError e) {

+                } catch (Error e) {

                         show_error(e.message);

                 }

         }

@@ -722,7 +722,7 @@ public class MainWindow : Window {

                                        4, u.sub_state,

                                        5, t != "" ? "→ %s".printf(t) : "",

                                        6, u);

-                } catch (IOError e) {

+                } catch (Error e) {

                         show_error(e.message);

                 }

         }

@@ -748,7 +748,7 @@ public class MainWindow : Window {

                         unit_map[id] = u;

                         update_unit_iter(iter, id, u);

-                } catch (IOError e) {

+                } catch (Error e) {

                         show_error(e.message);

                 }

         }

@@ -784,7 +784,7 @@ public class MainWindow : Window {

                         update_job_iter(iter, id, j);

-                } catch (IOError e) {

+                } catch (Error e) {

                         show_error(e.message);

                 }

         }

@@ -866,7 +866,7 @@ public class MainWindow : Window {

                         } while (unit_model.iter_next(ref iter));

-                } catch (IOError e) {

+                } catch (Error e) {

                         show_error(e.message);

                 }

         }

@@ -902,7 +902,7 @@ public class MainWindow : Window {

                         } while (job_model.iter_next(ref iter));

-                } catch (IOError e) {

+                } catch (Error e) {

                         show_error(e.message);

                 }

         }

@@ -957,7 +957,7 @@ public class MainWindow : Window {

         public void on_server_reload() {

                 try {

                         manager.reload();

-                } catch (IOError e) {

+                } catch (Error e) {

                         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);

-                } catch (IOError e) {

+                } catch (Error e) {

                         show_error(e.message);

                 }

         }

@@ -998,7 +998,7 @@ public class MainWindow : Window {

                         m.destroy();

                         show_unit(u);

-                } catch (IOError e) {

+                } catch (Error e) {

                         show_error(e.message);

                 }

         }

@@ -1018,7 +1018,7 @@ public class MainWindow : Window {

                                         path);

                         show_unit(u);

-                } catch (IOError e) {

+                } catch (Error e) {

                         show_error(e.message);

                 }