diff options
author | dnovotny <danny@rawhide.localdomain> | 2009-09-16 10:59:23 -0400 |
---|---|---|
committer | dnovotny <danny@rawhide.localdomain> | 2009-09-16 10:59:23 -0400 |
commit | 440ba3ddc846d94eed516ee62541ebbf2354131d (patch) | |
tree | c27c23fd03d8b02954afee0ba0a64ec3308a31b0 /lib/Utils | |
parent | 99dff4e51dc05e9313085334f5c09dcf36ca8b94 (diff) | |
download | abrt-440ba3ddc846d94eed516ee62541ebbf2354131d.tar.gz abrt-440ba3ddc846d94eed516ee62541ebbf2354131d.tar.xz abrt-440ba3ddc846d94eed516ee62541ebbf2354131d.zip |
merge correction
Diffstat (limited to 'lib/Utils')
-rw-r--r-- | lib/Utils/Polkit.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/Utils/Polkit.cpp b/lib/Utils/Polkit.cpp index f0dc4c79..bb3e9b41 100644 --- a/lib/Utils/Polkit.cpp +++ b/lib/Utils/Polkit.cpp @@ -27,7 +27,6 @@ #include "Polkit.h" #include "abrtlib.h" -<<<<<<< HEAD /*number of seconds: timeout for the authorization*/ #define POLKIT_TIMEOUT 20 @@ -38,8 +37,7 @@ static gboolean do_cancel(GCancellable* cancellable) return FALSE; } -======= ->>>>>>> 5349d07f9cae8a2b9686916c1e5bd01a0fe14a29 + static PolkitResult do_check(PolkitSubject *subject, const char *action_id) { PolkitAuthority *authority; @@ -48,14 +46,13 @@ 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, |