From 0c65b0902927b73e9f116ccd7aedf79a6ffec2f1 Mon Sep 17 00:00:00 2001
From: Manuel Quiñones <manuq@laptop.org>
Date: Thu, 01 Dec 2011 12:15:17 +0000
Subject: Restore keystrokes for go back, go forward, reload page

- Added logging in the keystrokes

- Changed Gdk.EventMask.CONTROL_MASK for Gdk.ModifierType.CONTROL_MASK,
  it was badly converted by the pygi-convert.sh script in commit
  dec602fda0890bdbfb121107b9bb39f7954a9cd5

Signed-off-by: Manuel Quiñones <manuq@laptop.org>
Acked-by: Simon Schampijer <simon@laptop.org>
---
(limited to 'webactivity.py')

diff --git a/webactivity.py b/webactivity.py
index 8495faf..0e03fb2 100644
--- a/webactivity.py
+++ b/webactivity.py
@@ -467,7 +467,7 @@ class WebActivity(activity.Activity):
         key_name = Gdk.keyval_name(event.keyval)
         browser = self._tabbed_view.props.current_browser
 
-        if event.get_state() & Gdk.EventMask.CONTROL_MASK:
+        if event.get_state() & Gdk.ModifierType.CONTROL_MASK:
 
             if key_name == 'd':
                 self._add_link()
@@ -485,12 +485,14 @@ class WebActivity(activity.Activity):
                 _logger.debug('keyboard: Zoom in')
                 browser.zoom_in()
             elif key_name == 'Left':
-                browser.web_navigation.goBack()
+                _logger.debug('keyboard: Go back')
+                browser.go_back()
             elif key_name == 'Right':
-                browser.web_navigation.goForward()
+                _logger.debug('keyboard: Go forward')
+                browser.go_forward()
             elif key_name == 'r':
-                flags = components.interfaces.nsIWebNavigation.LOAD_FLAGS_NONE
-                browser.web_navigation.reload(flags)
+                _logger.debug('keyboard: Reload')
+                browser.reload()
             elif Gdk.keyval_name(event.keyval) == "t":
                 if not self._disable_multiple_tabs:
                     self._tabbed_view.add_tab()
--
cgit v0.9.1