From 131c791f15992ecaf6960ba8d90e0e106468fa5e Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <mpg@redhat.com>
Date: Mon, 03 Sep 2007 14:28:45 +0000
Subject: Merge branch 'master' of git+ssh://dev.laptop.org/git/web-activity

Conflicts:

	NEWS
---
(limited to 'webactivity.py')

diff --git a/webactivity.py b/webactivity.py
index 9f5a848..8222a8a 100755
--- a/webactivity.py
+++ b/webactivity.py
@@ -280,10 +280,8 @@ class WebActivity(activity.Activity):
                     self._add_link_totray(link['url'], base64.b64decode(link['thumb']),
                                           link['color'], link['title'],
                                           link['owner'], i)                    
-                i+=1
-                
-            if self.model.data['history'] is not '':                
-                self._browser.set_session(self.model.data['history'])                
+                i+=1            
+            self._browser.set_session(self.model.data['history'])
         else:
             self._browser.load_uri(file_path)
             _sugarext.set_prgname(self.sname)
--
cgit v0.9.1