[nanny: 9/15] Add IsUnLocked and UnLock bindings to client side



commit d385bbe4adcebd4c96b0640d3d762bb13a860f26
Author: Roberto Majadas <roberto majadas openshine com>
Date:   Sat Mar 13 21:56:44 2010 +0100

    Add IsUnLocked and UnLock bindings to client side

 client/common/src/DBusClient.py |   56 +++++----------------------------------
 1 files changed, 7 insertions(+), 49 deletions(-)
---
diff --git a/client/common/src/DBusClient.py b/client/common/src/DBusClient.py
index 0229158..b86ee35 100644
--- a/client/common/src/DBusClient.py
+++ b/client/common/src/DBusClient.py
@@ -49,7 +49,9 @@ class DBusClient(gobject.GObject):
     def __init__(self):
         gobject.GObject.__init__(self)
         self.dbus = None
-
+        self.policykit = None
+        self.pk_authority = None
+        
         if self.__init_bus() == False:
             raise Exception ('DBus not initialized')
 
@@ -122,55 +124,11 @@ class DBusClient(gobject.GObject):
             self.nanny_notification.connect_to_signal ('UserNotification', self.__on_user_notification_cb)
 
     
-    def check_policy(self, action_id):
-        pk_granted = None
-        pk_other = None
-        pk_details = None
-
-        try:
-            policykit = self.dbus.get_object("org.freedesktop.PolicyKit1", "/org/freedesktop/PolicyKit1/Authority")
-            pk_authority = dbus.Interface(policykit, "org.freedesktop.PolicyKit1.Authority")
-            pid = os.getpid()
-            (pk_granted,pk_other,pk_details) = pk_authority.CheckAuthorization(
-                ('unix-process',{'pid':dbus.UInt32(pid,variant_level=1),'start-time':dbus.UInt64(0,variant_level=1)}),
-                action_id ,{},dbus.UInt32(0),'',timeout=600)
-
-        except dbus.exceptions.DBusException, e:
-            print "exception: ", e
-            return False
-        except Exception, e:
-            print "other exception: ", e
-            return False
-
-        if pk_granted != None and pk_granted != False :
-            return True
-        else:
-            return False
+    def is_unlocked(self):
+        return self.nanny_admin.IsUnLocked()
 
-    def obtain_auth (self, action_id):
-        pk_granted = None
-        pk_other = None
-        pk_details = None
-
-        try:
-            policykit = self.dbus.get_object("org.freedesktop.PolicyKit1", "/org/freedesktop/PolicyKit1/Authority")
-            pk_authority = dbus.Interface(policykit, "org.freedesktop.PolicyKit1.Authority")
-            pid = os.getpid()
-            (pk_granted,pk_other,pk_details) = pk_authority.CheckAuthorization(
-                ('unix-process',{'pid':dbus.UInt32(pid,variant_level=1),'start-time':dbus.UInt64(0,variant_level=1)}),
-                action_id ,{},dbus.UInt32(1),'',timeout=600)
-
-        except dbus.exceptions.DBusException, e:
-            print "exception: ", e
-            return False
-        except Exception, e:
-            print "other exception: ", e
-            return False
-
-        if pk_granted != None and pk_granted != False :
-            return True
-        else:
-            return False
+    def unlock (self):
+        return self.nanny_admin.UnLock()
 
     def list_users(self):
         return self.nanny_admin.ListUsers ()



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]