Merge with Andrew

Signed-off-by: Fredrik Wendt <fredrik@wendt.se>

diff --cc package/src/org/maemo/hermes/engine/facebook/service.py
index 4ea03ce,6fa6c68..30d24cc
--- 1/package/src/org/maemo/hermes/engine/facebook/service.py
--- 2/package/src/org/maemo/hermes/engine/facebook/service.py
+++ b/package/src/org/maemo/hermes/engine/facebook/service.py
@@@ -14,8 -14,12 +14,9 @@@ class Service(org.maemo.hermes.engine.s
  
  
      # -----------------------------------------------------------------------
-     def __init__(self, facebook, create_birthday_only = False):
+     def __init__(self, service_id, facebook, create_birthday_only = False):
 -        """Initialise the Facebook service, finding Facebook API keys in gconf and
 -           having a gui_callback available."""
 -        
          self.fb = facebook
+         self._service_id = service_id
          
          self._friends_by_name = {}
          self._friends_by_url = {}

diff --cc package/test/unit/test_facebook.py
index 3869c58,b0e5f95..c1725b9
--- 1/package/test/unit/test_facebook.py
--- 2/package/test/unit/test_facebook.py
+++ b/package/test/unit/test_facebook.py
@@@ -22,10 -22,10 +22,10 @@@ class FakeContact()
  class TestFacebookService(unittest.TestCase):
      
      def setUp(self):
-         self.testee = Service(None)
+         self.testee = Service("facebook", None)
          
          
 -    def test_that_process_known_contact_returns_friend_object(self):
 +    def test_that_process_contact_returns_friend_object_for_known_contact(self):
          known_url = 'http://www.facebook.com/profile.php?id=123456'
          known_contact = FakeContact('Facebook Junkie', [known_url])
          self._fake_server_response([{'uid':'123456','name':'Facebook Junkie'}])