No space in indentation, checked by drpython (editor). /src part

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.')

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:

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'),

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

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

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()

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')

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 = ''

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)

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: