Make Journal active at startup. #2159

Also distinguish between "active" in the sense of "the user is actually
using this activity" and "active" in the sense of "the activity would
be active *if* the user switched to Activity view". It's the latter sense,
now called "pending" that the Journal is in at startup. Pending is also
used for the next-up activity when you quit the current active activity.

shell/view/home/activitiesdonut.py

@@ -189,7 +189,7 @@ class ActivitiesDonut(hippo.CanvasBox, hippo.CanvasItem):
         self._model = shell.get_model().get_home()
         self._model.connect('activity-added', self._activity_added_cb)
         self._model.connect('activity-removed', self._activity_removed_cb)
-        self._model.connect('active-activity-changed', self._activity_changed_cb)
+        self._model.connect('pending-activity-changed', self._activity_changed_cb)
 
         self.connect('button-release-event', self._button_release_event_cb)
 
@@ -385,7 +385,7 @@ class ActivitiesDonut(hippo.CanvasBox, hippo.CanvasItem):
         cr.fill()
 
         # Selected Wedge
-        current_activity = self._model.get_current_activity()
+        current_activity = self._model.get_pending_activity()
         if current_activity is not None:
             selected_index = self._model.index(current_activity)    
             [angle_start, angle_end] = self._get_angles(selected_index)