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

3 files changed, 27 insertions, 1 deletions

diff --git a/sugar/datastore/datastore.py b/sugar/datastore/datastore.py
index 7f47138..5697940 100644
--- a/sugar/datastore/datastore.py
+++ b/sugar/datastore/datastore.py
@@ -142,3 +142,8 @@ def find(query, sorting=None, limit=None, offset=None, reply_handler=None,
 
     return objects, total_count
 
+def mount(uri, options):
+    return dbus_helpers.mount(uri, options)
+
+def mounts():
+    return dbus_helpers.mounts()
diff --git a/sugar/datastore/dbus_helpers.py b/sugar/datastore/dbus_helpers.py
index 2dfccac..d642988 100644
--- a/sugar/datastore/dbus_helpers.py
+++ b/sugar/datastore/dbus_helpers.py
@@ -59,10 +59,16 @@ def get_filename(uid):
     return filename
 
 def find(query, reply_handler, error_handler):
-    logging.debug('dbus_helpers.find')
+    logging.debug('dbus_helpers.find: %r' % query)
     if reply_handler and error_handler:
         return _data_store.find(query, reply_handler=reply_handler,
                 error_handler=error_handler)
     else:
         return _data_store.find(query)
 
+def mount(uri, options):
+    return _data_store.mount(uri, options)
+
+def mounts():
+    return _data_store.mounts()
+
diff --git a/sugar/graphics/toggletoolbutton.py b/sugar/graphics/toggletoolbutton.py
index 5a31383..3684e9c 100644
--- a/sugar/graphics/toggletoolbutton.py
+++ b/sugar/graphics/toggletoolbutton.py
@@ -18,13 +18,28 @@
 import gtk
 
 from sugar.graphics.icon import Icon
+from sugar.graphics.palette import Palette, WidgetInvoker
 
 class ToggleToolButton(gtk.ToggleToolButton):
     def __init__(self, named_icon=None):
         gtk.ToggleToolButton.__init__(self)
+        self._palette = None
         self.set_named_icon(named_icon)
 
     def set_named_icon(self, named_icon):
         icon = Icon(named_icon)
         self.set_icon_widget(icon)
         icon.show()
+
+    def get_palette(self):
+        return self._palette
+    
+    def set_palette(self, palette):
+        self._palette = palette
+        self._palette.props.invoker = WidgetInvoker(self.child)
+
+    def set_tooltip(self, text):
+        self._palette = Palette(text)
+        self._palette.props.invoker = WidgetInvoker(self.child)
+    
+    palette = property(get_palette, set_palette)