From 669a771ebb533b58d9117eaafb06fca077c35e5c Mon Sep 17 00:00:00 2001
From: Eben Eliason <eben@sugar.(none)>
Date: Thu, 19 Jun 2008 12:28:04 +0000
Subject: Merge branch 'master' of git+ssh://dev.laptop.org/git/web-activity

---
diff --git a/browser.py b/browser.py
index 208ff93..39a697f 100644
--- a/browser.py
+++ b/browser.py
@@ -67,6 +67,23 @@ class GetSourceListener(gobject.GObject):
     def onSecurityChange(self, progress, request, state):
         pass
 
+class CommandListener(object):
+    _com_interfaces_ = interfaces.nsIDOMEventListener
+    def __init__(self, window):
+        self._window = window
+
+    def handleEvent(self, event):
+        if not event.isTrusted:
+            return
+
+        uri = event.originalTarget.ownerDocument.documentURI
+        if not uri.startswith('about:neterror?e=nssBadCert'):
+            return
+
+        cls = components.classes['@sugarlabs.org/add-cert-exception;1']
+        cert_exception = cls.createInstance(interfaces.hulahopAddCertException)
+        cert_exception.showDialog(self._window)
+
 class Browser(WebView):
 
     AGENT_SHEET = os.path.join(activity.get_bundle_path(), 
@@ -106,7 +123,11 @@ class Browser(WebView):
 
         listener = xpcom.server.WrapObject(ContentInvoker(self),
                                            interfaces.nsIDOMEventListener)
-        self.get_window_root().addEventListener('click', listener, False)
+        self.window_root.addEventListener('click', listener, False)
+
+        listener = xpcom.server.WrapObject(CommandListener(self.dom_window),
+                                           interfaces.nsIDOMEventListener)
+        self.window_root.addEventListener('command', listener, False)
 
     def get_session(self):
         return sessionstore.get_session(self)
diff --git a/po/it.po b/po/it.po
index c8c7a8f..02e0464 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-29 00:30-0400\n"
-"PO-Revision-Date: 2008-06-02 17:32-0400\n"
+"POT-Creation-Date: 2008-06-14 00:30-0400\n"
+"PO-Revision-Date: 2008-06-18 04:29-0400\n"
 "Last-Translator: Carlo Falciola <cfalciola@yahoo.it>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -15,17 +15,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0rc2\n"
 
-#: activity/activity.info:2 webactivity.py:109
-#, fuzzy
+#: activity/activity.info:2 webactivity.py:113
 msgid "Browse"
 msgstr "Naviga"
 
-#: browser.py:144
+#: browser.py:149
 msgid "Source"
 msgstr "Sorgente"
 
 #: downloadmanager.py:141
-#, fuzzy
 msgid "Download started"
 msgstr "Iniziato trasferimento"
 
@@ -35,7 +33,6 @@ msgid "%s"
 msgstr "%s"
 
 #: downloadmanager.py:155
-#, fuzzy
 msgid "Download completed"
 msgstr "Trasferimento terminato"
 
@@ -54,7 +51,6 @@ msgstr "File %s da %s."
 
 #: downloadmanager.py:245
 #, python-format
-#, fuzzy
 msgid ""
 "Downloading %s from \n"
 "%s."
@@ -62,15 +58,23 @@ msgstr ""
 "Scaricamento %s da \n"
 "%s."
 
+#: edittoolbar.py:94
+msgid "Previous"
+msgstr "Precendente"
+
+#: edittoolbar.py:101
+msgid "Next"
+msgstr "Successivo"
+
 #: linkbutton.py:94
 msgid "Remove"
 msgstr "Elimina"
 
-#: palettes.py:88
+#: palettes.py:89
 msgid "Follow link"
 msgstr "Segui il collegamento"
 
-#: palettes.py:93 palettes.py:141
+#: palettes.py:94 palettes.py:142
 msgid "Copy"
 msgstr "Copia"
 
@@ -94,49 +98,47 @@ msgstr "Mostra cestino"
 msgid "Hide Tray"
 msgstr "Nascondi cestino"
 
-#: webactivity.py:105
+#: webactivity.py:109
 msgid "Edit"
 msgstr "Modifica"
 
-#: webactivity.py:117
+#: webactivity.py:121
 msgid "View"
 msgstr "Visualizza"
 
-#: webactivity.py:136 webactivity.py:137
-#, fuzzy
+#: webactivity.py:140 webactivity.py:141
 msgid "blank"
 msgstr "spazio"
 
-#: webactivity.py:449
-#, fuzzy
+#: webactivity.py:463
 msgid "Download in progress"
 msgstr "Scaricamento in corso"
 
-#: webactivity.py:450
+#: webactivity.py:464
 msgid "Stopping now will cancel your download"
 msgstr "Bloccare adesso annullerà il trasferimento"
 
-#: webactivity.py:452
+#: webactivity.py:466
 msgid "Cancel"
 msgstr "Annulla"
 
-#: webactivity.py:454 webtoolbar.py:174
+#: webactivity.py:468 webtoolbar.py:334
 msgid "Stop"
 msgstr "Stop"
 
-#: webtoolbar.py:52
+#: webtoolbar.py:212
 msgid "Back"
 msgstr "Indietro"
 
-#: webtoolbar.py:59
+#: webtoolbar.py:219
 msgid "Forward"
 msgstr "Avanti"
 
-#: webtoolbar.py:82
+#: webtoolbar.py:242
 msgid "Bookmark"
 msgstr "Segnalibro"
 
-#: webtoolbar.py:177
+#: webtoolbar.py:337
 msgid "Reload"
 msgstr "Ricarica"
 
--
cgit v0.9.1