online-desktop r7260 - in trunk: . weblogindriver

[marinaz svn gnome org]

Author: marinaz
Date: Mon Jun 30 00:35:40 2008
New Revision: 7260
URL: http://svn.gnome.org/viewvc/online-desktop?rev=7260&view=rev

Log:
Move /onlineaccounts and /onlineaccount objects to be provided by org.gnome.OnlineAccounts DBus service.


Added:
   trunk/org.gnome.OnlineAccounts.service.in
Modified:
   trunk/Makefile-weblogindriver.am
   trunk/weblogindriver/web-login-driver

Modified: trunk/Makefile-weblogindriver.am
==============================================================================
--- trunk/Makefile-weblogindriver.am	(original)
+++ trunk/Makefile-weblogindriver.am	Mon Jun 30 00:35:40 2008
@@ -17,7 +17,7 @@
 
 # DBus service file
 servicedir = $(datadir)/dbus-1/services
-service_in_files = org.gnome.WebLoginDriver.service.in
+service_in_files =  org.gnome.WebLoginDriver.service.in org.gnome.OnlineAccounts.service.in
 EXTRA_DIST += $(service_in_files)
 service_DATA = $(service_in_files:.service.in=.service)
 $(service_DATA): $(service_in_files) Makefile

Added: trunk/org.gnome.OnlineAccounts.service.in
==============================================================================
--- (empty file)
+++ trunk/org.gnome.OnlineAccounts.service.in	Mon Jun 30 00:35:40 2008
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.gnome.OnlineAccounts
+Exec= bindir@/web-login-driver

Modified: trunk/weblogindriver/web-login-driver
==============================================================================
--- trunk/weblogindriver/web-login-driver	(original)
+++ trunk/weblogindriver/web-login-driver	Mon Jun 30 00:35:40 2008
@@ -79,6 +79,8 @@
 
 BUS_NAME_STR='org.gnome.WebLoginDriver'
 BUS_IFACE_STR='org.gnome.WebLoginDriver'
+OA_BUS_NAME_STR='org.gnome.OnlineAccounts'
+OA_BUS_IFACE_STR='org.gnome.OnlineAccounts'
 
 def iterdir(path):
   for fname in os.listdir(path):
@@ -334,32 +336,32 @@
                          copy.deepcopy(self.__password, memo), copy.deepcopy(self.__enabled, memo), \
                          copy.deepcopy(self.__gconf_dir, memo))
 
-  @dbus.service.method(BUS_IFACE_STR,
+  @dbus.service.method(OA_BUS_IFACE_STR,
                        out_signature="s")
   def GetKind(self):
     return self.__kind
 
-  @dbus.service.method(BUS_IFACE_STR,
+  @dbus.service.method(OA_BUS_IFACE_STR,
                        out_signature="s")
   def GetUsername(self):
     return self.__username
 
-  @dbus.service.method(BUS_IFACE_STR,
+  @dbus.service.method(OA_BUS_IFACE_STR,
                        out_signature="s")
   def GetPassword(self):
     return self.__password
 
-  @dbus.service.method(BUS_IFACE_STR,
+  @dbus.service.method(OA_BUS_IFACE_STR,
                        out_signature="b")
   def GetEnabled(self):
     return self.__enabled
 
-  @dbus.service.method(BUS_IFACE_STR,
+  @dbus.service.method(OA_BUS_IFACE_STR,
                        out_signature="o")
   def GetObjectPath(self):
     return self._object_path
 
-  @dbus.service.signal(BUS_IFACE_STR,
+  @dbus.service.signal(OA_BUS_IFACE_STR,
                        signature='')
   def Changed(self):
     pass
@@ -445,22 +447,22 @@
     if self.__model.ready:
         self.__on_ready()
 
-  @dbus.service.signal(BUS_IFACE_STR,
+  @dbus.service.signal(OA_BUS_IFACE_STR,
                        signature='o')
   def AccountAdded(self, account_object_path):
     pass
 
-  @dbus.service.signal(BUS_IFACE_STR,
+  @dbus.service.signal(OA_BUS_IFACE_STR,
                        signature='o')
   def AccountRemoved(self, account_object_path):
     pass
 
-  @dbus.service.signal(BUS_IFACE_STR,
+  @dbus.service.signal(OA_BUS_IFACE_STR,
                        signature='o')
   def AccountEnabled(self, account_object_path):
     pass
 
-  @dbus.service.signal(BUS_IFACE_STR,
+  @dbus.service.signal(OA_BUS_IFACE_STR,
                        signature='o')
   def AccountDisabled(self, account_object_path):
     pass
@@ -955,7 +957,7 @@
       self.AccountAdded(account.GetObjectPath()) 
 
   # new_properties is a dictionary, valid properties are "password" and "enabled"
-  @dbus.service.method(BUS_IFACE_STR,                      
+  @dbus.service.method(OA_BUS_IFACE_STR,                      
                        in_signature="oa{ss}")
   def SaveAccountChanges(self, account_object_path, new_properties):
 
@@ -999,7 +1001,7 @@
       self.__update_account(account)
 
   # return a tuple with an account object path as the first element, and a boolean indicating if a new account was created
-  @dbus.service.method(BUS_IFACE_STR,                      
+  @dbus.service.method(OA_BUS_IFACE_STR,                      
                        in_signature="ss",
                        out_signature="(ob)")
   def GetOrCreateAccount(self, kind, username):        
@@ -1014,7 +1016,7 @@
     self.__update_account(account) # this might find a password for the account and emit AccountEnabled signal 
     return (account.GetObjectPath(), True)
 
-  @dbus.service.method(BUS_IFACE_STR,                      
+  @dbus.service.method(OA_BUS_IFACE_STR,                      
                        in_signature="o")
   def RemoveAccount(self, account):
     account = None
@@ -1032,13 +1034,13 @@
     # self.__update_account will remove the account from self.__all_accounts 
     self.__update_account(account)
 
-  @dbus.service.method(BUS_IFACE_STR,                      
+  @dbus.service.method(OA_BUS_IFACE_STR,                      
                        out_signature="ao")
   def GetEnabledAccounts(self):
     object_paths_list = [a.GetObjectPath() for a in self.__enabled_accounts]
     return object_paths_list
 
-  @dbus.service.method(BUS_IFACE_STR,
+  @dbus.service.method(OA_BUS_IFACE_STR,
                        in_signature="as",                      
                        out_signature="ao")
   def GetEnabledAccountsWithKinds(self, kinds):
@@ -1046,7 +1048,7 @@
                          filter(lambda account: account.GetKind() in kinds, self.__enabled_accounts)]
     return object_paths_list
 
-  @dbus.service.method(BUS_IFACE_STR,                      
+  @dbus.service.method(OA_BUS_IFACE_STR,                      
                        out_signature="ao")
   def GetAllAccounts(self):
     # we use self.__gconf_accounts here, because self.__all_accounts also has random accounts 
@@ -1054,7 +1056,7 @@
     object_paths_list = [a.GetObjectPath() for a in self.__gconf_accounts]
     return object_paths_list
 
-  @dbus.service.method(BUS_IFACE_STR,
+  @dbus.service.method(OA_BUS_IFACE_STR,
                        in_signature="as",                      
                        out_signature="ao")
   def GetAllAccountsWithKinds(self, kinds):
@@ -1062,7 +1064,7 @@
                          filter(lambda account: account.GetKind() in kinds, self.__gconf_accounts)]
     return object_paths_list
 
-  @dbus.service.method(BUS_IFACE_STR,                      
+  @dbus.service.method(OA_BUS_IFACE_STR,                      
                        out_signature="a{ss}")
   def GetAllAccountKinds(self):
     return ONLINE_ACCOUNT_KINDS
@@ -1074,6 +1076,7 @@
   bus_name = dbus.service.BusName(BUS_NAME_STR, bus=bus)
   global _driver
   _driver = WebLoginDriver(bus_name)
+  bus_name = dbus.service.BusName(OA_BUS_NAME_STR, bus=bus)  
   global _online_accounts # so that it doesn't get garbage collected
   _online_accounts = OnlineAccounts(bus_name)