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

Fixed empty title.

Browse Source
This commit is contained in:
Antoni Boucher 2015-07-11 20:28:31 -04:00
parent 1e354a797e
commit 5dbaea7a83
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qutebrowser/browser/bookmarks.py
View File

@ -76,12 +76,13 @@ class BookmarkManager(QObject):
if not line.strip(): if not line.strip():
# Ignore empty or whitespace-only lines. # Ignore empty or whitespace-only lines.
continue continue
try:
url, title = line.split(maxsplit=1) parts = line.split(maxsplit=1)
except ValueError: if len(parts) == 2:
message.error(0, "Invalid bookmark '{}'".format(line)) self.bookmarks[parts[0]] = parts[1]
else: elif len(parts) == 1:
self.bookmarks[url] = title self.bookmarks[parts[0]] = ''
filename = os.path.join(standarddir.config(), 'bookmarks/urls') filename = os.path.join(standarddir.config(), 'bookmarks/urls')
objreg.get('save-manager').add_saveable( objreg.get('save-manager').add_saveable(
'bookmark-manager', self.save, self.changed, 'bookmark-manager', self.save, self.changed,

3
qutebrowser/browser/commands.py
View File

@ -102,8 +102,7 @@ class CommandDispatcher:
def _current_title(self): def _current_title(self):
"""Convenience method to get the current title.""" """Convenience method to get the current title."""
title = self._current_widget().title() return self._current_widget().title()
return title if title else "(null)"
def _current_widget(self): def _current_widget(self):
"""Get the currently active widget from a command.""" """Get the currently active widget from a command."""