Get activities sharing sort of working

3 files changed, 8 insertions, 19 deletions

diff --git a/sugar/browser/BrowserActivity.py b/sugar/browser/BrowserActivity.py
index 371a62e..840a25b 100644
--- a/sugar/browser/BrowserActivity.py
+++ b/sugar/browser/BrowserActivity.py
@@ -29,7 +29,7 @@ class BrowserActivity(activity.Activity):
 		self._pservice.track_service_type(_BROWSER_ACTIVITY_TYPE)
 		self._share_service = None
 		self._model = None
-
+	
 	def _update_shared_location(self):
 		address = self.embed.get_address()
 		self._model.set_value('address', address)
@@ -93,13 +93,10 @@ class BrowserActivity(activity.Activity):
 		
 		self._setup_shared(self.uri)
 	
-	def publish(self):
-		print 'Publish %s' % self.get_id() 
-	
 	def get_embed(self):
 		return self.embed
 	
-	def share(self):
+	def publish(self):
 		escaped_title = urllib.quote(self.embed.get_title())
 		escaped_url = urllib.quote(self.embed.get_address())
 
diff --git a/sugar/browser/BrowserShell.py b/sugar/browser/BrowserShell.py
index 5e07327..d49a7cc 100644
--- a/sugar/browser/BrowserShell.py
+++ b/sugar/browser/BrowserShell.py
@@ -34,3 +34,9 @@ class BrowserShell(dbus.service.Object):
 		browser = BrowserActivity(uri)
 		self.__browsers.append(browser)
 		browser.connect_to_shell()
+
+	@dbus.service.method('com.redhat.Sugar.BrowserShell')
+	def open_browser_with_id(self, uri, activity_id):
+		browser = BrowserActivity(uri)
+		self.__browsers.append(browser)
+		browser.connect_to_shell(activity_id)
diff --git a/sugar/browser/NavigationToolbar.py b/sugar/browser/NavigationToolbar.py
index 2063c20..e9cc1c5 100644
--- a/sugar/browser/NavigationToolbar.py
+++ b/sugar/browser/NavigationToolbar.py
@@ -33,17 +33,6 @@ class NavigationToolbar(gtk.Toolbar):
 		separator = gtk.SeparatorToolItem()
 		self.insert(separator, -1)
 		separator.show()
-
-		share = gtk.ToolButton(None, "Share")
-		share.set_icon_name('stock_shared-by-me')
-		share.set_is_important(True)
-		share.connect("clicked", self.__share_cb)
-		self.insert(share, -1)
-		share.show()
-
-		separator = gtk.SeparatorToolItem()
-		self.insert(separator, -1)
-		separator.show()
 		
 		address_item = AddressItem(self.__open_address_cb)		
 		self.insert(address_item, -1)
@@ -66,9 +55,6 @@ class NavigationToolbar(gtk.Toolbar):
 	def __reload_cb(self, button):
 		self._embed.reload()
 
-	def __share_cb(self, button):
-		self._browser.share()
-
 	def __location_changed(self, embed):
 		self._update_sensitivity()