From 1ec4b21416a9c196eaf7525869196a0bfc0534bc Mon Sep 17 00:00:00 2001
From: Pootle User <translate@rt.laptop.org>
Date: Mon, 26 Nov 2007 19:46:16 +0000
Subject: Merge branch 'master' of git+ssh://dev.laptop.org/git/web-activity

---
diff --git a/NEWS b/NEWS
index a60261b..1326734 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+75
+
+* fix for fn+space (erikos)
+* #4909 do not resume source with write (erikos)
+* #4909 do not resume downloaded files (erikos)
+
 74
 
 * change the LIBRARY_PATH to point to 
diff --git a/activity/activity.info b/activity/activity.info
index c344e71..9fbaae6 100755
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,6 +1,6 @@
 [Activity]
 name = Browse
-activity_version = 74
+activity_version = 75
 service_name = org.laptop.WebActivity
 icon = activity-web
 exec = sugar-activity webactivity.WebActivity -s
diff --git a/browser.py b/browser.py
index 6d74313..d00e17b 100644
--- a/browser.py
+++ b/browser.py
@@ -18,9 +18,7 @@
 import logging
 from gettext import gettext as _
 
-import dbus
 import gobject
-import gtk
 import tempfile
 import os
 import time
@@ -33,7 +31,6 @@ from hulahop.webview import WebView
 from sugar.datastore import datastore
 from sugar import profile
 from sugar import env
-from sugar.activity import activityfactory
 from sugar.activity import activity
 
 import sessionstore
@@ -144,15 +141,7 @@ class Browser(WebView):
 
     def _internal_save_cb(self):
         logging.debug("Saved source object to datastore.")
-        object_id = self._jobject.object_id
-        service_name = 'org.laptop.AbiWordActivity'
         self._cleanup_jobject()
-
-        bus = dbus.SessionBus()
-        bus_object = bus.get_object('org.laptop.Journal',
-                                    '/org/laptop/Journal')
-        journal = dbus.Interface(bus_object, 'org.laptop.Journal')
-        journal.Resume(service_name, object_id)
             
     def _internal_save_error_cb(self, err):
         logging.debug("Error saving source object to datastore: %s" % err)
diff --git a/downloadmanager.py b/downloadmanager.py
index 063e66e..f129c0a 100644
--- a/downloadmanager.py
+++ b/downloadmanager.py
@@ -30,7 +30,7 @@ import dbus
 from sugar.datastore import datastore
 from sugar import profile
 from sugar import mime
-from sugar.graphics.alert import Alert, TimeoutAlert
+from sugar.graphics.alert import NotifyAlert, TimeoutAlert
 from sugar.graphics import style
 from sugar.graphics.icon import Icon
 
@@ -147,16 +147,10 @@ class Download:
             if NS_FAILED(status): # download cancelled
                 return
 
-            self._stop_alert = Alert()
+            self._stop_alert = NotifyAlert(9)
             self._stop_alert.props.title = _('Download completed')
             path, file_name = os.path.split(self._target_file.path)
             self._stop_alert.props.msg = _('%s'%(file_name))
-            open_icon = Icon(icon_name='zoom-activity')
-            self._stop_alert.add_button(gtk.RESPONSE_APPLY, _('Open'), open_icon)
-            open_icon.show()
-            ok_icon = Icon(icon_name='dialog-ok')
-            self._stop_alert.add_button(gtk.RESPONSE_OK, _('Ok'), ok_icon)
-            ok_icon.show()
             _activity.add_alert(self._stop_alert)
             self._stop_alert.connect('response', self.__stop_response_cb)
             self._stop_alert.show()
@@ -194,24 +188,7 @@ class Download:
 
         _activity.remove_alert(alert)        
 
-    def __stop_response_cb(self, alert, response_id):
-        global _active_downloads
-        if response_id is gtk.RESPONSE_APPLY:
-            logging.debug('Start application with downloaded object')
-            from sugar.activity import activityfactory
-            from sugar import activity
-            activities = activity.get_registry().get_activities_for_type(
-                self._mime_type)
-            bundle_id = None
-            if len(activities):
-                bundle_id = activities[0].bundle_id
-            if bundle_id is not None:
-                logging.debug('Found activity to open mime=%s bundle_id=%s'
-                              %(self._mime_type, bundle_id))
-                activityfactory.create_with_object_id(bundle_id, self._object_id)
-            else:
-                logging.debug('Can not open mime=%s'%(self._mime_type))
-                
+    def __stop_response_cb(self, alert, response_id):        
         _activity.remove_alert(alert)
             
     def _cleanup_datastore_write(self):
diff --git a/webactivity.py b/webactivity.py
index d5b71c3..73accc5 100755
--- a/webactivity.py
+++ b/webactivity.py
@@ -58,7 +58,6 @@ SERVICE = "org.laptop.WebActivity"
 IFACE = SERVICE
 PATH = "/org/laptop/WebActivity"
 
-_VIEW_SOURCE_KEY_CODE = 0x1008FF1A
 _TOOLBAR_BROWSE = 1
 
 _logger = logging.getLogger('web-activity')
@@ -315,7 +314,7 @@ class WebActivity(activity.Activity):
                 _logger.debug('keyboard: Zoom in')
                 self._browser.zoom_in()
                 return True
-        elif event.keyval == _VIEW_SOURCE_KEY_CODE:
+        elif gtk.gdk.keyval_name(event.keyval) == "XF86Start":
             _logger.debug('keyboard: Show source of the current page SHOW_KEY')
             self._show_source()
             return True
--
cgit v0.9.1