diff options
Diffstat (limited to 'extra/polkit-qt')
-rw-r--r-- | extra/polkit-qt/fix-deprecated-warnings.patch | 41 | ||||
-rw-r--r-- | extra/polkit-qt/null-checking.patch | 14 |
2 files changed, 0 insertions, 55 deletions
diff --git a/extra/polkit-qt/fix-deprecated-warnings.patch b/extra/polkit-qt/fix-deprecated-warnings.patch deleted file mode 100644 index fa136b0ff..000000000 --- a/extra/polkit-qt/fix-deprecated-warnings.patch +++ /dev/null @@ -1,41 +0,0 @@ -Index: core/polkitqt1-authority.cpp -=================================================================== ---- core/polkitqt1-authority.cpp (revision 1183413) -+++ core/polkitqt1-authority.cpp (working copy) -@@ -177,12 +177,17 @@ - m_revokeTemporaryAuthorizationsCancellable = g_cancellable_new(); - m_revokeTemporaryAuthorizationCancellable = g_cancellable_new(); - -+ GError *gerror = NULL; - if (pkAuthority == NULL) { -- pkAuthority = polkit_authority_get(); -+ pkAuthority = polkit_authority_get_sync(NULL, &gerror); -+ if (gerror != NULL) { -+ setError(E_GetAuthority, gerror->message); -+ g_error_free(gerror); -+ return; -+ } - } - - if (pkAuthority == NULL) { -- (E_GetAuthority); - return; - } - -Index: agent/polkitqt1-agent-listener.cpp -=================================================================== ---- agent/polkitqt1-agent-listener.cpp (revision 1183413) -+++ agent/polkitqt1-agent-listener.cpp (working copy) -@@ -73,9 +73,11 @@ - { - GError *error = NULL; - -- bool r = polkit_agent_register_listener(d->listener, -+ bool r = polkit_agent_listener_register(d->listener, -+ POLKIT_AGENT_REGISTER_FLAGS_RUN_IN_THREAD, - subject->subject(), - objectPath.toAscii().data(), -+ NULL, - &error); - if (error != NULL) { - qWarning() << QString("Cannot register authentication agent: %1").arg(error->message); diff --git a/extra/polkit-qt/null-checking.patch b/extra/polkit-qt/null-checking.patch deleted file mode 100644 index 0ec2a8e38..000000000 --- a/extra/polkit-qt/null-checking.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: agent/polkitqt1-agent-listener.cpp -=================================================================== ---- agent/polkitqt1-agent-listener.cpp (revision 1183495) -+++ agent/polkitqt1-agent-listener.cpp (working copy) -@@ -66,7 +66,8 @@ - qDebug("Destroying listener"); - - ListenerAdapter::instance()->removeListener(this); -- g_object_unref(d->listener); -+ if (d->listener != NULL) -+ g_object_unref(d->listener); - } - - bool Listener::registerListener(PolkitQt1::Subject *subject, const QString &objectPath) |