Fix some random indentation errors and missing imports.

src/config.py

@@ -1333,8 +1333,6 @@ class AccountsWindow:
 		st = gajim.config.get('mergeaccounts')
 		self.xml.get_widget('merge_checkbutton').set_active(st)
 
-		import os
-
 		self.avahi_available = True
 		try:
 			import avahi

src/dialogs.py

@@ -1898,7 +1898,7 @@ class SingleMessageWindow:
 					spell1.set_language(lang)
 					spell2.set_language(lang)
 			except gobject.GError, msg:
-				dialogs.AspellDictError(lang)
+				self.AspellDictError(lang)
 
 		self.prepare_widgets_for(self.action)
 

src/groupchat_control.py

@@ -47,7 +47,7 @@ from common import helpers
 from chat_control import ChatControl
 from chat_control import ChatControlBase
 from conversation_textview import ConversationTextview
-from common.exceptions import GajimGeneralException
+from common.exceptions import GajimGeneralException
 
 #(status_image, type, nick, shown_nick)
 (

src/roster_window.py

@@ -2364,13 +2364,13 @@ class RosterWindow:
 		if gajim.connections[account] and gajim.connections[account].\
 			privacy_rules_supported:
 			if jid in gajim.connections[account].blocked_contacts:
-					block_menuitem.set_no_show_all(True)
-					unblock_menuitem.connect('activate', self.on_unblock, iter, None)
-					block_menuitem.hide()
+				block_menuitem.set_no_show_all(True)
+				unblock_menuitem.connect('activate', self.on_unblock, iter, None)
+				block_menuitem.hide()
 			else:
-					unblock_menuitem.set_no_show_all(True)
-					block_menuitem.connect('activate', self.on_block, iter, None)
-					unblock_menuitem.hide()
+				unblock_menuitem.set_no_show_all(True)
+				block_menuitem.connect('activate', self.on_block, iter, None)
+				unblock_menuitem.hide()
 		else:
 			unblock_menuitem.set_no_show_all(True)
 			block_menuitem.set_sensitive(False)
@@ -5419,13 +5419,13 @@ class RosterWindow:
 		## accounts has no effect until they are connected.
 		st = gajim.config.get('set_status_msg_from_current_music_track')
 		if st:
-		    gobject.timeout_add(1000,
-			    self.enable_syncing_status_msg_from_current_music_track,
-			    st)
+			gobject.timeout_add(1000,
+				self.enable_syncing_status_msg_from_current_music_track,
+				st)
 		else:
-		    gobject.timeout_add(1000,
-			    self.enable_syncing_status_msg_from_lastfm,
-			    gajim.config.get('set_status_msg_from_lastfm'))
+			gobject.timeout_add(1000,
+				self.enable_syncing_status_msg_from_lastfm,
+				gajim.config.get('set_status_msg_from_lastfm'))
 
 		if gajim.config.get('show_roster_on_startup'):
 			self.window.show_all()

src/search_window.py

@@ -20,7 +20,7 @@
 import gobject
 import gtk
 
-from common import xmpp, gajim, dataforms
+from common import gajim, dataforms
 
 import gtkgui_helpers
 import dialogs

src/tooltips.py

@@ -30,7 +30,6 @@ import gtkgui_helpers
 
 from common import gajim
 from common import helpers
-from common import i18n
 
 class BaseTooltip:
 	''' Base Tooltip class;