Merge lp:~ted/policykit-unity8/lp1579837-no-exception-on-timeout into lp:policykit-unity8

[Ted Gould]

Replacing that U8 isn't responding with a recoverable error instead of crashing

Make it so that it doesn't look like our fault, but we still figure out issues :-)

[lp:~ted/policykit-unity8/lp1579837-no-exception-on-timeout]

8. By Ted Gould on 2016-05-09

Forgot the packaging

9. By Ted Gould on 2016-05-09

Add in the gcrypt dep

10. By Ted Gould on 2016-05-09

Make it so that we depwait on old whoopsie instead of failing to build

11. By Ted Gould on 2016-05-09

Disable recoverable error until we can get whoopsie in a better state

12. By Ted Gould on 2016-05-09

Forgot to remove it from CMake

[Charles Kerr (charlesk)]

Adding in commented-out lines to debian/ is pretty clumsy.

IMO this would be better with the try-catch for now and adding the whoopsie pieces once the whoopsie FTBFS is resolved.

review: Needs Fixing

[lp:~ted/policykit-unity8/lp1579837-no-exception-on-timeout]

13. By Ted Gould on 2016-05-09

Remove the whoopsie code completely, for now

[Charles Kerr (charlesk)]

review: Approve

=== modified file 'service/authentication.cpp'
--- service/authentication.cpp	2016-04-25 20:57:22 +0000
+++ service/authentication.cpp	2016-05-09 22:24:25 +0000
@@ -230,9 +230,18 @@
 
     g_debug("Showing Notification");
 
-    GError *error = nullptr;
-    notify_notification_show(notification.get(), &error);
-    check_error(error, "Unable to show notification");
+    try
+    {
+        GError *error = nullptr;
+        notify_notification_show(notification.get(), &error);
+        check_error(error, "Unable to show notification");
+    }
+    catch (std::runtime_error &e)
+    {
+        /* We're gonna handle the error here by shutting things
+           now and reporting a recoverable error */
+        cancel();
+    }
 }
 
 /** Hide a notification. This includes closing it if open and free'ing