From 209831888e9a0e6603bb8c322d3f3ce4d48832ea Mon Sep 17 00:00:00 2001
From: Simon Schampijer <simon@schampijer.de>
Date: Tue, 16 Oct 2007 12:11:44 +0000
Subject: Removed hack to set the right service name for sharing

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

diff --git a/webactivity.py b/webactivity.py
index bca8531..ea84619 100755
--- a/webactivity.py
+++ b/webactivity.py
@@ -29,7 +29,6 @@ from sugar import env
 from sugar.graphics import style
 import telepathy
 import telepathy.client
-from sugar import _sugarext
 from sugar.presence import presenceservice
 from sugar.graphics.tray import HTray
 from sugar import profile
@@ -111,7 +110,6 @@ class WebActivity(activity.Activity):
         self.current = _('blank')
         self.webtitle = _('blank')
         self.connect('key-press-event', self._key_press_cb)
-        self.sname =  _sugarext.get_prgname()
 
         self.toolbox.set_current_toolbar(_TOOLBAR_BROWSE)
         
@@ -122,8 +120,6 @@ class WebActivity(activity.Activity):
             # opening URIs and default docs.
             self._load_homepage()
 
-        _sugarext.set_prgname(self.sname)
-
         self.messenger = None
         self.connect('shared', self._shared_cb)
 
@@ -249,7 +245,6 @@ class WebActivity(activity.Activity):
             self._browser.load_uri('file://' + _LIBRARY_PATH)
         else:
             self._browser.load_uri('about:blank')
-        _sugarext.set_prgname(self.sname)
 
     def _session_history_changed_cb(self, session_history, link):
         _logger.debug('NewPage: %s.' %link)
@@ -259,7 +254,6 @@ class WebActivity(activity.Activity):
         if embed.props.title is not '':
             _logger.debug('Title changed=%s' % embed.props.title)
             self.webtitle = embed.props.title
-            _sugarext.set_prgname("org.laptop.WebActivity")
             
     def read_file(self, file_path):
         if self.metadata['mime_type'] == 'text/plain':
@@ -281,7 +275,6 @@ class WebActivity(activity.Activity):
             self._browser.set_session(self.model.data['history'])
         else:
             self._browser.load_uri(file_path)
-            _sugarext.set_prgname(self.sname)
         
     def write_file(self, file_path):
         if not self.metadata['mime_type']:
--
cgit v0.9.1