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

2 files changed, 16 insertions, 6 deletions

diff --git a/src/jarabe/desktop/favoritesview.py b/src/jarabe/desktop/favoritesview.py
index 81f2730..9371858 100644
--- a/src/jarabe/desktop/favoritesview.py
+++ b/src/jarabe/desktop/favoritesview.py
@@ -41,6 +41,7 @@ from jarabe.model.buddy import BuddyModel
 from jarabe.model import shell
 from jarabe.model import bundleregistry
 from jarabe import journal
+from jarabe.controlpanel.gui import ControlPanel
 
 from jarabe.desktop import schoolserver
 from jarabe.desktop.schoolserver import RegisterError
@@ -441,7 +442,14 @@ class ActivityIcon(CanvasIcon):
         if error is not None:
             logging.error('Error retrieving most recent activities: %r' % error)
 
-        self._journal_entries = entries
+        # If there's a problem with the DS index, we may get entries not related
+        # to this activity.
+        checked_entries = []
+        for entry in entries:
+            if entry['activity'] == self.bundle_id:
+                checked_entries.append(entry)
+
+        self._journal_entries = checked_entries
         self._update()
 
     def _update(self):
diff --git a/src/jarabe/desktop/meshbox.py b/src/jarabe/desktop/meshbox.py
index e650ba7..ab7348c 100644
--- a/src/jarabe/desktop/meshbox.py
+++ b/src/jarabe/desktop/meshbox.py
@@ -222,6 +222,10 @@ class AccessPointView(CanvasPulsingIcon):
             state = network.DEVICE_STATE_UNKNOWN
 
         if state == network.DEVICE_STATE_ACTIVATED:
+            connection = network.find_connection(self._name)
+            if connection:
+                connection.set_connected()
+
             icon_name = '%s-connected' % _ICON_NAME
         else:
             icon_name = _ICON_NAME
@@ -342,10 +346,10 @@ class AccessPointView(CanvasPulsingIcon):
             wireless_security = self._get_security()
             settings.wireless_security = wireless_security
 
-            connection = network.add_connection(self._name, settings)
+            if wireless_security is not None:
+                settings.wireless.security = '802-11-wireless-security'
 
-            if wireless_security is None:
-                self._connection = connection
+            connection = network.add_connection(self._name, settings)
 
         obj = self._bus.get_object(_NM_SERVICE, _NM_PATH)
         netmgr = dbus.Interface(obj, _NM_IFACE)
@@ -357,8 +361,6 @@ class AccessPointView(CanvasPulsingIcon):
                                   error_handler=self.__activate_error_cb)
 
     def __activate_reply_cb(self, connection):
-        if self._connection:
-            self._connection.save()
         logging.debug('Connection activated: %s', connection)
 
     def __activate_error_cb(self, err):