Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--browser.py18
-rw-r--r--downloadmanager.py58
-rw-r--r--edittoolbar.py6
-rw-r--r--filepicker.py4
-rw-r--r--globalhistory.py6
-rw-r--r--linkbutton.py24
-rw-r--r--messenger.py40
-rw-r--r--model.py24
-rw-r--r--palettes.py10
-rw-r--r--places.py2
-rw-r--r--progresslistener.py10
-rw-r--r--promptservice.py20
-rw-r--r--securitydialogs.py8
-rw-r--r--sessionhistory.py2
-rw-r--r--sessionstore.py14
-rw-r--r--viewtoolbar.py18
-rw-r--r--webactivity.py76
-rw-r--r--webtoolbar.py16
18 files changed, 178 insertions, 178 deletions
diff --git a/browser.py b/browser.py
index 237dc3b..552c633 100644
--- a/browser.py
+++ b/browser.py
@@ -45,7 +45,7 @@ _ZOOM_AMOUNT = 0.1
class GetSourceListener(object):
_com_interfaces_ = interfaces.nsIWebProgressListener
-
+
def __init__(self, file_path, async_cb, async_err_cb):
self._file_path = file_path
self._async_cb = async_cb
@@ -91,9 +91,9 @@ class TabbedView(gtk.Notebook):
_com_interfaces_ = interfaces.nsIWindowCreator
- AGENT_SHEET = os.path.join(activity.get_bundle_path(),
+ AGENT_SHEET = os.path.join(activity.get_bundle_path(),
'agent-stylesheet.css')
- USER_SHEET = os.path.join(env.get_profile_path(), 'gecko',
+ USER_SHEET = os.path.join(env.get_profile_path(), 'gecko',
'user-stylesheet.css')
def __init__(self):
@@ -115,7 +115,7 @@ class TabbedView(gtk.Notebook):
style_sheet_service = cls.getService(interfaces.nsIStyleSheetService)
if os.path.exists(TabbedView.AGENT_SHEET):
- agent_sheet_uri = io_service.newURI('file:///' +
+ agent_sheet_uri = io_service.newURI('file:///' +
TabbedView.AGENT_SHEET,
None, None)
style_sheet_service.loadAndRegisterSheet(agent_sheet_uri,
@@ -147,7 +147,7 @@ class TabbedView(gtk.Notebook):
dialog.set_transient_for(parent_view.get_toplevel())
browser = dialog.view.browser
-
+
item = browser.queryInterface(interfaces.nsIDocShellTreeItem)
item.itemType = interfaces.nsIDocShellTreeItem.typeChromeWrapper
@@ -189,7 +189,7 @@ class TabbedView(gtk.Notebook):
if tab_sessions and isinstance(tab_sessions[0], dict):
# Old format, no tabs
tab_sessions = [tab_sessions]
-
+
while self.get_n_pages():
self.remove_page(self.get_n_pages() - 1)
@@ -216,7 +216,7 @@ class TabLabel(gtk.HBox):
def __init__(self, browser):
gobject.GObject.__init__(self)
-
+
self._browser = browser
self._browser.connect('is-setup', self.__browser_is_setup_cb)
@@ -307,7 +307,7 @@ class Browser(WebView):
interfaces.nsIWebBrowserPersist.PERSIST_FLAGS_FROM_CACHE
temp_path = os.path.join(activity.get_activity_root(), 'instance')
- file_path = os.path.join(temp_path, '%i' % time.time())
+ file_path = os.path.join(temp_path, '%i' % time.time())
cls = components.classes["@mozilla.org/file/local;1"]
local_file = cls.createInstance(interfaces.nsILocalFile)
local_file.initWithPath(file_path)
@@ -316,7 +316,7 @@ class Browser(WebView):
persist.progressListener = xpcom.server.WrapObject(
progresslistener, interfaces.nsIWebProgressListener)
- uri = self.web_navigation.currentURI
+ uri = self.web_navigation.currentURI
persist.saveURI(uri, self.doc_shell, None, None, None, local_file)
def zoom_in(self):
diff --git a/downloadmanager.py b/downloadmanager.py
index a3fe6d8..03196aa 100644
--- a/downloadmanager.py
+++ b/downloadmanager.py
@@ -64,11 +64,11 @@ def can_quit():
def remove_all_downloads():
for download in _active_downloads:
- download.cancelable.cancel(NS_ERROR_FAILURE)
+ download.cancelable.cancel(NS_ERROR_FAILURE)
if download.dl_jobject is not None:
download.datastore_deleted_handler.remove()
datastore.delete(download.dl_jobject.object_id)
- download.cleanup_datastore_write()
+ download.cleanup_datastore_write()
class HelperAppLauncherDialog:
_com_interfaces_ = interfaces.nsIHelperAppLauncherDialog
@@ -100,9 +100,9 @@ class HelperAppLauncherDialog:
requestor = window_context.queryInterface(interfaces.nsIInterfaceRequestor)
dom_window = requestor.getInterface(interfaces.nsIDOMWindow)
_dest_to_window[file_path] = dom_window
-
+
return dest_file
-
+
def show(self, launcher, context, reason):
launcher.saveToDisk(None, False)
return NS_OK
@@ -137,7 +137,7 @@ class Download:
view = hulahop.get_view_for_window(dom_window)
logging.debug('Download.init dom_window: %r' % dom_window)
self._activity = view.get_toplevel()
-
+
return NS_OK
def onStatusChange(self, web_progress, request, status, message):
@@ -146,33 +146,33 @@ class Download:
def onStateChange(self, web_progress, request, state_flags, status):
if state_flags & interfaces.nsIWebProgressListener.STATE_START:
- self._create_journal_object()
+ self._create_journal_object()
self._object_id = self.dl_jobject.object_id
-
+
alert = TimeoutAlert(9)
alert.props.title = _('Download started')
- alert.props.msg = _('%s' % self._get_file_name())
+ alert.props.msg = _('%s' % self._get_file_name())
self._activity.add_alert(alert)
alert.connect('response', self.__start_response_cb)
alert.show()
global _active_downloads
_active_downloads.append(self)
-
+
elif state_flags & interfaces.nsIWebProgressListener.STATE_STOP:
if NS_FAILED(status): # download cancelled
return
self._stop_alert = Alert()
- self._stop_alert.props.title = _('Download completed')
- self._stop_alert.props.msg = _('%s' % self._get_file_name())
- open_icon = Icon(icon_name='zoom-activity')
- self._stop_alert.add_button(gtk.RESPONSE_APPLY,
- _('Show in Journal'), 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()
- self._activity.add_alert(self._stop_alert)
+ self._stop_alert.props.title = _('Download completed')
+ self._stop_alert.props.msg = _('%s' % self._get_file_name())
+ open_icon = Icon(icon_name='zoom-activity')
+ self._stop_alert.add_button(gtk.RESPONSE_APPLY,
+ _('Show in Journal'), 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()
+ self._activity.add_alert(self._stop_alert)
self._stop_alert.connect('response', self.__stop_response_cb)
self._stop_alert.show()
@@ -197,7 +197,7 @@ class Download:
global _active_downloads
if response_id is gtk.RESPONSE_CANCEL:
logging.debug('Download Canceled')
- self.cancelable.cancel(NS_ERROR_FAILURE)
+ self.cancelable.cancel(NS_ERROR_FAILURE)
try:
self.datastore_deleted_handler.remove()
datastore.delete(self._object_id)
@@ -208,17 +208,17 @@ class Download:
if self._stop_alert is not None:
self._activity.remove_alert(self._stop_alert)
- self._activity.remove_alert(alert)
+ self._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')
- activity.show_object_in_journal(self._object_id)
+ 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')
+ activity.show_object_in_journal(self._object_id)
self._activity.remove_alert(alert)
-
+
def cleanup_datastore_write(self):
- global _active_downloads
+ global _active_downloads
_active_downloads.remove(self)
if os.path.isfile(self.dl_jobject.file_path):
@@ -373,7 +373,7 @@ class _SaveLinkProgressListener(object):
channel = request.QueryInterface(interfaces.nsIChannel)
self._external_listener = \
- external_helper.doContent(channel.contentType, request,
+ external_helper.doContent(channel.contentType, request,
self._owner_document.defaultView, True)
self._external_listener.onStartRequest(request, context)
diff --git a/edittoolbar.py b/edittoolbar.py
index 765a59c..67876fd 100644
--- a/edittoolbar.py
+++ b/edittoolbar.py
@@ -88,7 +88,7 @@ class EditToolbar(activity.EditToolbar):
search_item.show()
self._prev = ToolButton('go-previous-paired')
- self._prev.set_tooltip(_('Previous'))
+ self._prev.set_tooltip(_('Previous'))
self._prev.props.sensitive = False
self._prev.connect('clicked', self.__find_previous_cb)
self.insert(self._prev, -1)
@@ -134,12 +134,12 @@ class EditToolbar(activity.EditToolbar):
if found == interfaces.nsITypeAheadFind.FIND_NOTFOUND:
self._prev.props.sensitive = False
self._next.props.sensitive = False
- entry.modify_text(gtk.STATE_NORMAL,
+ entry.modify_text(gtk.STATE_NORMAL,
style.COLOR_BUTTON_GREY.get_gdk_color())
else:
self._prev.props.sensitive = True
self._next.props.sensitive = True
- entry.modify_text(gtk.STATE_NORMAL,
+ entry.modify_text(gtk.STATE_NORMAL,
style.COLOR_BLACK.get_gdk_color())
def __find_previous_cb(self, button):
diff --git a/filepicker.py b/filepicker.py
index f35b822..d5e8ea0 100644
--- a/filepicker.py
+++ b/filepicker.py
@@ -52,7 +52,7 @@ class FilePicker:
self._title = None
self._parent = None
self._file = None
-
+
def appendFilter(self, title, filter):
logging.warning('FilePicker.appendFilter: UNIMPLEMENTED')
@@ -63,7 +63,7 @@ class FilePicker:
self._title = title
self._file = None
self._parent = hulahop.get_view_for_window(parent).get_toplevel()
-
+
if mode != interfaces.nsIFilePicker.modeOpen:
raise xpcom.COMException(NS_ERROR_NOT_IMPLEMENTED)
diff --git a/globalhistory.py b/globalhistory.py
index 811de7e..1c9d62d 100644
--- a/globalhistory.py
+++ b/globalhistory.py
@@ -45,7 +45,7 @@ class GlobalHistory:
if place:
place.visits += 1
place.last_visit = datetime.now()
- self._store.update_place(place)
+ self._store.update_place(place)
else:
place = places.Place(uri.spec)
self._store.add_place(place)
@@ -54,7 +54,7 @@ class GlobalHistory:
place = self._store.lookup_place(uri.spec)
if place:
place.title = title
- self._store.update_place(place)
+ self._store.update_place(place)
def addDocumentRedirect(self, old_channel, new_channel, flags, toplevel):
pass
@@ -70,7 +70,7 @@ class GlobalHistory:
place = self._store.lookup_place(uri.spec)
if place:
place.gecko_flags = flags
- self._store.update_place(place)
+ self._store.update_place(place)
components.registrar.registerFactory(GlobalHistory.cid,
GlobalHistory.description,
diff --git a/linkbutton.py b/linkbutton.py
index 6ec6480..76101b6 100644
--- a/linkbutton.py
+++ b/linkbutton.py
@@ -39,29 +39,29 @@ class LinkButton(TrayButton, gobject.GObject):
self.set_image(buf, color.split(',')[1], color.split(',')[0])
self.hash = hash
- info = title +'\n'+ owner
- self.setup_rollover_options(info)
-
+ info = title +'\n'+ owner
+ self.setup_rollover_options(info)
+
def set_image(self, buf, fill='#0000ff', stroke='#4d4c4f'):
- img = gtk.Image()
+ img = gtk.Image()
loader = gtk.gdk.PixbufLoader()
loader.write(buf)
loader.close()
pixbuf = loader.get_pixbuf()
- del loader
+ del loader
xo_buddy = os.path.join(os.path.dirname(__file__), "icons/link.svg")
pixbuf_bg = self._read_link_background(xo_buddy, fill, stroke)
pixbuf_bg = pixbuf_bg.scale_simple(style.zoom(120),
style.zoom(110),
- gtk.gdk.INTERP_BILINEAR)
- dest_x = style.zoom(10)
- dest_y = style.zoom(20)
+ gtk.gdk.INTERP_BILINEAR)
+ dest_x = style.zoom(10)
+ dest_y = style.zoom(20)
w = pixbuf.get_width()
- h = pixbuf.get_height()
+ h = pixbuf.get_height()
scale_x = 1
scale_y = 1
-
+
pixbuf.composite(pixbuf_bg, dest_x, dest_y, w, h, dest_x, dest_y,
scale_x, scale_y, gtk.gdk.INTERP_BILINEAR, 255)
img.set_from_pixbuf(pixbuf_bg)
@@ -75,11 +75,11 @@ class LinkButton(TrayButton, gobject.GObject):
icon_file = open(filename, 'r')
data = icon_file.read()
icon_file.close()
-
+
if fill_color:
entity = '<!ENTITY fill_color "%s">' % fill_color
data = re.sub('<!ENTITY fill_color .*>', entity, data)
-
+
if stroke_color:
entity = '<!ENTITY stroke_color "%s">' % stroke_color
data = re.sub('<!ENTITY stroke_color .*>', entity, data)
diff --git a/messenger.py b/messenger.py
index 29867e5..6d8a035 100644
--- a/messenger.py
+++ b/messenger.py
@@ -45,14 +45,14 @@ class Messenger(ExportedGObject):
_logger.debug('Add member handle=%s bus_name=%s'
%(str(handle), str(bus_name)))
self.members.append(bus_name)
-
+
for handle in removed:
_logger.debug('Remove member %r', handle)
try:
self.members.remove(self.tube.participants[handle])
except ValueError:
_logger.debug('Remove member %r - already absent', handle)
-
+
if not self.entered:
self.tube.add_signal_receiver(self._add_link_receiver, '_add_link',
IFACE, path=PATH,
@@ -61,10 +61,10 @@ class Messenger(ExportedGObject):
self.bus_name = self.tube.get_unique_name()
if self.is_initiator:
_logger.debug('Initialising a new shared browser, I am %s .'
- %self.tube.get_unique_name())
- else:
+ %self.tube.get_unique_name())
+ else:
# sync with other members
- _logger.debug('Joined I am %s .'%self.bus_name)
+ _logger.debug('Joined I am %s .'%self.bus_name)
for member in self.members:
if member != self.bus_name:
_logger.debug('Get info from %s' %member)
@@ -72,18 +72,18 @@ class Messenger(ExportedGObject):
self.model.get_links_ids(), dbus_interface=IFACE,
reply_handler=self.reply_sync, error_handler=lambda
e:self.error_sync(e, 'transfering file'))
-
+
self.entered = True
-
+
def reply_sync(self, a_ids, sender):
- a_ids.pop()
+ a_ids.pop()
for link in self.model.data['shared_links']:
if link['hash'] not in a_ids:
self.tube.get_object(sender, PATH).send_link(
link['hash'], link['url'], link['title'], link['color'],
link['owner'], link['thumb'], link['timestamp'])
-
- def error_sync(self, e, when):
+
+ def error_sync(self, e, when):
_logger.error('Error %s: %s'%(when, e))
@dbus.service.method(dbus_interface=IFACE, in_signature='as',
@@ -100,9 +100,9 @@ class Messenger(ExportedGObject):
a_ids = self.model.get_links_ids()
a_ids.append('')
# links I want from the caller
- return (a_ids, self.bus_name)
-
- @dbus.service.method(dbus_interface=IFACE, in_signature='ssssssd',
+ return (a_ids, self.bus_name)
+
+ @dbus.service.method(dbus_interface=IFACE, in_signature='ssssssd',
out_signature='')
def send_link(self, identifier, url, title, color, owner, buf, timestamp):
'''Send link'''
@@ -110,18 +110,18 @@ class Messenger(ExportedGObject):
if identifier not in a_ids:
thumb = base64.b64decode(buf)
self.model.add_link(url, title, thumb, owner, color, timestamp)
-
+
@dbus.service.signal(IFACE, signature='sssssd')
- def _add_link(self, url, title, color, owner, thumb, timestamp):
+ def _add_link(self, url, title, color, owner, thumb, timestamp):
'''Signal to send the link information (add)'''
_logger.debug('Add Link: %s '%url)
-
- def _add_link_receiver(self, url, title, color, owner, buf, timestamp,
+
+ def _add_link_receiver(self, url, title, color, owner, buf, timestamp,
sender=None):
'''Member sent a link'''
- handle = self.tube.bus_name_to_handle[sender]
+ handle = self.tube.bus_name_to_handle[sender]
if self.tube.self_handle != handle:
thumb = base64.b64decode(buf)
- self.model.add_link(url, title, thumb, owner, color, timestamp)
+ self.model.add_link(url, title, thumb, owner, color, timestamp)
_logger.debug('Added link: %s to linkbar.'%(url))
-
+
diff --git a/model.py b/model.py
index 7a8e4af..da9d1bc 100644
--- a/model.py
+++ b/model.py
@@ -23,31 +23,31 @@ import base64
class Model(gobject.GObject):
''' The model of web-activity which uses json to serialize its data
- to a file and deserealize from it.
+ to a file and deserealize from it.
'''
__gsignals__ = {
'add_link': (gobject.SIGNAL_RUN_FIRST,
gobject.TYPE_NONE, ([int]))
}
-
+
def __init__(self):
- gobject.GObject.__init__(self)
+ gobject.GObject.__init__(self)
self.data = {}
self.data['shared_links'] = []
self.data['deleted'] = []
-
+
def add_link(self, url, title, thumb, owner, color, timestamp):
index = len(self.data['shared_links'])
for item in self.data['shared_links']:
- if timestamp <= item['timestamp']:
+ if timestamp <= item['timestamp']:
index = self.data['shared_links'].index(item)
break
-
+
self.data['shared_links'].insert(index,
{'hash':sha.new(str(url)).hexdigest(),
'url':str(url), 'title':str(title),
'thumb':base64.b64encode(thumb),
- 'owner':str(owner),
+ 'owner':str(owner),
'color':str(color),
'timestamp':float(timestamp)})
self.emit('add_link', index)
@@ -57,8 +57,8 @@ class Model(gobject.GObject):
if link['hash'] == hash:
self.data['deleted'].append(link['hash'])
self.data['shared_links'].remove(link)
- break
-
+ break
+
def serialize(self):
return cjson.encode(self.data)
@@ -68,12 +68,12 @@ class Model(gobject.GObject):
self.data['shared_links'] = []
if not self.data.has_key('deleted'):
self.data['deleted'] = []
-
+
def get_links_ids(self):
ids = []
for link in self.data['shared_links']:
ids.append(link['hash'])
ids.extend(self.data['deleted'])
- ids.append('')
+ ids.append('')
return ids
-
+
diff --git a/palettes.py b/palettes.py
index c82bee0..e9a1e3c 100644
--- a/palettes.py
+++ b/palettes.py
@@ -100,13 +100,13 @@ class ContentInvoker(Invoker):
self.notify_right_click()
else:
return
-
- if self._popdown_handler_id is not None:
+
+ if self._popdown_handler_id is not None:
self._popdown_handler_id = self.palette.connect( \
'popdown', self.__palette_popdown_cb)
self._mouseout_listener = MouseOutListener(target)
- wrapper = xpcom.server.WrapObject(self._mouseout_listener,
+ wrapper = xpcom.server.WrapObject(self._mouseout_listener,
interfaces.nsIDOMEventListener)
target.addEventListener('mouseout', wrapper, False)
self._mouseout_listener.connect('mouse-out', self.__moved_out_cb)
@@ -116,7 +116,7 @@ class ContentInvoker(Invoker):
def __palette_popdown_cb(self, palette):
if self._mouseout_listener is not None:
- wrapper = xpcom.server.WrapObject(self._mouseout_listener,
+ wrapper = xpcom.server.WrapObject(self._mouseout_listener,
interfaces.nsIDOMEventListener)
self._mouseout_listener.target.removeEventListener('mouseout',
wrapper, False)
@@ -241,7 +241,7 @@ class ImagePalette(Palette):
cls = components.classes['@mozilla.org/file/local;1']
target_file = cls.createInstance(interfaces.nsILocalFile)
target_file.initWithPath(temp_file)
-
+
cls = components.classes[ \
'@mozilla.org/embedding/browser/nsWebBrowserPersist;1']
persist = cls.createInstance(interfaces.nsIWebBrowserPersist)
diff --git a/places.py b/places.py
index 1277835..d2667d2 100644
--- a/places.py
+++ b/places.py
@@ -34,7 +34,7 @@ class Place(object):
class SqliteStore(object):
MAX_SEARCH_MATCHES = 20
EXPIRE_DAYS = 30
-
+
def __init__(self):
db_path = os.path.join(activity.get_activity_root(),
'data', 'places.db')
diff --git a/progresslistener.py b/progresslistener.py
index 5ac7d7a..b3e401c 100644
--- a/progresslistener.py
+++ b/progresslistener.py
@@ -42,11 +42,11 @@ class ProgressListener(gobject.GObject):
interfaces.nsIWebProgress.NOTIFY_LOCATION
browser.web_progress.addProgressListener(self._wrapped_self, mask)
-
+
def _reset_requests_count(self):
self._total_requests = 0
self._completed_requests = 0
-
+
def onLocationChange(self, webProgress, request, location):
self._location = location
self.notify('location')
@@ -54,10 +54,10 @@ class ProgressListener(gobject.GObject):
def onProgressChange(self, webProgress, request, curSelfProgress,
maxSelfProgress, curTotalProgress, maxTotalProgress):
pass
-
+
def onSecurityChange(self, webProgress, request, state):
pass
-
+
def onStateChange(self, webProgress, request, stateFlags, status):
if stateFlags & interfaces.nsIWebProgressListener.STATE_IS_REQUEST:
if stateFlags & interfaces.nsIWebProgressListener.STATE_START:
@@ -68,7 +68,7 @@ class ProgressListener(gobject.GObject):
if stateFlags & interfaces.nsIWebProgressListener.STATE_IS_NETWORK:
if stateFlags & interfaces.nsIWebProgressListener.STATE_START:
self._loading = True
- self._reset_requests_count()
+ self._reset_requests_count()
self.notify('loading')
elif stateFlags & interfaces.nsIWebProgressListener.STATE_STOP:
self._loading = False
diff --git a/promptservice.py b/promptservice.py
index 24e5f18..5f8f9d2 100644
--- a/promptservice.py
+++ b/promptservice.py
@@ -29,35 +29,35 @@ class PromptService:
def __init__(self):
pass
-
+
def alert(self, parent, dialogTitle, text):
logging.debug('nsIPromptService.alert()')
-
+
def alertCheck(self, parent, dialogTitle, text, checkMsg, checkState):
logging.debug('nsIPromptService.alertCheck()')
-
+
def confirm(self, parent, dialogTitle, text):
logging.debug('nsIPromptService.confirm()')
-
+
def confirmCheck(self, parent, dialogTitle, text, checkMsg, checkState):
logging.debug('nsIPromptService.confirmCheck()')
-
+
def confirmEx(self, parent, dialogTitle, text, buttonFlags, button0Title,
button1Title, button2Title, checkMsg, checkState):
logging.debug('nsIPromptService.confirmEx()')
-
+
def prompt(self, parent, dialogTitle, text, value, checkMsg, checkState):
logging.debug('nsIPromptService.prompt()')
-
+
def promptPassword(self, parent, dialogTitle, text, password, checkMsg,
checkState):
logging.debug('nsIPromptService.promptPassword()')
-
+
def promptUsernameAndPassword(self, parent, dialogTitle, text, username,
password, checkMsg, checkState):
logging.debug('nsIPromptService.promptUsernameAndPassword()')
-
- def select(self, parent, dialogTitle, text, count, selectList,
+
+ def select(self, parent, dialogTitle, text, count, selectList,
outSelection):
logging.debug('nsIPromptService.select()')
diff --git a/securitydialogs.py b/securitydialogs.py
index aef3ed5..29e5825 100644
--- a/securitydialogs.py
+++ b/securitydialogs.py
@@ -29,19 +29,19 @@ class SecurityDialogs:
def __init__(self):
pass
-
+
def confirmCertExpired(socketInfo, cert):
logging.debug('UNIMPLEMENTED: SecurityDialogs.confirmCertExpired()')
return interfaces.nsIBadCertListener.ADD_TRUSTED_FOR_SESSION, True
-
+
def confirmMismatchDomain(socketInfo, targetURL, cert):
logging.debug('UNIMPLEMENTED: SecurityDialogs.confirmMismatchDomain()')
return interfaces.nsIBadCertListener.ADD_TRUSTED_FOR_SESSION, True
-
+
def confirmUnknownIssuer(socketInfo, cert, certAddType):
logging.debug('UNIMPLEMENTED: SecurityDialogs.confirmUnknownIssuer()')
return interfaces.nsIBadCertListener.ADD_TRUSTED_FOR_SESSION, True
-
+
def notifyCrlNextupdate(socketInfo, targetURL, cert):
logging.debug('UNIMPLEMENTED: SecurityDialogs.notifyCrlNextupdate()')
diff --git a/sessionhistory.py b/sessionhistory.py
index b50bb45..50166cb 100644
--- a/sessionhistory.py
+++ b/sessionhistory.py
@@ -24,7 +24,7 @@ class HistoryListener(gobject.GObject):
_com_interfaces_ = interfaces.nsISHistoryListener
__gsignals__ = {
- 'session-history-changed': (gobject.SIGNAL_RUN_FIRST,
+ 'session-history-changed': (gobject.SIGNAL_RUN_FIRST,
gobject.TYPE_NONE,
([int])),
'session-link-changed': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
diff --git a/sessionstore.py b/sessionstore.py
index d4ed3b2..3ea7875 100644
--- a/sessionstore.py
+++ b/sessionstore.py
@@ -24,14 +24,14 @@ from xpcom.components import interfaces
def get_session(browser):
session_history = browser.web_navigation.sessionHistory
-
+
if session_history.count == 0:
- return ''
- return _get_history(session_history)
-
+ return ''
+ return _get_history(session_history)
+
def set_session(browser, data):
_set_history(browser.web_navigation.sessionHistory, data)
-
+
if data:
browser.web_navigation.gotoIndex(len(data) - 1)
else:
@@ -51,7 +51,7 @@ def _get_history(history):
def _set_history(history, history_data):
history_internal = history.queryInterface(interfaces.nsISHistoryInternal)
-
+
if history_internal.count > 0:
history_internal.purgeHistory(history_internal.count)
@@ -60,7 +60,7 @@ def _set_history(history, history_data):
entry_class = components.classes[ \
"@mozilla.org/browser/session-history-entry;1"]
entry = entry_class.createInstance(interfaces.nsISHEntry)
-
+
io_service_class = components.classes[ \
"@mozilla.org/network/io-service;1"]
io_service = io_service_class.getService(interfaces.nsIIOService)
diff --git a/viewtoolbar.py b/viewtoolbar.py
index 3564269..4f13e73 100644
--- a/viewtoolbar.py
+++ b/viewtoolbar.py
@@ -25,10 +25,10 @@ class ViewToolbar(gtk.Toolbar):
def __init__(self, activity):
gtk.Toolbar.__init__(self)
- self._activity = activity
+ self._activity = activity
self._activity.tray.connect('unmap', self.__unmap_cb)
self._activity.tray.connect('map', self.__map_cb)
-
+
self.zoomout = ToolButton('zoom-out')
self.zoomout.set_tooltip(_('Zoom out'))
self.zoomout.connect('clicked', self.__zoomout_clicked_cb)
@@ -57,7 +57,7 @@ class ViewToolbar(gtk.Toolbar):
self.traybutton.props.sensitive = False
self.insert(self.traybutton, -1)
self.traybutton.show()
-
+
def __zoomin_clicked_cb(self, button):
tabbed_view = self._activity.get_canvas()
tabbed_view.props.current_browser.zoom_in()
@@ -69,7 +69,7 @@ class ViewToolbar(gtk.Toolbar):
def __fullscreen_clicked_cb(self, button):
self._activity.fullscreen()
- def __tray_clicked_cb(self, button):
+ def __tray_clicked_cb(self, button):
if self._activity.tray.props.visible is False:
self._activity.tray.show()
else:
@@ -78,16 +78,16 @@ class ViewToolbar(gtk.Toolbar):
def __map_cb(self, tray):
if len(self._activity.tray.get_children()) > 0:
self.tray_set_hide()
-
+
def __unmap_cb(self, tray):
if len(self._activity.tray.get_children()) > 0:
self.tray_set_show()
-
- def tray_set_show(self):
+
+ def tray_set_show(self):
self.traybutton.set_icon('tray-show')
self.traybutton.set_tooltip(_('Show Tray'))
-
+
def tray_set_hide(self):
self.traybutton.set_icon('tray-hide')
self.traybutton.set_tooltip(_('Hide Tray'))
-
+
diff --git a/webactivity.py b/webactivity.py
index b23f9f8..3a2cfeb 100644
--- a/webactivity.py
+++ b/webactivity.py
@@ -92,7 +92,7 @@ def _seed_xs_cookie():
c = cookies_db.cursor()
c.execute('''CREATE TABLE IF NOT EXISTS
- moz_cookies
+ moz_cookies
(id INTEGER PRIMARY KEY,
name TEXT,
value TEXT,
@@ -107,13 +107,13 @@ def _seed_xs_cookie():
FROM moz_cookies
WHERE name=? AND host=? AND path=?''',
('xoid', jabber_server, '/'))
-
+
if c.fetchone():
_logger.debug('seed_xs_cookie: Cookie exists already')
return
expire = int(time.time()) + 10*365*24*60*60
- c.execute('''INSERT INTO moz_cookies (name, value, host,
+ c.execute('''INSERT INTO moz_cookies (name, value, host,
path, expiry, lastAccessed,
isSecure, isHttpOnly)
VALUES(?,?,?,?,?,?,?,?)''',
@@ -182,7 +182,7 @@ class WebActivity(activity.Activity):
_set_accept_languages()
_seed_xs_cookie()
-
+
# don't pick up the sugar theme - use the native mozilla one instead
cls = components.classes['@mozilla.org/preferences-service;1']
pref_service = cls.getService(components.interfaces.nsIPrefService)
@@ -202,7 +202,7 @@ class WebActivity(activity.Activity):
icon_name='toolbar-edit')
self._primary_toolbar.toolbar.insert(
self._edit_toolbar_button, 1)
-
+
self._view_toolbar = ViewToolbar(self)
view_toolbar_button = ToolbarButton(
page=self._view_toolbar,
@@ -222,7 +222,7 @@ class WebActivity(activity.Activity):
self.connect('key-press-event', self._key_press_cb)
if handle.uri:
- self._tabbed_view.current_browser.load_uri(handle.uri)
+ self._tabbed_view.current_browser.load_uri(handle.uri)
elif not self._jobject.file_path:
# TODO: we need this hack until we extend the activity API for
# opening URIs and default docs.
@@ -231,7 +231,7 @@ class WebActivity(activity.Activity):
self.messenger = None
self.connect('shared', self._shared_cb)
- # Get the Presence Service
+ # Get the Presence Service
self.pservice = presenceservice.get_instance()
try:
name, path = self.pservice.get_preferred_connection()
@@ -241,28 +241,28 @@ class WebActivity(activity.Activity):
except TypeError:
_logger.debug('Offline')
self.initiating = None
-
+
if self._shared_activity is not None:
_logger.debug('shared: %s' %self._shared_activity.props.joined)
if self._shared_activity is not None:
# We are joining the activity
- _logger.debug('Joined activity')
+ _logger.debug('Joined activity')
self.connect('joined', self._joined_cb)
if self.get_shared():
# We've already joined
self._joined_cb()
- else:
+ else:
_logger.debug('Created activity')
-
+
def _shared_cb(self, activity_):
- _logger.debug('My activity was shared')
- self.initiating = True
+ _logger.debug('My activity was shared')
+ self.initiating = True
self._setup()
_logger.debug('This is my activity: making a tube...')
self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES].OfferDBusTube(SERVICE, {})
-
+
def _setup(self):
if self._shared_activity is None:
_logger.debug('Failed to share or join activity')
@@ -279,7 +279,7 @@ class WebActivity(activity.Activity):
channel = telepathy.client.Channel(bus_name, channel_path)
htype, handle = channel.GetHandle()
if htype == telepathy.HANDLE_TYPE_ROOM:
- _logger.debug('Found our room: it has handle#%d "%s"'
+ _logger.debug('Found our room: it has handle#%d "%s"'
%(handle, self.conn.InspectHandles(htype, [handle])[0]))
room = handle
ctype = channel.GetChannelType()
@@ -301,7 +301,7 @@ class WebActivity(activity.Activity):
if tubes_chan is None:
_logger.debug("Didn't find our Tubes channel, requesting one...")
tubes_chan = self.conn.request_channel(telepathy.CHANNEL_TYPE_TUBES,
- telepathy.HANDLE_TYPE_ROOM,
+ telepathy.HANDLE_TYPE_ROOM,
room, True)
self.tubes_chan = tubes_chan
@@ -322,18 +322,18 @@ class WebActivity(activity.Activity):
return
_logger.debug('Joined an existing shared activity')
-
+
self.initiating = False
self._setup()
-
+
_logger.debug('This is not my activity: waiting for a tube...')
self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES].ListTubes(
- reply_handler=self._list_tubes_reply_cb,
+ reply_handler=self._list_tubes_reply_cb,
error_handler=self._list_tubes_error_cb)
def _new_tube_cb(self, identifier, initiator, type, service, params, state):
_logger.debug('New tube: ID=%d initator=%d type=%d service=%s '
- 'params=%r state=%d' %(identifier, initiator, type,
+ 'params=%r state=%d' %(identifier, initiator, type,
service, params, state))
if (type == telepathy.TUBE_TYPE_DBUS and
@@ -342,21 +342,21 @@ class WebActivity(activity.Activity):
self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES].AcceptDBusTube(
identifier)
- self.tube_conn = TubeConnection(self.conn,
- self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES],
+ self.tube_conn = TubeConnection(self.conn,
+ self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES],
identifier, group_iface = self.text_chan[
telepathy.CHANNEL_INTERFACE_GROUP])
-
+
_logger.debug('Tube created')
- self.messenger = Messenger(self.tube_conn, self.initiating,
- self.model)
+ self.messenger = Messenger(self.tube_conn, self.initiating,
+ self.model)
def _load_homepage(self):
browser = self._tabbed_view.current_browser
if os.path.isfile(_LIBRARY_PATH):
browser.load_uri('file://' + _LIBRARY_PATH)
else:
- default_page = os.path.join(activity.get_bundle_path(),
+ default_page = os.path.join(activity.get_bundle_path(),
"data/index.html")
browser.load_uri(default_page)
@@ -372,7 +372,7 @@ class WebActivity(activity.Activity):
if self.metadata['mime_type'] == 'text/plain':
data = self._get_data_from_file_path(file_path)
self.model.deserialize(data)
-
+
for link in self.model.data['shared_links']:
_logger.debug('read: url=%s title=%s d=%s' % (link['url'],
link['title'],
@@ -380,7 +380,7 @@ class WebActivity(activity.Activity):
self._add_link_totray(link['url'],
base64.b64decode(link['thumb']),
link['color'], link['title'],
- link['owner'], -1, link['hash'])
+ link['owner'], -1, link['hash'])
logging.debug('########## reading %s' % data)
self._tabbed_view.set_session(self.model.data['history'])
self._tabbed_view.set_current_page(self.model.data['current_tab'])
@@ -390,11 +390,11 @@ class WebActivity(activity.Activity):
if len(uris) == 1:
self._tabbed_view.props.current_browser.load_uri(uris[0])
else:
- _logger.error('Open uri-list: Does not support'
- 'list of multiple uris by now.')
+ _logger.error('Open uri-list: Does not support'
+ 'list of multiple uris by now.')
else:
self._tabbed_view.props.current_browser.load_uri(file_path)
-
+
def write_file(self, file_path):
if not self.metadata['mime_type']:
self.metadata['mime_type'] = 'text/plain'
@@ -419,16 +419,16 @@ class WebActivity(activity.Activity):
def _link_add_button_cb(self, button):
self._add_link()
-
+
def _key_press_cb(self, widget, event):
if event.state & gtk.gdk.CONTROL_MASK:
if gtk.gdk.keyval_name(event.keyval) == "d":
- self._add_link()
+ self._add_link()
return True
elif gtk.gdk.keyval_name(event.keyval) == "f":
_logger.debug('keyboard: Find')
self._edit_toolbar_button.set_expanded(True)
- self._edit_toolbar.search_entry.grab_focus()
+ self._edit_toolbar.search_entry.grab_focus()
return True
elif gtk.gdk.keyval_name(event.keyval) == "l":
_logger.debug('keyboard: Focus url entry')
@@ -466,7 +466,7 @@ class WebActivity(activity.Activity):
profile.get_color().to_string(), timestamp)
if self.messenger is not None:
- self.messenger._add_link(ui_uri, browser.props.title,
+ self.messenger._add_link(ui_uri, browser.props.title,
profile.get_color().to_string(),
profile.get_nick_name(),
base64.b64encode(buf), timestamp)
@@ -486,9 +486,9 @@ class WebActivity(activity.Activity):
self._tray.add_item(item, index) # use index to add to the tray
item.show()
if self._tray.props.visible is False:
- self._tray.show()
+ self._tray.show()
self._view_toolbar.traybutton.props.sensitive = True
-
+
def _link_removed_cb(self, button, hash):
''' remove a link from tray and delete it in the model '''
self.model.remove_link(hash)
@@ -540,7 +540,7 @@ class WebActivity(activity.Activity):
stop_icon.show()
self.add_alert(alert)
alert.connect('response', self.__inprogress_response_cb)
- alert.show()
+ alert.show()
self.present()
def __inprogress_response_cb(self, alert, response_id):
diff --git a/webtoolbar.py b/webtoolbar.py
index 854345c..d1ac9db 100644
--- a/webtoolbar.py
+++ b/webtoolbar.py
@@ -66,7 +66,7 @@ class WebEntry(AddressEntry):
recognize changes caused directly by user actions"""
self.handler_block(self._change_hid)
try:
- self.props.text = text
+ self.props.text = text
finally:
self.handler_unblock(self._change_hid)
self.set_position(-1)
@@ -175,7 +175,7 @@ class WebEntry(AddressEntry):
if selected is None:
selection.select_iter(model[-1].iter)
self._set_text(model[-1][0])
- else:
+ else:
index = model.get_path(selected)[0]
if index > 0:
selection.select_path(index - 1)
@@ -184,10 +184,10 @@ class WebEntry(AddressEntry):
elif keyname == 'Down':
if selected is None:
down_iter = model.get_iter_first()
- else:
+ else:
down_iter = model.iter_next(selected)
if down_iter:
- selection.select_iter(down_iter)
+ selection.select_iter(down_iter)
self._set_text(model.get(down_iter, 0)[0])
return True
elif keyname == 'Return':
@@ -231,7 +231,7 @@ class PrimaryToolbar(ToolbarBox):
self._activity = act
self._tabbed_view = tabbed_view
-
+
self._loading = False
activity_button = ActivityToolbarButton(self._activity)
@@ -249,7 +249,7 @@ class PrimaryToolbar(ToolbarBox):
entry_item.set_expand(True)
entry_item.add(self.entry)
self.entry.show()
-
+
self.toolbar.insert(entry_item, -1)
entry_item.show()
@@ -259,7 +259,7 @@ class PrimaryToolbar(ToolbarBox):
self._back.connect('clicked', self._go_back_cb)
self.toolbar.insert(self._back, -1)
self._back.show()
-
+
self._forward = ToolButton('go-next-paired')
self._forward.set_tooltip(_('Forward'))
self._forward.props.sensitive = False
@@ -388,7 +388,7 @@ class PrimaryToolbar(ToolbarBox):
def _go_back_cb(self, button):
browser = self._tabbed_view.props.current_browser
browser.web_navigation.goBack()
-
+
def _go_forward_cb(self, button):
browser = self._tabbed_view.props.current_browser
browser.web_navigation.goForward()