diff options
Diffstat (limited to 'lib/Utils/Polkit.cpp')
| -rw-r--r-- | lib/Utils/Polkit.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/Utils/Polkit.cpp b/lib/Utils/Polkit.cpp index a5541c9f..f0dc4c79 100644 --- a/lib/Utils/Polkit.cpp +++ b/lib/Utils/Polkit.cpp @@ -27,6 +27,7 @@ #include "Polkit.h" #include "abrtlib.h" +<<<<<<< HEAD /*number of seconds: timeout for the authorization*/ #define POLKIT_TIMEOUT 20 @@ -37,6 +38,8 @@ static gboolean do_cancel(GCancellable* cancellable) return FALSE; } +======= +>>>>>>> 5349d07f9cae8a2b9686916c1e5bd01a0fe14a29 static PolkitResult do_check(PolkitSubject *subject, const char *action_id) { PolkitAuthority *authority; @@ -45,11 +48,14 @@ static PolkitResult do_check(PolkitSubject *subject, const char *action_id) GCancellable * cancellable; authority = polkit_authority_get(); +<<<<<<< HEAD cancellable = g_cancellable_new(); g_timeout_add (POLKIT_TIMEOUT * 1000, (GSourceFunc) do_cancel, cancellable); +======= +>>>>>>> 5349d07f9cae8a2b9686916c1e5bd01a0fe14a29 result = polkit_authority_check_authorization_sync(authority, subject, |