Commits September 2009

commits@gajim.org

5 participants
120 discussions

gajim: call gtk.gdk.window.focus() with current timestamp rather...
by Yann Leboulanger 23 Sep '09

23 Sep '09

changeset 2d8f809cfd5a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2d8f809cfd5a description: call gtk.gdk.window.focus() with current timestamp rather than 0. This fixes some WM issues. diffstat: src/gajim.py | 2 +- src/remote_control.py | 5 +++-- src/roster_window.py | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diffs (62 lines): diff -r d3a4365ab1af -r 2d8f809cfd5a src/gajim.py --- a/src/gajim.py Wed Sep 23 16:43:31 2009 +0200 +++ b/src/gajim.py Wed Sep 23 17:35:42 2009 +0200 @@ -2527,7 +2527,7 @@ self.roster.draw_contact(jid, account) if w: w.set_active_tab(ctrl) - w.window.window.focus() + w.window.window.focus(gtk.get_current_event_time()) # Using isinstance here because we want to catch all derived types if isinstance(ctrl, ChatControlBase): tv = ctrl.conv_textview diff -r d3a4365ab1af -r 2d8f809cfd5a src/remote_control.py --- a/src/remote_control.py Wed Sep 23 16:43:31 2009 +0200 +++ b/src/remote_control.py Wed Sep 23 17:35:42 2009 +0200 @@ -27,6 +27,7 @@ ## import gobject +import gtk import os from common import gajim @@ -377,7 +378,7 @@ win = gajim.interface.msg_win_mgr.get_window(jid, connected_account).window if win.get_property('visible'): - win.window.focus() + win.window.focus(gtk.get_current_event_time()) return DBUS_BOOLEAN(True) return DBUS_BOOLEAN(False) @@ -507,7 +508,7 @@ win.present() # preserve the 'steal focus preservation' if self._is_first(): - win.window.focus() + win.window.focus(gtk.get_current_event_time()) else: win.window.focus(long(time())) diff -r d3a4365ab1af -r 2d8f809cfd5a src/roster_window.py --- a/src/roster_window.py Wed Sep 23 16:43:31 2009 +0200 +++ b/src/roster_window.py Wed Sep 23 17:35:42 2009 +0200 @@ -2929,7 +2929,7 @@ if gc_control: mw = gajim.interface.msg_win_mgr.get_window(jid, account) mw.set_active_tab(gc_control) - mw.window.window.focus() + mw.window.window.focus(gtk.get_current_event_time()) return ctrl = gajim.interface.minimized_controls[account][jid] mw = gajim.interface.msg_win_mgr.get_window(jid, account) @@ -2939,7 +2939,7 @@ ctrl.parent_win = mw mw.new_tab(ctrl) mw.set_active_tab(ctrl) - mw.window.window.focus() + mw.window.window.focus(gtk.get_current_event_time()) self.remove_groupchat(jid, account) def on_edit_account(self, widget, account):

1 0

gajim: Totem now uses MPRIS API. Fixes #4705
by Yann Leboulanger 23 Sep '09

23 Sep '09

changeset d3a4365ab1af in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d3a4365ab1af description: Totem now uses MPRIS API. Fixes #4705 diffstat: src/music_track_listener.py | 20 -------------------- 1 files changed, 0 insertions(+), 20 deletions(-) diffs (37 lines): diff -r 09af71b82ee8 -r d3a4365ab1af src/music_track_listener.py --- a/src/music_track_listener.py Tue Sep 22 08:21:01 2009 +0200 +++ b/src/music_track_listener.py Wed Sep 23 16:43:31 2009 +0200 @@ -98,15 +98,6 @@ 'NameOwnerChanged', 'org.freedesktop.DBus', arg0='net.sacredchao.QuodLibet') - ## Totem - ## patched by Lucky <lucky1.data(a)gmail.com> - ## used with Totem DBus plugin: - ## http://lucky.awardspace.co.uk/home/totem-plugins - bus.add_signal_receiver(self._totem_playing_started_cb, - 'playingStarted', 'org.gnome.Totem') - bus.add_signal_receiver(self._totem_playing_stopped_cb, - 'playingStopped', 'org.gnome.Totem') - def _player_name_owner_changed(self, name, old, new): if not new: self.emit('music-track-changed', None) @@ -211,17 +202,6 @@ info.duration = int(props.get('~#length', 0)) return info - def _totem_playing_started_cb(self, title, album, artist, duration): - self._last_playing_music = MusicTrackInfo() - self._last_playing_music.title = title - self._last_playing_music.album = album - self._last_playing_music.artist = artist - self._last_playing_music.duration = duration - self.emit('music-track-changed', self._last_playing_music) - - def _totem_playing_stopped_cb(self): - self.emit('music-track-changed', None) - def get_playing_track(self): '''Return a MusicTrackInfo for the currently playing song, or None if no song is playing'''

1 0

gajim: My last commit was useless... now terminate the session i...
by Thibaut GIRKA 22 Sep '09

22 Sep '09

changeset acd502e3545b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=acd502e3545b description: My last commit was useless... now terminate the session if the connection fails diffstat: src/common/jingle.py | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diffs (80 lines): diff -r 7b9c0a803608 -r acd502e3545b src/common/jingle.py --- a/src/common/jingle.py Sun Sep 20 22:41:17 2009 +0200 +++ b/src/common/jingle.py Tue Sep 22 22:33:00 2009 +0200 @@ -141,7 +141,7 @@ ''' reason = xmpp.Node('reason') reason.addChild('decline') - self.__session_terminate(reason) + self._session_terminate(reason) def end_session(self): ''' Called when user stops or cancel session in UI. ''' @@ -150,7 +150,7 @@ reason.addChild('success') else: reason.addChild('cancel') - self.__session_terminate(reason) + self._session_terminate(reason) ''' Middle-level functions to manage contents. Handle local content cache and send change notifications. ''' @@ -313,7 +313,7 @@ if len(self.contents) == 0: reason = xmpp.Node('reason') reason.setTag('success') #FIXME: Is it the good one? - self.__session_terminate(reason) + self._session_terminate(reason) def __sessionAcceptCB(self, stanza, jingle, error, action): if self.state != JingleStates.pending: #FIXME @@ -371,7 +371,7 @@ reason = xmpp.Node('reason') reason.setTag('unsupported-applications') self.__defaultCB(stanza, jingle, error, action) - self.__session_terminate(reason) + self._session_terminate(reason) raise xmpp.NodeProcessed if not transports_ok: @@ -379,7 +379,7 @@ reason = xmpp.Node('reason') reason.setTag('unsupported-transports') self.__defaultCB(stanza, jingle, error, action) - self.__session_terminate(reason) + self._session_terminate(reason) raise xmpp.NodeProcessed self.state = JingleStates.pending @@ -497,7 +497,7 @@ jingle.addChild(node=payload) self.connection.connection.send(stanza) - def __session_terminate(self, reason=None): + def _session_terminate(self, reason=None): assert self.state != JingleStates.ended stanza, jingle = self.__make_jingle('session-terminate') if reason is not None: @@ -742,7 +742,11 @@ elif name == 'farsight-component-state-changed': state = message.structure['state'] print message.structure['component'], state - if state == farsight.STREAM_STATE_READY: + if state == farsight.STREAM_STATE_FAILED: + reason = xmpp.Node('reason') + reason.setTag('failed-transport') + self.session._session_terminate(reason) + elif state == farsight.STREAM_STATE_READY: self.negotiated = True #TODO: farsight.DIRECTION_BOTH only if senders='both' self.p2pstream.set_property('direction', farsight.DIRECTION_BOTH) @@ -948,9 +952,6 @@ raise xmpp.NodeProcessed - def addJingleIqCallback(self, jid, id, jingle): - self.__iq_responses[(jid, id)] = jingle - def startVoIP(self, jid): jingle = JingleSession(self, weinitiate=True, jid=jid) self.add_jingle(jingle)

1 0

gajim: ignore when dropping file on a contact that doesn't suppo...
by Yann Leboulanger 22 Sep '09

22 Sep '09

changeset 09af71b82ee8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=09af71b82ee8 description: ignore when dropping file on a contact that doesn't support file transfer. Fixes #4058 diffstat: src/roster_window.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r 3b7f3093db6f -r 09af71b82ee8 src/roster_window.py --- a/src/roster_window.py Mon Sep 21 21:36:04 2009 +0200 +++ b/src/roster_window.py Tue Sep 22 08:21:01 2009 +0200 @@ -3988,6 +3988,8 @@ return c_dest = gajim.contacts.get_contact_with_highest_priority(account_dest, jid_dest) + if not gajim.capscache.is_supported(c_dest, NS_FILE): + return uri = data.strip() uri_splitted = uri.split() # we may have more than one file dropped try:

1 0

gajim: disable Ubuntu indicator support. see #4942, Fixes #5271
by Yann Leboulanger 21 Sep '09

21 Sep '09

changeset 3b7f3093db6f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3b7f3093db6f description: disable Ubuntu indicator support. see #4942, Fixes #5271 diffstat: src/common/gajim.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 3fb49f37d769 -r 3b7f3093db6f src/common/gajim.py --- a/src/common/gajim.py Mon Sep 21 21:31:40 2009 +0200 +++ b/src/common/gajim.py Mon Sep 21 21:36:04 2009 +0200 @@ -183,7 +183,7 @@ import latex HAVE_LATEX = latex.check_for_latex_support() -HAVE_INDICATOR = True +HAVE_INDICATOR = False try: import indicate except ImportError:

1 0

gajim: [g.livid] fix xfce4 notifd usage with git version of noti...
by Yann Leboulanger 21 Sep '09

21 Sep '09

changeset 3fb49f37d769 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3fb49f37d769 description: [g.livid] fix xfce4 notifd usage with git version of notifyd. Fixes #5280 diffstat: src/notify.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r e0ddd6563426 -r 3fb49f37d769 src/notify.py --- a/src/notify.py Mon Sep 21 21:22:57 2009 +0200 +++ b/src/notify.py Mon Sep 21 21:31:40 2009 +0200 @@ -650,7 +650,7 @@ def version_reply_handler(self, name, vendor, version, spec_version=None): if spec_version: version = spec_version - elif vendor == 'Xfce' and version == '0.1.0': + elif vendor == 'Xfce' and version.startswith('0.1.0'): version = '0.9' version_list = version.split('.') self.version = []

1 0

gajim: don't fail when we get chat / normal messages from a room...
by Yann Leboulanger 21 Sep '09

21 Sep '09

changeset e0ddd6563426 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e0ddd6563426 description: don't fail when we get chat / normal messages from a room_jid. Fixes #5276 diffstat: src/dialogs.py | 7 +++++++ src/roster_window.py | 11 +++++++++++ src/session.py | 2 +- 3 files changed, 19 insertions(+), 1 deletions(-) diffs (57 lines): diff -r da71859f334a -r e0ddd6563426 src/dialogs.py --- a/src/dialogs.py Sun Sep 20 20:19:31 2009 +0200 +++ b/src/dialogs.py Mon Sep 21 21:22:57 2009 +0200 @@ -2503,6 +2503,13 @@ def on_single_message_window_destroy(self, widget): self.instances.remove(self) + c = gajim.contacts.get_contact_with_highest_priority(self.account, + self.from_whom) + if c.is_groupchat() and not self.from_whom in \ + gajim.interface.minimized_controls[self.account] and self.action == \ + 'receive' and gajim.events.get_nb_roster_events(self.account, + self.from_whom, types=['chat', 'normal']) == 0: + gajim.interface.roster.remove_groupchat(self.from_whom, self.account) def set_cursor_to_end(self): end_iter = self.message_tv_buffer.get_end_iter() diff -r da71859f334a -r e0ddd6563426 src/roster_window.py --- a/src/roster_window.py Sun Sep 20 20:19:31 2009 +0200 +++ b/src/roster_window.py Mon Sep 21 21:22:57 2009 +0200 @@ -807,6 +807,11 @@ gajim.contacts.add_contact(account, contact) self.add_contact(jid, account) else: + if jid not in gajim.interface.minimized_controls[account]: + # there is a window that we can minimize + gc_control = gajim.interface.msg_win_mgr.get_gc_control(jid, + account) + gajim.interface.minimized_controls[account][jid] = gc_control contact.show = show contact.status = status self.adjust_and_draw_contact_context(jid, account) @@ -2919,6 +2924,12 @@ def on_groupchat_maximized(self, widget, jid, account): '''When a groupchat is maximised''' if not jid in gajim.interface.minimized_controls[account]: + # Already opened? + gc_control = gajim.interface.msg_win_mgr.get_gc_control(jid, account) + if gc_control: + mw = gajim.interface.msg_win_mgr.get_window(jid, account) + mw.set_active_tab(gc_control) + mw.window.window.focus() return ctrl = gajim.interface.minimized_controls[account][jid] mw = gajim.interface.msg_win_mgr.get_window(jid, account) diff -r da71859f334a -r e0ddd6563426 src/session.py --- a/src/session.py Sun Sep 20 20:19:31 2009 +0200 +++ b/src/session.py Mon Sep 21 21:22:57 2009 +0200 @@ -250,7 +250,7 @@ if self.control: parent_win = self.control.parent_win - if self.control == parent_win.get_active_control() and \ + if parent_win and self.control == parent_win.get_active_control() and \ parent_win.window.has_focus: focused = True

1 0

gajim: prevent traceback when enabling Tune. Fixes #5277
by Yann Leboulanger 21 Sep '09

21 Sep '09

changeset da71859f334a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=da71859f334a description: prevent traceback when enabling Tune. Fixes #5277 diffstat: src/gajim.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (13 lines): diff -r a2021b65ddac -r da71859f334a src/gajim.py --- a/src/gajim.py Fri Sep 18 18:45:08 2009 +0300 +++ b/src/gajim.py Sun Sep 20 20:19:31 2009 +0200 @@ -3004,8 +3004,8 @@ pass def enable_music_listener(self): + listener = MusicTrackListener.get() if not self.music_track_changed_signal: - listener = MusicTrackListener.get() self.music_track_changed_signal = listener.connect( 'music-track-changed', self.music_track_changed) track = listener.get_playing_track()

1 0

gajim: Last time, I removed something I shouldn't have...
by Thibaut GIRKA 20 Sep '09

20 Sep '09

changeset 7b9c0a803608 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7b9c0a803608 description: Last time, I removed something I shouldn't have... diffstat: src/common/jingle.py | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diffs (35 lines): diff -r 541838ea2b4d -r 7b9c0a803608 src/common/jingle.py --- a/src/common/jingle.py Sun Sep 20 20:46:03 2009 +0200 +++ b/src/common/jingle.py Sun Sep 20 22:41:17 2009 +0200 @@ -191,8 +191,7 @@ def is_ready(self): ''' Returns True when all codecs and candidates are ready (for all contents). ''' - return all((c.candidates_ready and c.p2psession.get_property('codecs-ready') - for c in self.contents.itervalues())) + return all((content.is_ready() for content in self.contents.itervalues())) ''' Middle-level function to do stanza exchange. ''' def start_session(self): @@ -572,6 +571,11 @@ 'session-terminate-sent': [], } + def is_ready(self): + #print '[%s] %s, %s' % (self.media, self.candidates_ready, + # self.p2psession.get_property('codecs-ready')) + return self.candidates_ready and self.p2psession.get_property('codecs-ready') + def stanzaCB(self, stanza, content, error, action): ''' Called when something related to our content was sent by peer. ''' if action in self.callbacks: @@ -944,6 +948,9 @@ raise xmpp.NodeProcessed + def addJingleIqCallback(self, jid, id, jingle): + self.__iq_responses[(jid, id)] = jingle + def startVoIP(self, jid): jingle = JingleSession(self, weinitiate=True, jid=jid) self.add_jingle(jingle)

1 0

gajim: farsighr module is now optional. Fixes #5278
by Yann Leboulanger 20 Sep '09

20 Sep '09

changeset 541838ea2b4d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=541838ea2b4d description: farsighr module is now optional. Fixes #5278 diffstat: src/chat_control.py | 3 ++- src/common/connection_handlers.py | 9 ++++++++- src/common/gajim.py | 9 ++++++--- src/common/helpers.py | 6 ++++++ src/features_window.py | 7 +++++++ 5 files changed, 29 insertions(+), 5 deletions(-) diffs (96 lines): diff -r 2915051a3706 -r 541838ea2b4d src/chat_control.py --- a/src/chat_control.py Sat Sep 19 17:24:59 2009 +0200 +++ b/src/chat_control.py Sun Sep 20 20:46:03 2009 +0200 @@ -1253,7 +1253,8 @@ 'muc_active').get_pixbuf()) self._audio_image = self.xml.get_widget('audio_image') - if gajim.capscache.is_supported(contact, NS_JINGLE_RTP_AUDIO): + if gajim.capscache.is_supported(contact, NS_JINGLE_RTP_AUDIO) and \ + gajim.HAVE_FARSIGHT: self.set_audio_state('available') else: self.set_audio_state('not_available') diff -r 2915051a3706 -r 541838ea2b4d src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sat Sep 19 17:24:59 2009 +0200 +++ b/src/common/connection_handlers.py Sun Sep 20 20:46:03 2009 +0200 @@ -51,7 +51,14 @@ from common.commands import ConnectionCommands from common.pubsub import ConnectionPubSub from common.caps import ConnectionCaps -from common.jingle import ConnectionJingle +if gajim.HAVE_FARSIGHT: + from common.jingle import ConnectionJingle +else: + class ConnectionJingle(): + def __init__(self): + pass + def _JingleCB(self, con, stanza): + pass from common import dbus_support if dbus_support.supported: diff -r 2915051a3706 -r 541838ea2b4d src/common/gajim.py --- a/src/common/gajim.py Sat Sep 19 17:24:59 2009 +0200 +++ b/src/common/gajim.py Sun Sep 20 20:46:03 2009 +0200 @@ -189,6 +189,11 @@ except ImportError: HAVE_INDICATOR = False +HAVE_FARSIGHT = True +try: + import farsight, gst +except ImportError: + HAVE_FARSIGHT = False gajim_identity = {'type': 'pc', 'category': 'client', 'name': 'Gajim'} gajim_common_features = [xmpp.NS_BYTESTREAM, xmpp.NS_SI, xmpp.NS_FILE, xmpp.NS_MUC, xmpp.NS_MUC_USER, xmpp.NS_MUC_ADMIN, xmpp.NS_MUC_OWNER, @@ -196,9 +201,7 @@ 'jabber:iq:gateway', xmpp.NS_LAST, xmpp.NS_PRIVACY, xmpp.NS_PRIVATE, xmpp.NS_REGISTER, xmpp.NS_VERSION, xmpp.NS_DATA, xmpp.NS_ENCRYPTED, 'msglog', 'sslc2s', 'stringprep', xmpp.NS_PING, xmpp.NS_TIME_REVISED, xmpp.NS_SSN, - xmpp.NS_MOOD, xmpp.NS_ACTIVITY, xmpp.NS_NICK, xmpp.NS_ROSTERX, - xmpp.NS_JINGLE, xmpp.NS_JINGLE_RTP, xmpp.NS_JINGLE_RTP_AUDIO, - xmpp.NS_JINGLE_RTP_VIDEO, xmpp.NS_JINGLE_ICE_UDP] + xmpp.NS_MOOD, xmpp.NS_ACTIVITY, xmpp.NS_NICK, xmpp.NS_ROSTERX] # Optional features gajim supports per account gajim_optional_features = {} diff -r 2915051a3706 -r 541838ea2b4d src/common/helpers.py --- a/src/common/helpers.py Sat Sep 19 17:24:59 2009 +0200 +++ b/src/common/helpers.py Sun Sep 20 20:46:03 2009 +0200 @@ -1352,6 +1352,12 @@ gajim.gajim_optional_features[a].append(xmpp.NS_ESESSION) if gajim.config.get_per('accounts', a, 'answer_receipts'): gajim.gajim_optional_features[a].append(xmpp.NS_RECEIPTS) + if gajim.HAVE_FARSIGHT: + gajim.gajim_optional_features[a].append(xmpp.NS_JINGLE) + gajim.gajim_optional_features[a].append(xmpp.NS_JINGLE_RTP) + gajim.gajim_optional_features[a].append(xmpp.NS_JINGLE_RTP_AUDIO) + gajim.gajim_optional_features[a].append(xmpp.NS_JINGLE_RTP_VIDEO) + gajim.gajim_optional_features[a].append(xmpp.NS_JINGLE_ICE_UDP) gajim.caps_hash[a] = compute_caps_hash([gajim.gajim_identity], gajim.gajim_common_features + gajim.gajim_optional_features[a]) # re-send presence with new hash diff -r 2915051a3706 -r 541838ea2b4d src/features_window.py --- a/src/features_window.py Sat Sep 19 17:24:59 2009 +0200 +++ b/src/features_window.py Sun Sep 20 20:46:03 2009 +0200 @@ -107,6 +107,10 @@ _('Ability to have clickable URLs in chat and groupchat window banners.'), _('Requires python-sexy.'), _('Requires python-sexy.')), + _('Audio / Video'): (self.farsight_available, + _('Ability to start audio and video chat.'), + _('Requires python-farsight.'), + _('Feature not available under Windows.')), } # name, supported @@ -265,4 +269,7 @@ def pysexy_available(self): return gajim.HAVE_PYSEXY + def farsight_available(self): + return gajim.HAVE_FARSIGHT + # vim: se ts=3:

1 0

← Newer
1
2
3
4
5
6
7
8
...
12
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2009