little cleanup / indentation fix

src/common/connection.py

@@ -274,12 +274,13 @@ class Connection:
 			if xtag.getNamespace() == common.xmpp.NS_ENCRYPTED:
 				encTag = xtag
 				break
-		#invitations
-		for xtag in xtags: 
-			if xtag.getNamespace() == common.xmpp.NS_MUC_USER and xtag.getTag('invite'): 
+			#invitations
+			elif xtag.getNamespace() == common.xmpp.NS_MUC_USER and \
+				xtag.getTag('invite'): 
 				invite = xtag
 				
-			# FIXME: Msn transport (CMSN1.2.1 and PyMSN0.10) do NOT RECOMMENDED invitation
+			# FIXME: Msn transport (CMSN1.2.1 and PyMSN0.10) do NOT RECOMMENDED
+			# invitation
 			# stanza (MUC JEP) remove in 2007, as we do not do NOT RECOMMENDED
 			elif xtag.getNamespace() == common.xmpp.NS_CONFERENCE:
 				room_jid = xtag.getAttr('jid')

src/gajim.py

@@ -459,7 +459,7 @@ class Interface:
 
 		# array : (contact, msg, time, encrypted, msg_type, subject)
 		self.roster.on_message(jid, array[1], array[2], account, array[3],
-			array[4], array[5])
+			msg_type, array[5])
 		if gajim.config.get_per('soundevents', 'first_message_received',
 			'enabled') and first:
 			helpers.play_sound('first_message_received')

src/tabbed_chat_window.py

@@ -112,8 +112,8 @@ class TabbedChatWindow(chat.Chat):
 			self.mouse_over_in_last_5_secs = True
 			self.mouse_over_in_last_30_secs = True
 
-	def on_drag_data_received(self, widget, context, x, y, selection, target_type,
-timestamp, contact):
+	def on_drag_data_received(self, widget, context, x, y, selection,
+		target_type, timestamp, contact):
 		if target_type == self.TARGET_TYPE_URI_LIST:
 			uri = selection.data.strip()
 			uri_splitted = uri.split() # we may have more than one file dropped
@@ -418,7 +418,7 @@ timestamp, contact):
 		
 		self.possible_paused_timeout_id[contact.jid] =\
 			gobject.timeout_add(5000, self.check_for_possible_paused_chatstate,
-				contact.jid)
+			contact.jid)
 		self.possible_inactive_timeout_id[contact.jid] =\
 			gobject.timeout_add(30000, self.check_for_possible_inactive_chatstate,
 				contact.jid)