remove trailing whitespaces and fix coding styles etc and add a FIXME

src/config.py

@@ -369,7 +369,8 @@ class PreferencesWindow:
 			self.applications_frame.set_no_show_all(True)
 			self.applications_frame.hide()
 		else:
-			self.applications_combobox = self.xml.get_widget('applications_combobox')
+			self.applications_combobox = self.xml.get_widget(
+				'applications_combobox')
 			if gajim.config.get('autodetect_browser_mailer'):
 				self.applications_combobox.set_active(0)
 				gtkgui_helpers.autodetect_browser_mailer()
@@ -527,7 +528,7 @@ class PreferencesWindow:
 
 	def merge_windows(self, kind):
 		for acct in gajim.connections:
-			#save buffers and close windows
+			# save buffers and close windows
 			buf1 = {}
 			buf2 = {}
 			saved_var = {}
@@ -539,7 +540,7 @@ class PreferencesWindow:
 				buf2[jid] = window.message_textviews[jid].get_buffer()
 				saved_var[jid] = window.save_var(jid)
 				window.window.destroy()
-			#open new tabbed chat windows
+			# open new tabbed chat windows
 			for jid in jids:
 				if kind == 'chats':
 					c = gajim.get_contact_instance_with_highest_priority(acct, jid)
@@ -553,7 +554,7 @@ class PreferencesWindow:
 
 	def split_windows(self, kind):
 		for acct in gajim.connections:
-			#save buffers and close tabbed chat windows
+			# save buffers and close tabbed chat windows
 			buf1 = {}
 			buf2 = {}
 			saved_var = {}
@@ -568,7 +569,7 @@ class PreferencesWindow:
 				buf2[jid] = window.message_textviews[jid].get_buffer()
 				saved_var[jid] = window.save_var(jid)
 			windows['tabbed'].window.destroy()
-			#open new tabbed chat windows
+			# open new tabbed chat windows
 			for jid in jids:
 				if kind == 'chats':
 					c = gajim.get_contact_instance_with_highest_priority(acct, jid)

src/disco.py

@@ -428,7 +428,8 @@ _('Without a connection, you can not browse available services')).get_response()
 		self.services_treeview = self.xml.get_widget('services_treeview')
 		# This is more reliable than the cursor-changed signal.
 		selection = self.services_treeview.get_selection()
-		selection.connect_after('changed', self.on_services_treeview_selection_changed)
+		selection.connect_after('changed',
+			self.on_services_treeview_selection_changed)
 		self.services_scrollwin = self.xml.get_widget('services_scrollwin')
 		self.progressbar = self.xml.get_widget('services_progressbar')
 		self.progressbar.set_no_show_all(True)
@@ -446,14 +447,16 @@ _('Without a connection, you can not browse available services')).get_response()
 		self.address_comboboxentry = None
 		address_hbox = self.xml.get_widget('address_hbox')
 		if address_entry:
-			self.address_comboboxentry = self.xml.get_widget('address_comboboxentry')
+			self.address_comboboxentry = self.xml.get_widget(
+				'address_comboboxentry')
 			self.address_comboboxentry_entry = self.address_comboboxentry.child
 			self.address_comboboxentry_entry.set_activates_default(True)
 
 			liststore = gtk.ListStore(str)
 			self.address_comboboxentry.set_model(liststore)
 			self.address_comboboxentry.set_text_column(0)
-			self.latest_addresses = gajim.config.get('latest_disco_addresses').split()
+			self.latest_addresses = gajim.config.get(
+				'latest_disco_addresses').split()
 			jid = gajim.get_hostname_from_account(self.account, use_srv = True)
 			if jid in self.latest_addresses:
 				self.latest_addresses.remove(jid)
@@ -1439,7 +1442,7 @@ class MucBrowser(AgentBrowser):
 		AgentBrowser._clean_treemodel(self)
 
 	def _add_actions(self):
-		self.join_button = gtk.Button(label=_("_Join"), use_underline=True)
+		self.join_button = gtk.Button(label=_('_Join'), use_underline=True)
 		self.join_button.connect('clicked', self.on_join_button_clicked)
 		self.window.action_buttonbox.add(self.join_button)
 		self.join_button.show_all()

src/roster_window.py

@@ -567,7 +567,6 @@ class RosterWindow:
 			elif len(gajim.connections) == 0: # user has no accounts
 				advanced_menuitem.set_sensitive(False)
 
-		
 		#FIXME: Gajim 0.9 should have this visible
 		profile_avatar_menuitem.set_no_show_all(True)
 		profile_avatar_menuitem.hide()
@@ -2185,7 +2184,8 @@ _('If "%s" accepts this request you will know his or her status.') %jid)
 			# Update opened chat windows
 			for jid in gajim.interface.instances[account]['chats']:
 				if jid != 'tabbed':
-					gajim.interface.instances[account]['chats'][jid].set_state_image(jid)
+					gajim.interface.instances[account]['chats'][jid].set_state_image(
+						jid)
 			# Update opened groupchat windows
 			gcs = gajim.interface.instances[account]['gc']
 			if gcs.has_key('tabbed'):

src/systraywin32.py

@@ -296,7 +296,8 @@ class SystrayWin32(systray.Systray):
 		self.systray_winapi.notify_icon.set_tooltip(text)
 
 	def set_img(self):
-		self.tray_ico_imgs = self.load_icos()
+		self.tray_ico_imgs = self.load_icos() #FIXME: do not do this here
+		# see gajim.interface.roster.reload_jabber_state_images() to merge
 		self.systray_winapi.remove_notify_icon()
 		if len(self.jids) > 0:
 			state = 'message'