[codingstyle] one space between each + - * / = operator

11 files changed, 77 insertions, 76 deletions

diff --git a/src/cell_renderer_image.py b/src/cell_renderer_image.py
index e222a1f2c..090fcb2ce 100644
--- a/src/cell_renderer_image.py
+++ b/src/cell_renderer_image.py
@@ -85,8 +85,8 @@ class CellRendererImage(gtk.GenericCellRenderer):
 		else:
 			return
 		window.draw_pixbuf(widget.style.black_gc, pix, \
-			draw_rect.x-pix_rect.x, draw_rect.y-pix_rect.y, draw_rect.x, \
-			draw_rect.y+2, draw_rect.width, draw_rect.height, \
+			draw_rect.x - pix_rect.x, draw_rect.y - pix_rect.y, draw_rect.x, \
+			draw_rect.y + 2, draw_rect.width, draw_rect.height, \
 			gtk.gdk.RGB_DITHER_NONE, 0, 0)
 
 	def on_get_size(self, widget, cell_area):
diff --git a/src/chat.py b/src/chat.py
index f1dce66de..86f705331 100644
--- a/src/chat.py
+++ b/src/chat.py
@@ -31,7 +31,7 @@ APP = i18n.APP
 gtk.glade.bindtextdomain(APP, i18n.DIR)
 gtk.glade.textdomain(APP)
 
-GTKGUI_GLADE='gtkgui.glade'
+GTKGUI_GLADE = 'gtkgui.glade'
 
 class Chat:
 	"""Class for chat/groupchat windows"""
@@ -316,7 +316,7 @@ class Chat:
 			if event.state & gtk.gdk.CONTROL_MASK: # CTRL + PAGE UP
 				current = self.notebook.get_current_page()
 				if current < (self.notebook.get_n_pages()-1):
-					self.notebook.set_current_page(current+1)
+					self.notebook.set_current_page(current + 1)
 			elif event.state & gtk.gdk.SHIFT_MASK: # SHIFT + PAGE UP
 				conversation_textview = self.xmls[jid].\
 					get_widget('conversation_textview')
@@ -342,7 +342,7 @@ class Chat:
 			elif event.state & gtk.gdk.CONTROL_MASK: # CTRL + TAB
 				current = self.notebook.get_current_page()
 				if current < (self.notebook.get_n_pages()-1):
-					self.notebook.set_current_page(current+1)
+					self.notebook.set_current_page(current + 1)
 				else:
 					self.notebook.set_current_page(0)
 		elif (event.state & gtk.gdk.CONTROL_MASK) or (event.keyval ==\
diff --git a/src/config.py b/src/config.py
index e0f76e0fb..cf21333ff 100644
--- a/src/config.py
+++ b/src/config.py
@@ -37,7 +37,7 @@ APP = i18n.APP
 gtk.glade.bindtextdomain (APP, i18n.DIR)
 gtk.glade.textdomain (APP)
 
-GTKGUI_GLADE='gtkgui.glade'
+GTKGUI_GLADE = 'gtkgui.glade'
 
 
 class Preferences_window:
@@ -420,8 +420,8 @@ class Preferences_window:
 		aat = widget.get_value_as_int()
 		gajim.config.set('autoawaytime', aat)
 		self.plugin.sleeper = common.sleepy.Sleepy(\
-			gajim.config.get('autoawaytime')*60, \
-			gajim.config.get('autoxatime')*60)
+			gajim.config.get('autoawaytime') * 60, \
+			gajim.config.get('autoxatime') * 60)
 		self.plugin.save_config()
 
 	def on_auto_xa_checkbutton_toggled(self, widget):
@@ -432,8 +432,8 @@ class Preferences_window:
 		axt = widget.get_value_as_int()
 		gajim.config.set('autoxatime', axt)
 		self.plugin.sleeper = common.sleepy.Sleepy(\
-			gajim.config.get('autoawaytime')*60, \
-			gajim.config.get('autoxatime')*60)
+			gajim.config.get('autoawaytime') * 60, \
+			gajim.config.get('autoxatime') * 60)
 		self.plugin.save_config()
 
 	def save_status_messages(self, model):
@@ -504,7 +504,7 @@ class Preferences_window:
 		iter = model.get_iter_from_string(row)
 		model.set_value(iter, 0, new_text)
 
-	def on_msg_treeview_cursor_changed(self, widget, data=None):
+	def on_msg_treeview_cursor_changed(self, widget, data = None):
 		(model, iter) = self.msg_tree.get_selection().get_selected()
 		if not iter: return
 		self.xml.get_widget('delete_msg_button').set_sensitive(True)
@@ -513,12 +513,12 @@ class Preferences_window:
 		msg = model.get_value(iter, 1)
 		buf.set_text(msg)
 
-	def on_new_msg_button_clicked(self, widget, data=None):
+	def on_new_msg_button_clicked(self, widget, data = None):
 		model = self.msg_tree.get_model()
 		iter = model.append()
 		model.set(iter, 0, 'msg', 1, 'message')
 
-	def on_delete_msg_button_clicked(self, widget, data=None):
+	def on_delete_msg_button_clicked(self, widget, data = None):
 		(model, iter) = self.msg_tree.get_selection().get_selected()
 		if not iter: return
 		buf = self.xml.get_widget('msg_textview').get_buffer()
@@ -526,7 +526,7 @@ class Preferences_window:
 		buf.set_text('')
 		self.xml.get_widget('delete_msg_button').set_sensitive(False)
 			
-	def on_msg_textview_changed(self, widget, data=None):
+	def on_msg_textview_changed(self, widget, data = None):
 		(model, iter) = self.msg_tree.get_selection().get_selected()
 		if not iter:
 			return
@@ -552,7 +552,7 @@ class Preferences_window:
 			iter = model.append((sound, gajim.config.get_per('soundevents', sound,\
 				'enabled'), gajim.config.get_per('soundevents', sound, 'path')))
 
-	def on_treeview_sounds_cursor_changed(self, widget, data=None):
+	def on_treeview_sounds_cursor_changed(self, widget, data = None):
 		(model, iter) = self.sound_tree.get_selection().get_selected()
 		if not iter:
 			self.xml.get_widget('sounds_entry').set_text('')
@@ -560,7 +560,7 @@ class Preferences_window:
 		str = model.get_value(iter, 2)
 		self.xml.get_widget('sounds_entry').set_text(str)
 
-	def on_button_sounds_clicked(self, widget, data=None):
+	def on_button_sounds_clicked(self, widget, data = None):
 		(model, iter) = self.sound_tree.get_selection().get_selected()
 		if not iter:
 			return
@@ -796,19 +796,19 @@ class Preferences_window:
 		renderer.set_property('activatable', True)
 		renderer.connect('toggled', self.sound_toggled_cb)
 		col.pack_start(renderer)
-		col.set_attributes(renderer, active=1)
+		col.set_attributes(renderer, active = 1)
 
 		col = gtk.TreeViewColumn(_('Event'))
 		self.sound_tree.append_column(col)
 		renderer = gtk.CellRendererText()
 		col.pack_start(renderer)
-		col.set_attributes(renderer, text=0)
+		col.set_attributes(renderer, text = 0)
 
 		col = gtk.TreeViewColumn(_('Sound'))
 		self.sound_tree.append_column(col)
 		renderer = gtk.CellRendererText()
 		col.pack_start(renderer)
-		col.set_attributes(renderer, text=2)
+		col.set_attributes(renderer, text = 2)
 		self.fill_sound_treeview()
 		
 		#Autoaway
@@ -845,7 +845,7 @@ class Preferences_window:
 		self.msg_tree.append_column(col)
 		renderer = gtk.CellRendererText()
 		col.pack_start(renderer, True)
-		col.set_attributes(renderer, text=0)
+		col.set_attributes(renderer, text = 0)
 		renderer.connect('edited', self.on_msg_cell_edited)
 		renderer.set_property('editable', True)
 		self.fill_msg_treeview()
@@ -1005,7 +1005,7 @@ class Account_modification_window:
 		if not self.xml.get_widget('log_history_checkbutton').get_active():
 			list_no_log_for.append(name)
 
-		sync_with_global_status_checkbutton =self.xml.get_widget(
+		sync_with_global_status_checkbutton = self.xml.get_widget(
 				'sync_with_global_status_checkbutton').get_active()
 		
 		use_proxy = self.xml.get_widget('use_proxy_checkbutton').get_active()
@@ -1045,7 +1045,7 @@ class Account_modification_window:
 			gpg_password = ''
 		else:
 			keyID = self.xml.get_widget('gpg_key_label').get_text()
-			save_gpg_password =self.xml.get_widget(
+			save_gpg_password = self.xml.get_widget(
 					'gpg_save_password_checkbutton').get_active()
 			gpg_password = self.xml.get_widget('gpg_password_entry').get_text()
 		#if we are modifying an account
@@ -1198,7 +1198,7 @@ class Account_modification_window:
 			gpg_password = ''
 		else:
 			keyID = self.xml.get_widget('gpg_key_label').get_text()
-			save_gpg_password =self.xml.get_widget(
+			save_gpg_password = self.xml.get_widget(
 					'gpg_save_password_checkbutton').get_active()
 			gpg_password = self.xml.get_widget('gpg_password_entry').get_text()
 		no_log_for = ''
@@ -1235,7 +1235,7 @@ class Account_modification_window:
 				Vcard_information_window(jid, self.plugin, self.account, True)
 			gajim.connections[self.account].request_vcard(jid)
 	
-	def on_gpg_choose_button_clicked(self, widget, data=None):
+	def on_gpg_choose_button_clicked(self, widget, data = None):
 		secret_keys = gajim.connections[self.account].ask_gpg_secrete_keys()
 		if not secret_keys:
 			dialogs.Error_dialog(_('error contacting %s') % service)
@@ -1380,10 +1380,10 @@ class Accounts_window:
 		#columns
 		renderer = gtk.CellRendererText()
 		self.accounts_treeview.insert_column_with_attributes(-1, _('Name'), renderer, \
-			text=0)
+			text = 0)
 		renderer = gtk.CellRendererText()
 		self.accounts_treeview.insert_column_with_attributes(-1, _('Server'), \
-			renderer, text=1)
+			renderer, text = 1)
 		self.xml.signal_autoconnect(self)
 		self.init_accounts()
 		self.window.show_all()
@@ -1458,7 +1458,7 @@ class Add_remove_emoticons_window:
 		renderer.connect('edited', self.on_emot_cell_edited)
 		renderer.set_property('editable', True)
 		col.pack_start(renderer, True)
-		col.set_attributes(renderer, text=0)
+		col.set_attributes(renderer, text = 0)
 
 		col = gtk.TreeViewColumn(_('Image'))
 		self.emot_tree.append_column(col)
@@ -1535,7 +1535,7 @@ class Add_remove_emoticons_window:
 		iter = model.get_iter_from_string(row)
 		model.set_value(iter, 0, new_text)
 
-	def on_set_image_button_clicked(self, widget, data=None):
+	def on_set_image_button_clicked(self, widget, data = None):
 		(model, iter) = self.emot_tree.get_selection().get_selected()
 		if not iter:
 			return
@@ -1589,14 +1589,14 @@ class Add_remove_emoticons_window:
 				img.set_from_pixbuf(pix)
 			model.set(iter, 2, img)
 			
-	def on_button_new_emoticon_clicked(self, widget, data=None):
+	def on_button_new_emoticon_clicked(self, widget, data = None):
 		model = self.emot_tree.get_model()
 		iter = model.append()
 		model.set(iter, 0, 'emoticon', 1, '')
 		col = self.emot_tree.get_column(0)
 		self.emot_tree.set_cursor(model.get_path(iter), col, True)
 
-	def on_button_remove_emoticon_clicked(self, widget, data=None):
+	def on_button_remove_emoticon_clicked(self, widget, data = None):
 		(model, iter) = self.emot_tree.get_selection().get_selected()
 		if not iter:
 			return
@@ -1639,11 +1639,11 @@ class Service_discovery_window:
 		renderer = gtk.CellRendererText()
 		renderer.set_data('column', 0)
 		self.services_treeview.insert_column_with_attributes(-1, 'Name', \
-			renderer, text=0)
+			renderer, text = 0)
 		renderer = gtk.CellRendererText()
 		renderer.set_data('column', 1)
 		self.services_treeview.insert_column_with_attributes(-1, 'Service', \
-			renderer, text=1)
+			renderer, text = 1)
 
 		self.address_comboboxentry = xml.get_widget('address_comboboxentry')
 		liststore = gtk.ListStore(str)
@@ -1804,7 +1804,7 @@ class Service_discovery_window:
 		if event.click == 1: #Left click (user possibly selected sth)
 			pass
 
-	def on_services_treeview_row_activated(self, widget, path, col=0):
+	def on_services_treeview_row_activated(self, widget, path, col = 0):
 		'''When a row is activated: Register or join the selected agent'''
 		#if both buttons are sensitive, it will register [default]
 		if self.register_button.get_property('sensitive'):
diff --git a/src/dialogs.py b/src/dialogs.py
index 37a80b581..8d3984101 100644
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -28,7 +28,7 @@ APP = i18n.APP
 gtk.glade.bindtextdomain (APP, i18n.DIR)
 gtk.glade.textdomain (APP)
 
-GTKGUI_GLADE='gtkgui.glade'
+GTKGUI_GLADE = 'gtkgui.glade'
 
 class Edit_groups_dialog:
 	'''Class for the edit group dialog window'''
@@ -102,7 +102,7 @@ class Edit_groups_dialog:
 		self.list.append_column(column)
 		renderer = gtk.CellRendererText()
 		column.pack_start(renderer)
-		column.set_attributes(renderer, text=0)
+		column.set_attributes(renderer, text = 0)
 		
 		column = gtk.TreeViewColumn(_('In the group'))
 		self.list.append_column(column)
@@ -110,7 +110,7 @@ class Edit_groups_dialog:
 		column.pack_start(renderer)
 		renderer.set_property('activatable', True)
 		renderer.connect('toggled', self.group_toggled_cb)
-		column.set_attributes(renderer, active=1)
+		column.set_attributes(renderer, active = 1)
 
 class Passphrase_dialog:
 	'''Class for Passphrase dialog'''
@@ -130,7 +130,7 @@ class Passphrase_dialog:
 			gtk.gdk.threads_leave()
 		return passphrase, save_passphrase_checkbutton.get_active()
 
-	def __init__(self, labeltext, checkbuttontext, autoconnect=0):
+	def __init__(self, labeltext, checkbuttontext, autoconnect = 0):
 		self.xml = gtk.glade.XML(GTKGUI_GLADE, 'passphrase_dialog', APP)
 		self.window = self.xml.get_widget('passphrase_dialog')
 		self.passphrase_entry = self.xml.get_widget('passphrase_entry')
@@ -170,10 +170,10 @@ class choose_gpg_key_dialog:
 		#columns
 		renderer = gtk.CellRendererText()
 		self.keys_treeview.insert_column_with_attributes(-1, _('KeyID'), \
-			renderer, text=0)
+			renderer, text = 0)
 		renderer = gtk.CellRendererText()
 		self.keys_treeview.insert_column_with_attributes(-1, _('User name'), \
-			renderer, text=1)
+			renderer, text = 1)
 		self.fill_tree(secret_keys)
 
 		self.window.show_all()
@@ -216,7 +216,7 @@ class Change_status_message_dialog:
 			gtk.gdk.threads_leave()
 		return message
 
-	def on_message_comboboxentry_changed(self, widget, data=None):
+	def on_message_comboboxentry_changed(self, widget, data = None):
 		model = widget.get_model()
 		active = widget.get_active()
 		if active < 0:
@@ -232,7 +232,7 @@ class Change_status_message_dialog:
 
 class Add_new_contact_window:
 	'''Class for Add_new_contact_window'''
-	def __init__(self, plugin, account, jid=None):
+	def __init__(self, plugin, account, jid = None):
 		if gajim.connections[account].connected < 2:
 			Error_dialog(_('You must be connected to add a contact'))
 			return
@@ -271,7 +271,7 @@ class Add_new_contact_window:
 			jid_splited = jid.split('@')
 			self.xml.get_widget('uid_entry').set_text(jid_splited[0])
 			if jid_splited[1] in jid_agents:
-				protocol_combobox.set_active(jid_agents.index(jid_splited[1])+1)
+				protocol_combobox.set_active(jid_agents.index(jid_splited[1]) + 1)
 
 		self.group_comboboxentry = self.xml.get_widget('group_comboboxentry')
 		liststore = gtk.ListStore(str)
@@ -457,7 +457,7 @@ class subscription_request_window:
 		self.window.destroy()
 
 class Join_groupchat_window:
-	def __init__(self, plugin, account, server='', room = ''):
+	def __init__(self, plugin, account, server = '', room = ''):
 		self.plugin = plugin
 		self.account = account
 		if gajim.connections[account].connected < 2:
@@ -628,7 +628,7 @@ class Popup_notification_window:
 		event_description_label = xml.get_widget('event_description_label')
 		eventbox = xml.get_widget('eventbox')
 		
-		event_type_label.set_markup('<b>'+event_type+'</b>')
+		event_type_label.set_markup('<b>' + event_type + '</b>')
 
 		if self.jid in self.plugin.roster.contacts[account]:
 			txt = self.plugin.roster.contacts[account][self.jid][0].name
diff --git a/src/gajim.py b/src/gajim.py
index b5e7423f7..10cab944d 100755
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -81,7 +81,7 @@ import systray
 import dialogs
 import config
 
-GTKGUI_GLADE='gtkgui.glade'
+GTKGUI_GLADE = 'gtkgui.glade'
 
 
 class Interface:
@@ -666,8 +666,8 @@ class Interface:
 			gtk.window_set_default_icon(pix)
 		self.roster = roster_window.Roster_window(self)
 		self.sleeper = common.sleepy.Sleepy( \
-			gajim.config.get('autoawaytime')*60, \
-			gajim.config.get('autoxatime')*60)
+			gajim.config.get('autoawaytime') * 60, \
+			gajim.config.get('autoxatime') * 60)
 		self.systray_enabled = False
 		try:
 			import egg.trayicon as trayicon # use gnomepythonextras trayicon
diff --git a/src/groupchat_window.py b/src/groupchat_window.py
index c5bb5ed5f..d7511290d 100644
--- a/src/groupchat_window.py
+++ b/src/groupchat_window.py
@@ -34,7 +34,7 @@ APP = i18n.APP
 gtk.glade.bindtextdomain(APP, i18n.DIR)
 gtk.glade.textdomain(APP)
 
-GTKGUI_GLADE='gtkgui.glade'
+GTKGUI_GLADE = 'gtkgui.glade'
 
 class Groupchat_window(chat.Chat):
 	"""Class for Groupchat window"""
@@ -120,7 +120,7 @@ class Groupchat_window(chat.Chat):
 			fin2 = False
 			user_iter = model.iter_children(role_iter)
 			if not user_iter:
-				fin2=True
+				fin2 = True
 			while not fin2:
 				if nick == model.get_value(user_iter, 1):
 					return user_iter
@@ -143,7 +143,7 @@ class Groupchat_window(chat.Chat):
 			fin2 = False
 			user = model.iter_children(role)
 			if not user:
-				fin2=True
+				fin2 = True
 			while not fin2:
 				nick = model.get_value(user, 1)
 				list.append(nick)
@@ -545,7 +545,7 @@ class Groupchat_window(chat.Chat):
 				widget.get_selection().unselect_all()
 		return False
 
-	def on_list_treeview_row_activated(self, widget, path, col=0):
+	def on_list_treeview_row_activated(self, widget, path, col = 0):
 		"""When an iter is double clicked: open the chat window"""
 		model = widget.get_model()
 		iter = model.get_iter(path)
diff --git a/src/history_window.py b/src/history_window.py
index b5970b5ce..6b875fad9 100644
--- a/src/history_window.py
+++ b/src/history_window.py
@@ -29,7 +29,7 @@ APP = i18n.APP
 gtk.glade.bindtextdomain(APP, i18n.DIR)
 gtk.glade.textdomain(APP)
 
-GTKGUI_GLADE='gtkgui.glade'
+GTKGUI_GLADE = 'gtkgui.glade'
 
 class History_window:
 	"""Class for bowser agent window:
diff --git a/src/roster_window.py b/src/roster_window.py
index 7e1815944..f712f9220 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -43,7 +43,7 @@ APP = i18n.APP
 gtk.glade.bindtextdomain(APP, i18n.DIR)
 gtk.glade.textdomain(APP)
 
-GTKGUI_GLADE='gtkgui.glade'
+GTKGUI_GLADE = 'gtkgui.glade'
 
 class Roster_window:
 	'''Class for main window of gtkgui plugin'''
@@ -93,7 +93,7 @@ class Roster_window:
 			fin2 = False
 			user = model.iter_children(group)
 			if not user:
-				fin2=True
+				fin2 = True
 			while not fin2:
 				if jid == model.get_value(user, 3):
 					found.append(user)
@@ -147,7 +147,7 @@ class Roster_window:
 				iterG = model.append(IterAcct, 
 					(self.pixbufs['closed'], g, 'group', g, account, False))
 			if not self.groups[account].has_key(g): #It can probably never append
-				if account+g in self.hidden_lines:
+				if account + g in self.hidden_lines:
 					self.groups[account][g] = {'expand': False}
 				else:
 					self.groups[account][g] = {'expand': True}
@@ -365,7 +365,7 @@ class Roster_window:
 			self.contacts[account][ji] = [user1]
 			for g in array[jid]['groups'] :
 				if not g in self.groups[account].keys():
-					if account+g in self.hidden_lines:
+					if account + g in self.hidden_lines:
 						self.groups[account][g] = {'expand': False}
 					else:
 						self.groups[account][g] = {'expand': True}
@@ -395,7 +395,7 @@ class Roster_window:
 			self.plugin.windows[account]['chats'][user.jid].set_image(user.jid)
 			name = user.name
 			if user.resource != '':
-				name += '/'+user.resource
+				name += '/' + user.resource
 			self.plugin.windows[account]['chats'][user.jid].print_conversation(
 				_('%s is now %s (%s)') % (name, show, status), user.jid, 'status')
 
@@ -599,7 +599,7 @@ class Roster_window:
 		'''Authorize a user'''
 		gajim.connections[account].send_authorization(jid)
 
-	def req_sub(self, widget, jid, txt, account, group=None, pseudo=None):
+	def req_sub(self, widget, jid, txt, account, group = None, pseudo = None):
 		'''Request subscription to a user'''
 		if not pseudo:
 			pseudo = jid
@@ -691,7 +691,7 @@ class Roster_window:
 				self.remove_user(u, account)
 			del self.contacts[account][u.jid]
 
-	def send_status(self, account, status, txt, autoconnect=0):
+	def send_status(self, account, status, txt, autoconnect = 0):
 		if status != 'offline':
 			if gajim.connections[account].connected < 2:
 				model = self.tree.get_model()
@@ -1035,7 +1035,7 @@ class Roster_window:
 					self.send_status(acct, 'offline', message)
 		self.quit_gtkgui_plugin()
 
-	def on_roster_treeview_row_activated(self, widget, path, col=0):
+	def on_roster_treeview_row_activated(self, widget, path, col = 0):
 		'''When an iter is double clicked: open the chat window'''
 		model = self.tree.get_model()
 		iter = model.get_iter(path)
@@ -1065,8 +1065,8 @@ class Roster_window:
 			model.set_value(iter, 0, self.pixbufs['opened'])
 			jid = model.get_value(iter, 3)
 			self.groups[account][jid]['expand'] = True
-			if account+jid in self.hidden_lines:
-				self.hidden_lines.remove(account+jid)
+			if account + jid in self.hidden_lines:
+				self.hidden_lines.remove(account + jid)
 		elif type == 'account':
 			if account in self.hidden_lines:
 				self.hidden_lines.remove(account)
@@ -1087,8 +1087,8 @@ class Roster_window:
 			model.set_value(iter, 0, self.pixbufs['closed'])
 			jid = model.get_value(iter, 3)
 			self.groups[account][jid]['expand'] = False
-			if not account+jid in self.hidden_lines:
-				self.hidden_lines.append(account+jid)
+			if not account + jid in self.hidden_lines:
+				self.hidden_lines.append(account + jid)
 		elif type == 'account':
 			if not account in self.hidden_lines:
 				self.hidden_lines.append(account)
@@ -1211,7 +1211,7 @@ class Roster_window:
 		gajim.config.set('showoffline', 1 - gajim.config.get('showoffline'))
 		self.draw_roster()
 
-	def iconCellDataFunc(self, column, renderer, model, iter, data=None):
+	def iconCellDataFunc(self, column, renderer, model, iter, data = None):
 		'''When a row is added, set properties for icon renderer'''
 		if model.get_value(iter, 2) == 'account':
 			renderer.set_property('cell-background', 
@@ -1234,7 +1234,7 @@ class Roster_window:
 			renderer.set_property('xalign', 1)
 		renderer.set_property('width', 20)
 	
-	def nameCellDataFunc(self, column, renderer, model, iter, data=None):
+	def nameCellDataFunc(self, column, renderer, model, iter, data = None):
 		'''When a row is added, set properties for name renderer'''
 		if model.get_value(iter, 2) == 'account':
 			renderer.set_property('foreground', 
diff --git a/src/systray.py b/src/systray.py
index 2d39622c4..bae40a778 100644
--- a/src/systray.py
+++ b/src/systray.py
@@ -29,7 +29,7 @@ APP = i18n.APP
 gtk.glade.bindtextdomain(APP, i18n.DIR)
 gtk.glade.textdomain(APP)
 
-GTKGUI_GLADE='gtkgui.glade'
+GTKGUI_GLADE = 'gtkgui.glade'
 
 class Systray:
 	"""Class for icon in the systray"""
diff --git a/src/tabbed_chat_window.py b/src/tabbed_chat_window.py
index 2d3175f67..0cd5907d2 100644
--- a/src/tabbed_chat_window.py
+++ b/src/tabbed_chat_window.py
@@ -35,7 +35,7 @@ APP = i18n.APP
 gtk.glade.bindtextdomain(APP, i18n.DIR)
 gtk.glade.textdomain(APP)
 
-GTKGUI_GLADE='gtkgui.glade'
+GTKGUI_GLADE = 'gtkgui.glade'
 
 class Tabbed_chat_window(chat.Chat):
 	"""Class for tabbed chat window"""
diff --git a/src/vcard_information_window.py b/src/vcard_information_window.py
index dff18309f..42a6f5a1c 100644
--- a/src/vcard_information_window.py
+++ b/src/vcard_information_window.py
@@ -26,11 +26,11 @@ APP = i18n.APP
 gtk.glade.bindtextdomain (APP, i18n.DIR)
 gtk.glade.textdomain (APP)
 
-GTKGUI_GLADE='gtkgui.glade'
+GTKGUI_GLADE = 'gtkgui.glade'
 
 class Vcard_information_window:
 	'''Class for user's information window'''
-	def on_user_information_window_destroy(self, widget=None):
+	def on_user_information_window_destroy(self, widget = None):
 		'''close window'''
 		del self.plugin.windows[self.account]['infos'][self.jid]
 
@@ -78,13 +78,14 @@ class Vcard_information_window:
 		for i in vcard.keys():
 			if type(vcard[i]) == type({}):
 				for j in vcard[i].keys():
-					self.set_value(i+'_'+j+'_entry', vcard[i][j])
+					self.set_value(i + '_' + j +
+							'_entry', vcard[i][j])
 			else:
 				if i == 'DESC':
 					self.xml.get_widget('DESC_textview').get_buffer().\
 						set_text(vcard[i], 0)
 				else:
-					self.set_value(i+'_entry', vcard[i])
+					self.set_value(i + '_entry', vcard[i])
 	
 	def set_os_info(self, client_info, os_info):
 		self.xml.get_widget('client_name_version_label').set_text(client_info)
@@ -139,7 +140,7 @@ class Vcard_information_window:
 			'ADR_CTRY', 'ORG_ORGNAME', 'ORG_ORGUNIT', 'TITLE', 'ROLE'] 
 		vcard = {}
 		for e in entries: 
-			txt = self.xml.get_widget(e+'_entry').get_text()
+			txt = self.xml.get_widget(e + '_entry').get_text()
 			if txt != '':
 				vcard = self.add_to_vcard(vcard, e, txt)
 		buffer = self.xml.get_widget('DESC_textview').get_buffer()
@@ -181,14 +182,14 @@ class Vcard_information_window:
 		self.xml.get_widget('nickname_label').set_text('Personal details')
 		information_hbuttonbox = self.xml.get_widget('information_hbuttonbox')
 		#publish button
-		button = gtk.Button(stock=gtk.STOCK_GOTO_TOP)
+		button = gtk.Button(stock = gtk.STOCK_GOTO_TOP)
 		button.get_children()[0].get_children()[0].get_children()[1].\
 			set_text('Publish')
 		button.connect('clicked', self.on_publish_button_clicked)
 		button.show_all()
 		information_hbuttonbox.pack_start(button)
 		#retrieve button
-		button = gtk.Button(stock=gtk.STOCK_GOTO_BOTTOM)
+		button = gtk.Button(stock = gtk.STOCK_GOTO_BOTTOM)
 		button.get_children()[0].get_children()[0].get_children()[1].\
 			set_text('Retrieve')
 		button.connect('clicked', self.on_retrieve_button_clicked)
@@ -210,7 +211,7 @@ class Vcard_information_window:
 		description_textview.set_cursor_visible(True)
 
 	#the user variable is the jid if vcard is true
-	def __init__(self, user, plugin, account, vcard=False):
+	def __init__(self, user, plugin, account, vcard = False):
 		self.xml = gtk.glade.XML(GTKGUI_GLADE, 'vcard_information_window', APP)
 		self.window = self.xml.get_widget('vcard_information_window')
 		self.plugin = plugin