Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

docs/controls.txt

@@ -157,14 +157,19 @@ sugar.ScrolledWindow
 
 * Support for markers. Line as default and optional support for other shapes (star for bookmarks, circles for xos...). Generic way of add marks and keep them updated (observer?)
 
+gtk.Expander
 
-TODO
+gtk.Separator
 
-**Rollovers**
-Grab key
-Trays
-Grouping
-Tabs
-Sorting
-Expander
-Clipboard
+sugar.GroupBox
+
+* just a container
+* set_title and set_title_widget (checkbox, radiobutton...)
+* different color and separator under title
+
+gtk.TreeView
+
+gtk.Notebook
+
+* Expand to fill the whole space by default but property to turn it off
+* Switching tabs with the little arrows should page

shell/model/MeshModel.py

@@ -193,7 +193,7 @@ class MeshModel(gobject.GObject):
         self._check_activity(activity)
 
     def _check_activity(self, activity):
-        atype = activity.get_type()
+        atype = activity.props.type
         bundle = self._bundle_registry.get_bundle(atype)
         if not bundle:
             return

shell/view/frame/FriendsBox.py

@@ -81,7 +81,7 @@ class FriendsBox(hippo.CanvasBox):
 
     def __activity_appeared_cb(self, pservice, activity_ps):
         activity = self._shell.get_current_activity()
-        if activity and activity_ps.get_id() == activity.get_id():
+        if activity and activity_ps.props.id == activity.get_id():
             self._set_activity_ps(activity_ps)
 
     def _set_activity_ps(self, activity_ps):

sugar/presence/presenceservice.py

@@ -241,8 +241,8 @@ class PresenceService(gobject.GObject):
             resp = self._ps.GetActivities()
         except dbus.exceptions.DBusException, err:
             logging.warn(
-                """Unable to retrieve activity list from presence service: %s""",
-                err
+                """Unable to retrieve activity list from presence service: %s"""
+                % err
             )
             return []
         else:
@@ -263,9 +263,8 @@ class PresenceService(gobject.GObject):
             act_op = self._ps.GetActivityById(activity_id)
         except dbus.exceptions.DBusException, err:
             logging.warn(
-                """Unable to retrieve activity handle for %r from presence service: %s""",
-                activity_id,
-                err
+                """Unable to retrieve activity handle for %r from presence service: %s"""
+                % (activity_id, err)
             )
             return None
         return self._new_object(act_op)
@@ -280,8 +279,8 @@ class PresenceService(gobject.GObject):
             resp = self._ps.GetBuddies()
         except dbus.exceptions.DBusException, err:
             logging.warn(
-                """Unable to retrieve buddy-list from presence service: %s""",
-                err
+                """Unable to retrieve buddy-list from presence service: %s"""
+                % err
             )
             return []
         else:
@@ -303,9 +302,8 @@ class PresenceService(gobject.GObject):
             buddy_op = self._ps.GetBuddyByPublicKey(dbus.ByteArray(key))
         except dbus.exceptions.DBusException, err:
             logging.warn(
-                """Unable to retrieve buddy handle for %r from presence service: %s""",
-                key,
-                err
+                """Unable to retrieve buddy handle for %r from presence service: %s"""
+                % key, err
             )
             return None
         return self._new_object(buddy_op)
@@ -316,8 +314,8 @@ class PresenceService(gobject.GObject):
             owner_op = self._ps.GetOwner()
         except dbus.exceptions.DBusException, err:
             logging.warn(
-                """Unable to retrieve local user/owner from presence service: %s""",
-                err
+                """Unable to retrieve local user/owner from presence service: %s"""
+                % err
             )
             raise RuntimeError("Could not get owner object from presence service.")
         return self._new_object(owner_op)