From f0ff3b8fac71bc1961bba13b68c458950c9e7d0a Mon Sep 17 00:00:00 2001
From: Tomeu Vizoso <tomeu@tomeuvizoso.net>
Date: Wed, 10 Sep 2008 14:30:41 +0000
Subject: Merge the journal into the shell

---
(limited to 'src/model/homemodel.py')

diff --git a/src/model/homemodel.py b/src/model/homemodel.py
index 9f3db8e..668b60e 100644
--- a/src/model/homemodel.py
+++ b/src/model/homemodel.py
@@ -169,10 +169,10 @@ class HomeModel(gobject.GObject):
                 home_activity = self._get_activity_by_id(activity_id)
 
             if not home_activity:
-                home_activity = HomeActivity(activity_info, activity_id)
+                home_activity = HomeActivity(activity_info, activity_id, window)
                 self._add_activity(home_activity)
-
-            home_activity.set_window(window)
+            else:
+                home_activity.set_window(window)
 
             if get_sugar_window_type(window) != 'launcher':
                 home_activity.props.launching = False
--
cgit v0.9.1