Merge lp:~seif/zeitgeist-datasources/fix-telepathy-code-style into lp:zeitgeist-datasources/0.8

[Seif Lotfy]

fix code style breakage

[lp:~seif/zeitgeist-datasources/fix-telepathy-code-style]

101. By Seif Lotfy on 2010-12-04

fixed line removal

102. By Seif Lotfy on 2010-12-04

fixed line removal

[Morten Mjelva (mortenmjelva)]

review: Approve

=== modified file 'telepathy/org.freedesktop.Telepathy.Client.Zeitgeist.service'
--- telepathy/org.freedesktop.Telepathy.Client.Zeitgeist.service	2010-11-08 15:48:49 +0000
+++ telepathy/org.freedesktop.Telepathy.Client.Zeitgeist.service	2010-12-04 22:23:08 +0000
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.freedesktop.Telepathy.Client.Zeitgeist
-Exec=/home/mortenmj/Software/zeitgeist-dataproviders/telepathy/zeitgeist-telepathy-observer.py
+Exec=/home/seif/Projects/zeitgeist-dataproviders/telepathy/zeitgeist-telepathy-observer.py
 
=== modified file 'telepathy/zeitgeist-telepathy-observer.py'
--- telepathy/zeitgeist-telepathy-observer.py	2010-11-08 15:48:49 +0000
+++ telepathy/zeitgeist-telepathy-observer.py	2010-12-04 22:23:08 +0000
@@ -160,6 +160,7 @@
         except KeyError:
             self._target_alias = self._target_id
         
+        self._connect_to_signals()
         self._default_operations_finished()
 
     def _get_requested_cb(self, req):
@@ -188,15 +189,13 @@
     # which depend on each other are executed in order.
     def _channel_ready(self, channel):
         self._target_id = self.properties[CHANNEL + '.TargetID']
-
+        
         # Get contact attribute interfaces
         self[dbus.PROPERTIES_IFACE].Get(CHANNEL,
                 'Requested',
                 reply_handler=self._get_requested_cb,
                 error_handler=error)
 
-        self._connect_to_signals()
-
     # This is necessary so our signal isn't sent over D-Bus
     def do_closed(self):
         pass
@@ -228,7 +227,7 @@
         if self._channel_requested:
             manifestation = unicode(Manifestation.USER_ACTIVITY)
         else:
-            manifestation = unicode(Manifestation.WORLD_NOTIFICATION)
+            manifestation = unicode(Manifestation.WORLD_ACTIVITY)
 
         timestamp = int(time() * 1000)
 
@@ -271,7 +270,15 @@
     def _message_received_cb(self, identification, timestamp, sender, contenttype,
             flags, content):
         logging.debug("Message received")
-
+        if not self._subject:
+            self._subject = [Subject.new_for_values(
+                uri = self._target_id,
+                interpretation = unicode(Interpretation.IMMESSAGE),
+                manifestation = unicode(Manifestation.SOFTWARE_SERVICE),
+                origin = self.account_path,
+                mimetype = "text/plain",
+                text = self._target_alias)]
+        
         timestamp = timestamp * 1000
 
         event = Event.new_for_values(