rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/The-Compiler/qutebrowser into pintab

Browse Source
This commit is contained in:
thuck 2016-11-08 19:53:46 +01:00
commit d8b5ca295e
4 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qutebrowser/app.py
View File

@ -732,6 +732,7 @@ class Application(QApplication):
Attributes: Attributes:
_args: ArgumentParser instance. _args: ArgumentParser instance.
_last_focus_object: The last focused object's repr.
""" """
new_window = pyqtSignal(mainwindow.MainWindow) new_window = pyqtSignal(mainwindow.MainWindow)
@ -742,6 +743,8 @@ class Application(QApplication):
Args: Args:
Argument namespace from argparse. Argument namespace from argparse.
""" """
self._last_focus_object = None
qt_args = qtutils.get_args(args) qt_args = qtutils.get_args(args)
log.init.debug("Qt arguments: {}, based on {}".format(qt_args, args)) log.init.debug("Qt arguments: {}, based on {}".format(qt_args, args))
super().__init__(qt_args) super().__init__(qt_args)
@ -758,7 +761,10 @@ class Application(QApplication):
@pyqtSlot(QObject) @pyqtSlot(QObject)
def on_focus_object_changed(self, obj): def on_focus_object_changed(self, obj):
"""Log when the focus object changed.""" """Log when the focus object changed."""
log.misc.debug("Focus object changed: {!r}".format(obj)) output = repr(obj)
if self._last_focus_object != output:
log.misc.debug("Focus object changed: {}".format(output))
self._last_focus_object = output
def __repr__(self): def __repr__(self):
return utils.get_repr(self) return utils.get_repr(self)

5
qutebrowser/browser/webengine/webenginetab.py
View File

@ -402,7 +402,10 @@ class WebEngineElements(browsertab.AbstractElements):
Called with a WebEngineElement or None. Called with a WebEngineElement or None.
js_elem: The element serialized from javascript. js_elem: The element serialized from javascript.
""" """
log.webview.debug("Got element from JS: {!r}".format(js_elem)) debug_str = ('None' if js_elem is None
else utils.elide(repr(js_elem), 100))
log.webview.debug("Got element from JS: {}".format(debug_str))
if js_elem is None: if js_elem is None:
callback(None) callback(None)
else: else:

5
qutebrowser/mainwindow/tabbedbrowser.py
View File

@ -559,6 +559,11 @@ class TabbedBrowser(tabwidget.TabWidget):
# closing the last tab (before quitting) or shutting down # closing the last tab (before quitting) or shutting down
return return
tab = self.widget(idx) tab = self.widget(idx)
if tab is None:
log.webview.debug("on_current_changed got called with invalid "
"index {}".format(idx))
return
log.modes.debug("Current tab changed, focusing {!r}".format(tab)) log.modes.debug("Current tab changed, focusing {!r}".format(tab))
tab.setFocus() tab.setFocus()
for mode in [usertypes.KeyMode.hint, usertypes.KeyMode.insert, for mode in [usertypes.KeyMode.hint, usertypes.KeyMode.insert,

3
qutebrowser/misc/ipc.py
View File

@ -362,6 +362,9 @@ class IPCServer(QObject):
@pyqtSlot() @pyqtSlot()
def on_timeout(self): def on_timeout(self):
"""Cancel the current connection if it was idle for too long.""" """Cancel the current connection if it was idle for too long."""
if self._socket is None:
log.ipc.error("on_timeout got called with None socket!")
return
log.ipc.error("IPC connection timed out " log.ipc.error("IPC connection timed out "
"(socket 0x{:x}).".format(id(self._socket))) "(socket 0x{:x}).".format(id(self._socket)))
self._socket.disconnectFromServer() self._socket.disconnectFromServer()