diff --git a/src/config.py b/src/config.py
index 29955915e25d8c9c3ca5641688635d9630541f01..b6f4c0d9542e553f6df40f814b432f60d58ecb9c 100644
--- a/src/config.py
+++ b/src/config.py
@@ -2387,7 +2387,7 @@ class GroupchatConfigWindow(DataFormWindow):
prompt = _('<b>Whom do you want to make an administrator?</b>\n\n')
prompt += _('Can be one of the following:\n'
'1. user@domain/resource (only that resource matches).\n'
- '2. user@domain (any resource matches).\n'
+ '2. user@domain (any resource matches).\n'
'3. domain/resource (only that resource matches).\n'
'4. domain (the domain itself matches, as does any user@domain,\n'
'domain/resource, or address containing a subdomain.')
diff --git a/src/conversation_textview.py b/src/conversation_textview.py
index cbae1fd1da1fecd8426cafa721b156d126912cad..205a9201063759644290f8c0403af335c9e562c4 100644
--- a/src/conversation_textview.py
+++ b/src/conversation_textview.py
@@ -747,7 +747,7 @@ class ConversationTextview:
# number of days since epoch for current time (in GMT) -
# number of days since epoch for message (in GMT)
diff_day = int(timegm(time.localtime())) / 86400 -\
- int(timegm(tim)) / 86400
+ int(timegm(tim)) / 86400
if diff_day == 0:
day_str = ''
elif diff_day == 1:
diff --git a/src/dialogs.py b/src/dialogs.py
index 4bf7c5648e448ed41d91f46b45e90c5240bacb2f..279f67debe4fd940909711524aea34405d1081d2 100644
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -1658,7 +1658,7 @@ class SingleMessageWindow:
sender_list = [i[0].jid + '/' + i[0].resource for i in self.to]
else:
sender_list = [self.to_entry.get_text().decode('utf-8')]
-
+
for to_whom_jid in sender_list:
if self.completion_dict.has_key(to_whom_jid):
to_whom_jid = self.completion_dict[to_whom_jid].jid
diff --git a/src/gajim.py b/src/gajim.py
index 25e61998b6c16919e06ed94131c5cc6a2be33f1d..3e3a82f6d4d7808c635180864475ad34f761f04d 100755
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -1158,7 +1158,7 @@ class Interface:
def handle_event_bad_passphrase(self, account, array):
use_gpg_agent = gajim.config.get('use_gpg_agent')
if use_gpg_agent:
- return
+ return
keyID = gajim.config.get_per('accounts', account, 'keyid')
self.roster.forget_gpg_passphrase(keyID)
dialogs.WarningDialog(_('Your passphrase is incorrect'),
diff --git a/src/groupchat_control.py b/src/groupchat_control.py
index 19330c01c9feff3665c1e21d68807d3a27288e2a..3dc7060bf9a3d271d70c41cb8362474fade04b61 100644
--- a/src/groupchat_control.py
+++ b/src/groupchat_control.py
@@ -1491,8 +1491,8 @@ class GroupchatControl(ChatControlBase):
splitted_text2 = text.split(None, 1)
if text.startswith('/topic '):
if len(splitted_text2) == 2 and \
- self.subject.startswith(splitted_text2[1]) and\
- len(self.subject) > len(splitted_text2[1]):
+ self.subject.startswith(splitted_text2[1]) and\
+ len(self.subject) > len(splitted_text2[1]):
message_buffer.insert_at_cursor(
self.subject[len(splitted_text2[1]):])
return True
diff --git a/src/gtkgui_helpers.py b/src/gtkgui_helpers.py
index 994c70c41618437ed6c8e84caf7a0f12f8f9a8f8..cdfe0fb49eb42f4f0b283cf2743f6c6f9dd66a9c 100644
--- a/src/gtkgui_helpers.py
+++ b/src/gtkgui_helpers.py
@@ -497,8 +497,8 @@ def _get_fade_color(treeview, selected, focused):
p = 0.3 # background
q = 0.7 # foreground # p + q should do 1.0
return gtk.gdk.Color(int(bg.red*p + fg.red*q),
- int(bg.green*p + fg.green*q),
- int(bg.blue*p + fg.blue*q))
+ int(bg.green*p + fg.green*q),
+ int(bg.blue*p + fg.blue*q))
def get_scaled_pixbuf(pixbuf, kind):
'''returns scaled pixbuf, keeping ratio etc or None
diff --git a/src/history_manager.py b/src/history_manager.py
index 9723c05236d15c5e47df5811aeee0dc363d10692..c861d395d431605804e6e522d45ece17ea55f147 100755
--- a/src/history_manager.py
+++ b/src/history_manager.py
@@ -220,7 +220,7 @@ class HistoryManager:
list_of_rowrefs = []
for path in list_of_paths: # make them treerowrefs (it's needed)
- list_of_rowrefs.append(gtk.TreeRowReference(liststore, path))
+ list_of_rowrefs.append(gtk.TreeRowReference(liststore, path))
for rowref in list_of_rowrefs: # FILL THE STORE, for all rows selected
path = rowref.get_path()
@@ -433,7 +433,7 @@ class HistoryManager:
list_of_rowrefs = []
for path in list_of_paths: # make them treerowrefs (it's needed)
- list_of_rowrefs.append(gtk.TreeRowReference(liststore, path))
+ list_of_rowrefs.append(gtk.TreeRowReference(liststore, path))
for rowref in list_of_rowrefs:
path = rowref.get_path()
@@ -486,7 +486,7 @@ class HistoryManager:
self.dialog.destroy()
list_of_rowrefs = []
for path in list_of_paths: # make them treerowrefs (it's needed)
- list_of_rowrefs.append(gtk.TreeRowReference(liststore, path))
+ list_of_rowrefs.append(gtk.TreeRowReference(liststore, path))
for rowref in list_of_rowrefs:
path = rowref.get_path()
@@ -528,7 +528,7 @@ class HistoryManager:
# delete rows from db that match log_line_id
list_of_rowrefs = []
for path in list_of_paths: # make them treerowrefs (it's needed)
- list_of_rowrefs.append(gtk.TreeRowReference(liststore, path))
+ list_of_rowrefs.append(gtk.TreeRowReference(liststore, path))
for rowref in list_of_rowrefs:
path = rowref.get_path()
diff --git a/src/message_window.py b/src/message_window.py
index f969ebf008e566384e8299fe1c96d434512a1f96..1ccbd19f977b54f45cc253c3997f3cee6f532451 100644
--- a/src/message_window.py
+++ b/src/message_window.py
@@ -537,10 +537,10 @@ class MessageWindow:
'''Set tab label as drag source and connect the drag_data_get signal'''
tab_label = self.notebook.get_tab_label(child)
tab_label.dnd_handler = tab_label.connect('drag_data_get',
- self.on_tab_label_drag_data_get_cb)
+ self.on_tab_label_drag_data_get_cb)
self.handlers[tab_label.dnd_handler] = tab_label
tab_label.drag_source_set(gtk.gdk.BUTTON1_MASK, self.DND_TARGETS,
- gtk.gdk.ACTION_MOVE)
+ gtk.gdk.ACTION_MOVE)
tab_label.page_num = self.notebook.page_num(child)
def on_tab_label_drag_data_get_cb(self, widget, drag_context, selection,
@@ -573,14 +573,14 @@ class MessageWindow:
tab_alloc = tab.get_allocation()
if horiz:
if (x >= tab_alloc.x) and \
- (x <= (tab_alloc.x + tab_alloc.width)):
+ (x <= (tab_alloc.x + tab_alloc.width)):
page_num = i
if x >= tab_alloc.x + (tab_alloc.width / 2.0):
to_right = True
break
else:
if (y >= tab_alloc.y) and \
- (y <= (tab_alloc.y + tab_alloc.height)):
+ (y <= (tab_alloc.y + tab_alloc.height)):
page_num = i
if y > tab_alloc.y + (tab_alloc.height / 2.0):
@@ -621,10 +621,10 @@ class MessageWindowMgr:
def __init__(self):
''' A dictionary of windows; the key depends on the config:
- ONE_MSG_WINDOW_NEVER: The key is the contact JID
- ONE_MSG_WINDOW_ALWAYS: The key is MessageWindowMgr.MAIN_WIN
- ONE_MSG_WINDOW_PERACCT: The key is the account name
- ONE_MSG_WINDOW_PERTYPE: The key is a message type constant'''
+ ONE_MSG_WINDOW_NEVER: The key is the contact JID
+ ONE_MSG_WINDOW_ALWAYS: The key is MessageWindowMgr.MAIN_WIN
+ ONE_MSG_WINDOW_PERACCT: The key is the account name
+ ONE_MSG_WINDOW_PERTYPE: The key is a message type constant'''
self._windows = {}
# Map the mode to a int constant for frequent compares
mode = gajim.config.get('one_message_window')
diff --git a/src/profile_window.py b/src/profile_window.py
index 3b9ff5e80e8bf705abe1ad8efc8651c9d1c792ba..2015d5df9a25799f86ec5c8dc5cf4de2dec21086 100644
--- a/src/profile_window.py
+++ b/src/profile_window.py
@@ -321,8 +321,8 @@ class ProfileWindow:
return
if gajim.connections[self.account].connected < 2:
dialogs.ErrorDialog(_('You are not connected to the server'),
- _('Without a connection you can not publish your contact '
- 'information.'))
+ _('Without a connection you can not publish your contact '
+ 'information.'))
return
vcard = self.make_vcard()
nick = ''
diff --git a/src/roster_window.py b/src/roster_window.py
index 35c3ef6064bc022934351c7466dba90b9180374e..eefa1b7176a27d26f9c28df42fa09ce4622217b8 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -400,7 +400,7 @@ class RosterWindow:
def add_to_not_in_the_roster(self, account, jid, nick = '', resource = ''):
''' add jid to group "not in the roster", he MUST not be in roster yet,
- return contact '''
+ return contact '''
keyID = ''
attached_keys = gajim.config.get_per('accounts', account,
'attached_gpg_keys').split()
@@ -986,7 +986,7 @@ class RosterWindow:
for account in connected_accounts_with_vcard:
# profile, avatar
profile_avatar_item = gtk.MenuItem(_('of account %s') % account,
- False)
+ False)
profile_avatar_sub_menu.append(profile_avatar_item)
profile_avatar_item.connect('activate',
self.on_profile_avatar_menuitem_activate, account)
diff --git a/src/tooltips.py b/src/tooltips.py
index 39ba333945e6ad28bf95b0578abef4767d8c9316..49194e0f56a4c74826ffa1e89312a40e7517f16f 100644
--- a/src/tooltips.py
+++ b/src/tooltips.py
@@ -298,7 +298,7 @@ class GCTooltip(BaseTooltip):
# escape markup entities
status = helpers.reduce_chars_newlines(status, 100, 5)
status = '<i>' +\
- gobject.markup_escape_text(status) + '</i>'
+ gobject.markup_escape_text(status) + '</i>'
properties.append((status, None))
else: # no status message, show SHOW instead
show = helpers.get_uf_show(contact.show)
@@ -588,7 +588,7 @@ class FileTransfersTooltip(BaseTooltip):
status = _('Not started')
elif file_props.has_key('connected'):
if file_props.has_key('stopped') and \
- file_props['stopped'] == True:
+ file_props['stopped'] == True:
status = _('Stopped')
elif file_props['completed']:
status = _('Completed')
@@ -597,10 +597,10 @@ class FileTransfersTooltip(BaseTooltip):
status = _('Completed')
else:
if file_props.has_key('paused') and \
- file_props['paused'] == True:
- status = _('?transfer status:Paused')
+ file_props['paused'] == True:
+ status = _('?transfer status:Paused')
elif file_props.has_key('stalled') and \
- file_props['stalled'] == True:
+ file_props['stalled'] == True:
#stalled is not paused. it is like 'frozen' it stopped alone
status = _('Stalled')
else: