merged trunk

src/chat_control.py

@@ -281,7 +281,7 @@ class ChatControlBase(MessageControl):
 		self.conv_textview.tv.show()
 		self._paint_banner()
 
-		# For JEP-0172
+		# For XEP-0172
 		self.user_nick = None
 
 		self.smooth = True

src/common/config.py

@@ -296,6 +296,7 @@ class Config:
 			'keep_alives_enabled': [ opt_bool, True],
 			# send keepalive every N seconds of inactivity
 			'keep_alive_every_foo_secs': [ opt_int, 55 ],
+			'time_for_keep_alive_answer': [ opt_int, 20, _('How many seconds to wait for the answer of keepalive packet before we try to reconnect.') ],
 			# try for 2 minutes before giving up (aka. timeout after those seconds)
 			'try_connecting_for_foo_secs': [ opt_int, 60 ],
 			'http_auth': [opt_str, 'ask'], # yes, no, ask

src/common/connection.py

@@ -705,11 +705,21 @@ class Connection(ConnectionHandlers):
 			return
 		common.xmpp.features_nb.getPrivacyLists(self.connection)
 
-	def sendPing(self, pingTo):
+	def sendPing(self, pingTo=None):
+		'''Send XMPP Ping (XEP-0199) request. If pingTo is not set, ping is sent
+		to server to detect connection failure at application level.'''
 		if not self.connection:
 			return
-		iq = common.xmpp.Iq('get', to = pingTo.get_full_jid())
+		id = self.connection.getAnID()
+		if pingTo:
+			to = pingTo.get_full_jid()
+			self.dispatch('PING_SENT', (pingTo))
+		else:
+			to = gajim.config.get_per('accounts', self.name, 'hostname')
+			self.awaiting_xmpp_ping_id = id
+		iq = common.xmpp.Iq('get', to=to)
 		iq.addChild(name = 'ping', namespace = common.xmpp.NS_PING)
+		iq.setID(id)
 		def _on_response(resp):
 			timePong = time_time()
 			if not common.xmpp.isResultNode(resp):
@@ -717,9 +727,13 @@ class Connection(ConnectionHandlers):
 				return
 			timeDiff = round(timePong - timePing,2)
 			self.dispatch('PING_REPLY', (pingTo, timeDiff))
-		self.dispatch('PING_SENT', (pingTo))
+		if pingTo:
 			timePing = time_time()
 			self.connection.SendAndCallForResponse(iq, _on_response)
+		else:
+			self.connection.send(iq)
+			gajim.idlequeue.set_alarm(self.check_keepalive, gajim.config.get_per(
+				'accounts', self.name, 'time_for_keep_alive_answer'))
 
 	def get_active_default_lists(self):
 		if not self.connection:
@@ -877,7 +891,7 @@ class Connection(ConnectionHandlers):
 		self.connection = con
 		if not self.connection:
 			return
-		self.connection.set_send_timeout(self.keepalives, self.send_keepalive)
+		self.connection.set_send_timeout(self.keepalives, self.sendPing)
 		self.connection.onreceive(None)
 		iq = common.xmpp.Iq('get', common.xmpp.NS_PRIVACY, xmlns = '')
 		id = self.connection.getAnID()
@@ -922,7 +936,7 @@ class Connection(ConnectionHandlers):
 		if not auto and not show == 'offline':
 			sign_msg = True
 		self.status = msg
-		if show != 'offline' and not self.connected:
+		if show != 'offline' and self.connected < 1:
 			# set old_show to requested 'show' in case we need to
 			# recconect before we auth to server
 			self.old_show = show
@@ -955,7 +969,7 @@ class Connection(ConnectionHandlers):
 				self.time_to_reconnect = None
 				self._on_disconnected()
 
-		elif show != 'offline' and self.connected:
+		elif show != 'offline' and self.connected > 0:
 			# dont'try to connect, when we are in state 'connecting'
 			if self.connected == 1:
 				return
@@ -1257,6 +1271,7 @@ class Connection(ConnectionHandlers):
 		iq.setID(id)
 		if groupchat_jid:
 			self.groupchat_jids[id] = groupchat_jid
+		self.last_ids.append(id)
 		self.connection.send(iq)
 
 	def request_os_info(self, jid, resource, groupchat_jid=None):
@@ -1277,6 +1292,7 @@ class Connection(ConnectionHandlers):
 		iq.setID(id)
 		if groupchat_jid:
 			self.groupchat_jids[id] = groupchat_jid
+		self.version_ids.append(id)
 		self.connection.send(iq)
 
 	def get_settings(self):
@@ -1599,10 +1615,10 @@ class Connection(ConnectionHandlers):
 			c.setTagData('reason', reason)
 		self.connection.send(message)
 
-	def send_keepalive(self):
+	def check_keepalive(self):
-		# nothing received for the last foo seconds (60 secs by default)
+		if self.awaiting_xmpp_ping_id:
-		if self.connection:
+			# We haven't got the pong in time, disco and reconnect
-			self.connection.send(' ')
+			self._disconnectedReconnCB()
 
 	def _reconnect_alarm(self):
 		if self.time_to_reconnect:

src/common/connection_handlers.py

@@ -426,6 +426,9 @@ class ConnectionBytestream:
 		# if we want to respect xep-0065 we have to check for proxy
 		# activation result in any result iq
 		real_id = unicode(iq_obj.getAttr('id'))
+		if real_id == self.awaiting_xmpp_ping_id:
+			self.awaiting_xmpp_ping_id = None
+			return
 		if real_id[:3] != 'au_':
 			return
 		frm = helpers.get_full_jid_from_iq(iq_obj)
@@ -667,7 +670,7 @@ class ConnectionDisco:
 		query = iq.setTag('query')
 		query.setAttr('node','http://gajim.org/caps#' + gajim.version.split('-',
 			1)[0])
-		for f in (common.xmpp.NS_BYTESTREAM, common.xmpp.NS_SI, \
+		for f in (common.xmpp.NS_BYTESTREAM, common.xmpp.NS_SI,
 		common.xmpp.NS_FILE, common.xmpp.NS_COMMANDS):
 			feature = common.xmpp.Node('feature')
 			feature.setAttr('var', f)
@@ -1240,6 +1243,12 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
 		# keep the latest subscribed event for each jid to prevent loop when we
 		# acknoledge presences
 		self.subscribed_events = {}
+		# IDs of jabber:iq:last requests
+		self.last_ids = []
+		# IDs of jabber:iq:version requests
+		self.version_ids = []
+		# ID of urn:xmpp:ping requests
+		self.awaiting_xmpp_ping_id = None
 
 		# keep track of sessions this connection has with other JIDs
 		self.sessions = {}
@@ -1298,15 +1307,21 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
 
 	def _ErrorCB(self, con, iq_obj):
 		gajim.log.debug('ErrorCB')
-		if iq_obj.getQueryNS() == common.xmpp.NS_VERSION:
+		jid_from = helpers.get_full_jid_from_iq(iq_obj)
-			who = helpers.get_full_jid_from_iq(iq_obj)
+		jid_stripped, resource = gajim.get_room_and_nick_from_fjid(jid_from)
-			jid_stripped, resource = gajim.get_room_and_nick_from_fjid(who)
+		id = unicode(iq_obj.getID())
+		if id in self.version_ids:
 			self.dispatch('OS_INFO', (jid_stripped, resource, '', ''))
+			self.version_ids.remove(id)
 			return
+		if id in self.last_ids:
+			self.dispatch('LAST_STATUS_TIME', (jid_stripped, resource, -1, ''))
+			self.last_ids.remove(id)
+			return
+		if id == self.awaiting_xmpp_ping_id:
+			self.awaiting_xmpp_ping_id = None
 		errmsg = iq_obj.getErrorMsg()
 		errcode = iq_obj.getErrorCode()
-		jid_from = helpers.get_full_jid_from_iq(iq_obj)
-		id = unicode(iq_obj.getID())
 		self.dispatch('ERROR_ANSWER', (id, jid_from, errmsg, errcode))
 	
 	def _PrivateCB(self, con, iq_obj):
@@ -1395,7 +1410,7 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
 		raise common.xmpp.NodeProcessed
 
 	def _LastCB(self, con, iq_obj):
-		gajim.log.debug('IdleCB')
+		gajim.log.debug('LastCB')
 		iq_obj = iq_obj.buildReply('result')
 		qp = iq_obj.getTag('query')
 		if not HAS_IDLE:
@@ -1421,6 +1436,8 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
 			del self.groupchat_jids[id]
 		else:
 			who = helpers.get_full_jid_from_iq(iq_obj)
+		if id in self.last_ids:
+			self.last_ids.remove(id)
 		jid_stripped, resource = gajim.get_room_and_nick_from_fjid(who)
 		self.dispatch('LAST_STATUS_TIME', (jid_stripped, resource, seconds, status))
 
@@ -1442,6 +1459,8 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
 		else:
 			who = helpers.get_full_jid_from_iq(iq_obj)
 		jid_stripped, resource = gajim.get_room_and_nick_from_fjid(who)
+		if id in self.version_ids:
+			self.version_ids.remove(id)
 		self.dispatch('OS_INFO', (jid_stripped, resource, client_info, os_info))
 
 	def _TimeCB(self, con, iq_obj):

src/config.py

@@ -298,27 +298,20 @@ class PreferencesWindow:
 		self.auto_popup_away_checkbutton.set_active(st)
 
 		# sounds
-		if ((os.name == 'nt') or (sys.platform == 'darwin')):
-			# if windows, player must not become visible on show_all
-			soundplayer_hbox = self.xml.get_widget('soundplayer_hbox')
-			soundplayer_hbox.set_no_show_all(True)
 		if gajim.config.get('sounds_on'):
 			self.xml.get_widget('play_sounds_checkbutton').set_active(True)
 		else:
-			self.xml.get_widget('soundplayer_hbox').set_sensitive(False)
 			self.xml.get_widget('sounds_scrolledwindow').set_sensitive(False)
 			self.xml.get_widget('browse_sounds_hbox').set_sensitive(False)
 
 		# sound player
 		player = gajim.config.get('soundplayer')
-		self.xml.get_widget('soundplayer_entry').set_text(player)
 		if player == '': # only on first time Gajim starts
 			commands = ('aplay', 'play', 'esdplay', 'artsplay')
 			for command in commands:
 				if helpers.is_in_path(command):
 					if command == 'aplay':
 						command += ' -q'
-					self.xml.get_widget('soundplayer_entry').set_text(command)
 					gajim.config.set('soundplayer', command)
 					break
 
@@ -775,14 +768,9 @@ class PreferencesWindow:
 
 	def on_play_sounds_checkbutton_toggled(self, widget):
 		self.on_checkbutton_toggled(widget, 'sounds_on',
-				[self.xml.get_widget('soundplayer_hbox'),
+				[self.xml.get_widget('sounds_scrolledwindow'),
-				self.xml.get_widget('sounds_scrolledwindow'),
 				self.xml.get_widget('browse_sounds_hbox')])
 
-	def on_soundplayer_entry_changed(self, widget):
-		gajim.config.set('soundplayer', widget.get_text().decode('utf-8'))
-		gajim.interface.save_config()
-
 	def on_sounds_treemodel_row_changed(self, model, path, iter):
 		sound_event = model[iter][3].decode('utf-8')
 		gajim.config.set_per('soundevents', sound_event, 'enabled',

src/dialogs.py

@@ -936,7 +936,7 @@ class AboutDialog:
 		dlg.set_transient_for(gajim.interface.roster.window)
 		dlg.set_name('Gajim')
 		dlg.set_version(gajim.version)
-		s = u'Copyright © 2003-2007 Gajim Team'
+		s = u'Copyright © 2003-2008 Gajim Team'
 		dlg.set_copyright(s)
 		copying_file_path = None
 		if os.path.isfile(os.path.join(gajim.defs.docdir, 'COPYING')):

src/features_window.py

@@ -142,7 +142,10 @@ class FeaturesWindow:
 		selection = widget.get_selection()
 		if not selection:
 			return
-		path = selection.get_selected_rows()[1][0]
+		rows = selection.get_selected_rows()[1]
+		if not rows:
+			return
+		path = rows[0]
 		available = self.model[path][1]
 		feature = self.model[path][0].decode('utf-8')
 		text = self.features[feature][1] + '\n'

src/gajim-remote.py

@@ -263,8 +263,13 @@ class GajimRemote:
 						(_('account'), _(''), False)
 					]
 				],
+			'check_gajim_running':[
+					_('Check if Gajim is running'),
+					[]
+				],
 
 			}
+		self.sbus = None
 		if self.argv_len  < 2 or \
 			sys.argv[1] not in self.commands.keys(): # no args or bad args
 			send_error(self.compose_help())
@@ -277,6 +282,9 @@ class GajimRemote:
 			sys.exit(0)
 		if self.command == 'handle_uri':
 			self.handle_uri()
+		if self.command == 'check_gajim_running':
+			print self.check_gajim_running()
+			sys.exit(0)
 		self.init_connection()
 		self.check_arguments()
 
@@ -332,6 +340,22 @@ class GajimRemote:
 			elif res:
 				print unicode(res).encode(PREFERRED_ENCODING)
 
+	def check_gajim_running(self):
+		if not self.sbus:
+			try:
+				self.sbus = dbus.SessionBus()
+			except:
+				raise exceptions.SessionBusNotPresent
+
+		test = False
+		if hasattr(self.sbus, 'name_has_owner'):
+			if self.sbus.name_has_owner(SERVICE):
+				test = True
+		elif dbus.dbus_bindings.bus_name_has_owner(self.sbus.get_connection(),
+		SERVICE):
+			test = True
+		return test
+
 	def init_connection(self):
 		''' create the onnection to the session dbus,
 		or exit if it is not possible '''
@@ -340,6 +364,8 @@ class GajimRemote:
 		except:
 			raise exceptions.SessionBusNotPresent
 
+		if not self.check_gajim_running():
+			send_error(_('It seems Gajim is not running. So you can\'t use gajim-remote.'))
 		obj = self.sbus.get_object(SERVICE, OBJ_PATH)
 		interface = dbus.Interface(obj, INTERFACE)
 

src/gajim.py

@@ -720,12 +720,6 @@ class Interface:
 			elif new_show > 1: # Status change (not connected/disconnected or error (<1))
 				notify.notify('status_change', jid, account, [new_show,
 					status_message])
-		else:
-			# FIXME: Msn transport (CMSN1.2.1 and PyMSN0.10) doesn't follow the JEP
-			# remove in 2007
-			# It's maybe a GC_NOTIFY (specialy for MSN gc)
-			self.handle_event_gc_notify(account, (jid, array[1], status_message,
-				array[3], None, None, None, None, None, [], None, None))
 
 	def handle_event_msgerror(self, account, array):
 		#'MSGERROR' (account, (jid, error_code, error_msg, msg, time))
@@ -989,6 +983,10 @@ class Interface:
 
 	def handle_event_last_status_time(self, account, array):
 		# ('LAST_STATUS_TIME', account, (jid, resource, seconds, status))
+		tim = array[2]
+		if tim < 0:
+			# Ann error occured
+			return
 		win = None
 		if self.instances[account]['infos'].has_key(array[0]):
 			win = self.instances[account]['infos'][array[0]]
@@ -997,7 +995,7 @@ class Interface:
 		if win:
 			c = gajim.contacts.get_contact(account, array[0], array[1])
 			if c: # c can be none if it's a gc contact
-				c.last_status_time = time.localtime(time.time() - array[2])
+				c.last_status_time = time.localtime(time.time() - tim)
 				if array[3]:
 					c.status = array[3]
 				win.set_last_status_time()

src/groupchat_control.py

@@ -939,19 +939,18 @@ class GroupchatControl(ChatControlBase):
 		model[iter][C_TEXT] = name
 
 	def draw_avatar(self, nick):
+		if not gajim.config.get('show_avatars_in_roster'):
+			return
 		model = self.list_treeview.get_model()
 		iter = self.get_contact_iter(nick)
 		if not iter:
 			return
-		if gajim.config.get('show_avatars_in_roster'):
 		pixbuf = gtkgui_helpers.get_avatar_pixbuf_from_cache(self.room_jid + \
 			'/' + nick, True)
 		if pixbuf in ('ask', None):
 			scaled_pixbuf = None
 		else:
 			scaled_pixbuf = gtkgui_helpers.get_scaled_pixbuf(pixbuf, 'roster')
-		else:
-			scaled_pixbuf = None
 		model[iter][C_AVATAR] = scaled_pixbuf
 
 	def chg_contact_status(self, nick, show, status, role, affiliation, jid,

src/message_window.py

@@ -4,12 +4,12 @@
 ##                         Vincent Hanquez <tab@snarc.org>
 ## Copyright (C) 2005 Yann Leboulanger <asterix@lagaule.org>
 ##                    Vincent Hanquez <tab@snarc.org>
-##                    Nikos Kouremenos <kourem@gmail.com>
 ##                    Dimitur Kirov <dkirov@gmail.com>
 ##                    Norman Rasmussen <norman@rasmussen.co.za>
 ## Copyright (C) 2005-2007 Travis Shirk <travis@pobox.com>
 ## Copyright (C) 2006 Geobert Quach <geobert@gmail.com>
 ## Copyright (C) 2007 Stephan Erb <steve-e@h3c.de> 
+## Copyright (C) 2005-2008 Nikos Kouremenos <kourem@gmail.com>
 ##
 ## This file is part of Gajim.
 ##
@@ -123,7 +123,9 @@ class MessageWindow(object):
 		else:
 			nb_pos = gtk.POS_TOP
 		self.notebook.set_tab_pos(nb_pos)
-		if gajim.config.get('tabs_always_visible'):
+		window_mode = gajim.interface.msg_win_mgr.mode
+		if gajim.config.get('tabs_always_visible') or \
+		window_mode == MessageWindowMgr.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER:
 			self.notebook.set_show_tabs(True)
 			self.alignment.set_property('top-padding', 2)
 		else:
@@ -444,7 +446,9 @@ class MessageWindow(object):
 				self.window.destroy()
 			return # don't show_title, we are dead
 		elif self.get_num_controls() == 1: # we are going from two tabs to one
-			show_tabs_if_one_tab = gajim.config.get('tabs_always_visible')
+			window_mode = gajim.interface.msg_win_mgr.mode
+			show_tabs_if_one_tab = gajim.config.get('tabs_always_visible') or \
+				window_mode == MessageWindowMgr.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER
 			self.notebook.set_show_tabs(show_tabs_if_one_tab)
 			if not show_tabs_if_one_tab:
 				self.alignment.set_property('top-padding', 0)
@@ -624,11 +628,15 @@ class MessageWindow(object):
 		self.show_title(control = new_ctrl)
 
 	def _on_notebook_key_press(self, widget, event):
-		control = self.get_active_control()
 		# Ctrl+PageUP / DOWN has to be handled by notebook
 		if (event.state & gtk.gdk.CONTROL_MASK and
 				event.keyval in (gtk.keysyms.Page_Down, gtk.keysyms.Page_Up)):
 			return False
+		# when tab itself is selected, make sure <- and -> are allowed for navigating between tabs
+		if event.keyval in (gtk.keysyms.Left, gtk.keysyms.Right):
+			return False
+
+		control = self.get_active_control()
 		if isinstance(control, ChatControlBase):
 			# we forwarded it to message textview
 			control.msg_textview.emit('key_press_event', event)

src/roster_window.py

@@ -334,7 +334,6 @@ class RosterWindow:
 					model.append(i, (None, name, 'contact', jid, account, None,
 						None))
 				self.draw_contact(jid, account)
-				if gajim.config.get('show_avatars_in_roster'):
 				self.draw_avatar(jid, account)
 				self.draw_account(account)
 				# Redraw parent to change icon
@@ -395,7 +394,6 @@ class RosterWindow:
 			if gajim.groups[account][group]['expand']:
 				self.tree.expand_row(model.get_path(iterG), False)
 		self.draw_contact(jid, account)
-		if gajim.config.get('show_avatars_in_roster'):
 		self.draw_avatar(jid, account)
 		self.draw_account(account)
 		# put the children under this iter
@@ -762,6 +760,8 @@ class RosterWindow:
 
 	def draw_avatar(self, jid, account):
 		'''draw the avatar'''
+		if not gajim.config.get('show_avatars_in_roster'):
+			return
 		model = self.tree.get_model()
 		iters = self.get_contact_iter(jid, account)
 		if gajim.config.get('show_avatars_in_roster'):