Fixed a bunch of issues reported by pylint

sugar/shell/PresenceWindow.py

@@ -3,7 +3,6 @@ pygtk.require('2.0')
 import gtk
 import gobject
 
-from sugar.p2p.Stream import Stream
 from sugar.presence.PresenceService import PresenceService
 
 class PresenceWindow(gtk.Window):
@@ -94,9 +93,10 @@ class PresenceWindow(gtk.Window):
 		chat = None
 		buddy = self._buddy_list_model.get_value(aniter, self._MODEL_COL_BUDDY)
 		if buddy and not self._chats.has_key(buddy):
-			chat = BuddyChat(self, buddy)
-			self._chats[buddy] = chat
-			chat.connect_to_shell()
+			#chat = BuddyChat(self, buddy)
+			#self._chats[buddy] = chat
+			#chat.connect_to_shell()
+			pass
 
 	def __buddy_icon_changed_cb(self, buddy):
 		it = self._get_iter_for_buddy(buddy)

sugar/shell/activity.py

@@ -268,7 +268,7 @@ class Activity(object):
 		else:
 			self._activity_object.set_has_changes(False)
 
-	def get_id(self):
+	def activity_get_id(self):
 		return self._activity_id
 
 	def shutdown(self):

sugar/shell/shell.py

@@ -156,8 +156,9 @@ class ActivityHost(dbus.service.Object):
 		for c in data:
 			# Work around for a bug in dbus < 0.61 where integers
 			# are not correctly marshalled
-			if c < 0: c += 256
-			pixstr += chr(c)
+			if c < 0:
+				c += 256
+				pixstr += chr(c)
 
 		pixbuf = gtk.gdk.pixbuf_new_from_data(pixstr, colorspace, has_alpha, bits_per_sample, width, height, rowstride)
 		#print pixbuf
@@ -408,4 +409,5 @@ if __name__ == "__main__":
 	try:
 		gtk.main()
 	except KeyboardInterrupt:
+		print 'Ctrl+c pressed, exiting...'
 		pass