Merge lp:~ted/policykit-unity8/lp1579837-fallback-true into lp:policykit-unity8

[Ted Gould]

Setup Agent so that it is the fallback agent

We're dealing with where USS wants to be its own agent. Fine, we'll let it, whatevs.

[lp:~ted/policykit-unity8/lp1579837-fallback-true]

10. By Ted Gould on 2016-05-09

Switch to vardict and add a clarifying comment

11. By Ted Gould on 2016-05-09

Code formatting

[Charles Kerr (charlesk)]

LGTM. Thanks, Ted!

review: Approve

=== modified file 'service/agent.cpp'
--- service/agent.cpp	2016-04-14 18:23:56 +0000
+++ service/agent.cpp	2016-05-09 22:16:51 +0000
@@ -44,11 +44,19 @@
         /* Build our Agent subclass */
         auto glibagent = std::shared_ptr<AgentGlib>(agent_glib_new(this), [](AgentGlib *ptr) { g_clear_object(&ptr); });
 
+        /* Setup registration options */
+        GVariantBuilder builder;
+        g_variant_builder_init(&builder, G_VARIANT_TYPE_VARDICT);
+        /* Makes us the fallback agent so that system settings can override
+           when it is setting multiple password settings all at once. */
+        g_variant_builder_add_parsed(&builder, "{'fallback', true}");
+
         /* Register it */
         GError *registererror = nullptr;
-        gpointer registration_handle = polkit_agent_listener_register(
+        gpointer registration_handle = polkit_agent_listener_register_with_options(
             reinterpret_cast<PolkitAgentListener *>(glibagent.get()), POLKIT_AGENT_REGISTER_FLAGS_NONE, subject.get(),
-            "/com/canonical/unity8/policyKit", _thread.getCancellable().get(), &registererror);
+            "/com/canonical/unity8/policyKit", g_variant_builder_end(&builder), _thread.getCancellable().get(),
+            &registererror);
         if (registererror != nullptr)
         {
             auto memwrapper = std::shared_ptr<GError>(registererror, [](GError *error) { g_error_free(error); });
 
=== modified file 'tests/policykit-mock.h'
--- tests/policykit-mock.h	2016-03-21 17:08:17 +0000
+++ tests/policykit-mock.h	2016-05-09 22:16:51 +0000
@@ -46,8 +46,8 @@
         baseobj = dbus_test_dbus_mock_get_object(mock, "/org/freedesktop/PolicyKit1/Authority",
                                                  "org.freedesktop.PolicyKit1.Authority", nullptr);
 
-        dbus_test_dbus_mock_object_add_method(mock, baseobj, "RegisterAuthenticationAgent",
-                                              G_VARIANT_TYPE("((sa{sv})ss)"), nullptr, "", nullptr);
+        dbus_test_dbus_mock_object_add_method(mock, baseobj, "RegisterAuthenticationAgentWithOptions",
+                                              G_VARIANT_TYPE("((sa{sv})ssa{sv})"), nullptr, "", nullptr);
 
         dbus_test_dbus_mock_object_add_method(mock, baseobj, "UnregisterAuthenticationAgent",
                                               G_VARIANT_TYPE("((sa{sv})s)"), nullptr, "", nullptr);