Merge branch 'master' of gitorious@git.sugarlabs.org:sugar/mainline

8 files changed, 19 insertions, 15 deletions

diff --git a/bin/sugar-session b/bin/sugar-session
index b4ab2c7..d215dd7 100644
--- a/bin/sugar-session
+++ b/bin/sugar-session
@@ -134,14 +134,15 @@ def main():
     cleanup_logs()
     logger.start('shell')
 
-    intro.check_profile()
-
     client = gconf.client_get_default()
-    timezone = client.get_string('/desktop/sugar/date/timezone')
+    client.set_string('/desktop/gnome/peripherals/mouse/cursor_theme', 'sugar')
 
+    timezone = client.get_string('/desktop/sugar/date/timezone')
     if timezone is not None and timezone:
         os.environ['TZ'] = timezone
 
+    intro.check_profile()
+
     start_ui_service()
     start_session_manager()
 
diff --git a/extensions/deviceicon/network.py b/extensions/deviceicon/network.py
index c68b513..5016943 100644
--- a/extensions/deviceicon/network.py
+++ b/extensions/deviceicon/network.py
@@ -18,7 +18,7 @@
 
 from gettext import gettext as _
 import logging
-import sha
+import hashlib
 import socket
 import struct
 
@@ -317,7 +317,7 @@ class WirelessDeviceView(ToolButton):
         if 'Frequency' in properties:
             self._frequency = properties['Frequency']
 
-        sh = sha.new()
+        sh = hashlib.sha1()
         data = self._name + hex(self._flags)
         sh.update(data)
         h = hash(sh.digest())
diff --git a/src/jarabe/desktop/favoritesview.py b/src/jarabe/desktop/favoritesview.py
index 5d197c5..30e83a9 100644
--- a/src/jarabe/desktop/favoritesview.py
+++ b/src/jarabe/desktop/favoritesview.py
@@ -377,7 +377,7 @@ class DatastoreListener(object):
     def get_last_activity_async(self, bundle_id, properties, callback_cb):
         query = {'activity': bundle_id,
                  'limit': 5,
-                 'order_by': ['-timestamp']}
+                 'order_by': ['+timestamp']}
 
         reply_handler = lambda entries, total_count: self.__reply_handler_cb(
                 entries, total_count, callback_cb)
@@ -386,8 +386,8 @@ class DatastoreListener(object):
                 error, callback_cb)
 
         self._datastore.find(query, properties, byte_arrays=True,
-                               reply_handler=reply_handler,
-                               error_handler=error_handler)
+                             reply_handler=reply_handler,
+                             error_handler=error_handler)
 
     def __reply_handler_cb(self, entries, total_count, callback_cb):
         logging.debug('__reply_handler_cb')
diff --git a/src/jarabe/desktop/keydialog.py b/src/jarabe/desktop/keydialog.py
index f5995e6..93f07c4 100644
--- a/src/jarabe/desktop/keydialog.py
+++ b/src/jarabe/desktop/keydialog.py
@@ -14,7 +14,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-import md5
+import hashlib
 from gettext import gettext as _
 
 import gtk
@@ -53,7 +53,7 @@ def hash_passphrase(passphrase):
     elif len(passphrase) < 64:
         while len(passphrase) < 64:
             passphrase += passphrase[:64 - len(passphrase)]
-    passphrase = md5.new(passphrase).digest()
+    passphrase = hashlib.md5(passphrase).digest()
     return string_to_hex(passphrase)[:26]
 
 class CanceledKeyRequestError(dbus.DBusException):
diff --git a/src/jarabe/desktop/meshbox.py b/src/jarabe/desktop/meshbox.py
index 5e3658c..de1f18d 100644
--- a/src/jarabe/desktop/meshbox.py
+++ b/src/jarabe/desktop/meshbox.py
@@ -17,7 +17,7 @@
 
 from gettext import gettext as _
 import logging
-import sha
+import hashlib
 
 import dbus
 import hippo
@@ -171,7 +171,7 @@ class AccessPointView(CanvasPulsingIcon):
         if 'Mode' in properties:
             self._mode = properties['Mode']
 
-        sh = sha.new()
+        sh = hashlib.sha1()
         data = self._name + hex(self._flags)
         sh.update(data)
         h = hash(sh.digest())
diff --git a/src/jarabe/intro/window.py b/src/jarabe/intro/window.py
index 3975900..0e0cbb3 100644
--- a/src/jarabe/intro/window.py
+++ b/src/jarabe/intro/window.py
@@ -241,6 +241,9 @@ class IntroWindow(gtk.Window):
     def __init__(self):
         gtk.Window.__init__(self)
 
+        self.props.decorated = False
+        self.maximize()
+
         self._canvas = hippo.Canvas()
         self._intro_box = _IntroBox()
         self._intro_box.connect('done', self._done_cb)
diff --git a/src/jarabe/model/owner.py b/src/jarabe/model/owner.py
index bdfd9a8..2075f08 100644
--- a/src/jarabe/model/owner.py
+++ b/src/jarabe/model/owner.py
@@ -62,8 +62,8 @@ class Owner(gobject.GObject):
             raise RuntimeError("invalid buddy icon")
 
         # Get the icon's hash
-        import md5
-        digest = md5.new(self._icon).digest()
+        import hashlib
+        digest = hashlib.md5(self._icon).digest()
         self._icon_hash = util.printable_hash(digest)
 
         self._pservice = presenceservice.get_instance()
diff --git a/src/jarabe/view/launcher.py b/src/jarabe/view/launcher.py
index 0d0532f..83a141a 100644
--- a/src/jarabe/view/launcher.py
+++ b/src/jarabe/view/launcher.py
@@ -33,6 +33,7 @@ class LaunchWindow(gtk.Window):
         gobject.GObject.__init__(self)
 
         self.props.type_hint = gtk.gdk.WINDOW_TYPE_HINT_NORMAL
+        self.props.decorated = False
 
         canvas = hippo.Canvas()
         canvas.modify_bg(gtk.STATE_NORMAL, style.COLOR_WHITE.get_gdk_color())
@@ -61,7 +62,6 @@ class LaunchWindow(gtk.Window):
         wm.set_activity_id(widget.window, str(self._activity_id))
         widget.window.property_change('_SUGAR_WINDOW_TYPE', 'STRING', 8,
                                       gtk.gdk.PROP_MODE_REPLACE, 'launcher')
-        widget.window.set_decorations(0)
 
     def __size_changed_cb(self, screen):
         self._update_size()