diff options
| author | dnovotny <danny@rawhide.localdomain> | 2009-09-16 10:53:11 -0400 |
|---|---|---|
| committer | dnovotny <danny@rawhide.localdomain> | 2009-09-16 10:53:11 -0400 |
| commit | 99dff4e51dc05e9313085334f5c09dcf36ca8b94 (patch) | |
| tree | fc67e4e307b38533271f55da012a39a773decfe2 /lib/Utils | |
| parent | f5ebde6f7a629dd74f023a185b0398305ecad604 (diff) | |
| parent | 5349d07f9cae8a2b9686916c1e5bd01a0fe14a29 (diff) | |
| download | abrt-99dff4e51dc05e9313085334f5c09dcf36ca8b94.tar.gz abrt-99dff4e51dc05e9313085334f5c09dcf36ca8b94.tar.xz abrt-99dff4e51dc05e9313085334f5c09dcf36ca8b94.zip | |
Merge branch 'master' of git://git.fedorahosted.org/git/abrt
Conflicts:
lib/Plugins/CCpp.cpp
lib/Utils/Polkit.cpp
Diffstat (limited to 'lib/Utils')
| -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, |