Ticket #2483: 0001-Do-not-remove-bodies-on-offline-status-2483.2.patch

sugar-0.92.1/src/jarabe/desktop/grid.py

@@ -16 +16 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 import random
+import logging
 
 import gobject
 import gtk
@@ -85 +86 @@
             self._collisions.remove(child)
 
     def move(self, child, x, y, locked=False):
+        if child not in self._child_rects:
+            import traceback
+            logging.warn('Grid.move, child %r is not counted:\n%s',
+                    child, ''.join(traceback.format_stack()))
+            return
+
         self.remove_weight(self._child_rects[child])
 
         rect = self._child_rects[child]

sugar-0.92.1/src/jarabe/model/buddy.py

@@ -195 +195 @@
 class BuddyModel(BaseBuddyModel):
     __gtype_name__ = 'SugarBuddyModel'
 
+    offline = True
+
     def __init__(self, **kwargs):
 
         self._account = None

sugar-0.92.1/src/jarabe/model/neighborhood.py

@@ -172 +172 @@
                           ([object, object])),
         'buddy-removed': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
                           ([object])),
+        'buddy-presence-changed': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
+                                   ([object, object])),
         'buddy-joined-activity': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
                                   ([object, object])),
         'buddy-left-activity': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
@@ -393 +395 @@
         for handle, presence in presences.iteritems():
             if handle in self._buddy_handles:
                 presence_type, status_, message_ = presence
-                if presence_type == CONNECTION_PRESENCE_TYPE_OFFLINE:
-                    contact_id = self._buddy_handles[handle]
-                    del self._buddy_handles[handle]
-                    self.emit('buddy-removed', contact_id)
+                self.emit('buddy-presence-changed',
+                        self._buddy_handles[handle], presence_type)
 
     def __buddy_info_updated_cb(self, handle, properties):
         logging.debug('_Account.__buddy_info_updated_cb %r', handle)
@@ -674 +674 @@
         account.connect('buddy-added', self.__buddy_added_cb)
         account.connect('buddy-updated', self.__buddy_updated_cb)
         account.connect('buddy-removed', self.__buddy_removed_cb)
+        account.connect('buddy-presence-changed',
+                self.__buddy_presence_changed_cb)
+
         account.connect('buddy-joined-activity',
                         self.__buddy_joined_activity_cb)
         account.connect('buddy-left-activity', self.__buddy_left_activity_cb)
@@ -898 +901 @@
         if buddy.props.key is not None:
             self.emit('buddy-removed', buddy)
 
+    def __buddy_presence_changed_cb(self, account, contact_id, presence_type):
+        if contact_id not in self._buddies:
+            logging.debug('Neighborhood.__buddy_presence_changed_cb Unknown ' \
+                    'buddy with contact_id %r', contact_id)
+            return
+
+        buddy = self._buddies[contact_id]
+        offline = (presence_type == CONNECTION_PRESENCE_TYPE_OFFLINE);
+
+        if buddy.offline != offline:
+            buddy.offline = offline
+            if buddy.props.key is not None:
+                if offline:
+                    self.emit('buddy-removed', buddy)
+                else:
+                    self.emit('buddy-added', buddy)
+
     def __activity_added_cb(self, account, room_handle, activity_id):
         logging.debug('__activity_added_cb %r %r', room_handle, activity_id)
         if activity_id in self._activities: