Commits

commits@gajim.org

17632 discussions

gajim: request ad-hoc commands to muc occupant real JID if room ...
by Yann Leboulanger 16 Apr '12

16 Apr '12

changeset 0a8585330cca in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0a8585330cca description: request ad-hoc commands to muc occupant real JID if room is not anonymous. Fixes #2820 diffstat: src/groupchat_control.py | 3 ++- src/gui_menu_builder.py | 12 +++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diffs (42 lines): diff -r 6763cf2504e6 -r 0a8585330cca src/groupchat_control.py --- a/src/groupchat_control.py Sun Apr 15 23:42:53 2012 +0200 +++ b/src/groupchat_control.py Mon Apr 16 23:03:30 2012 +0200 @@ -272,7 +272,8 @@ use_multiple_contacts=False, show_start_chat=False, show_encryption=True, control=self, show_buttonbar_items=not hide_buttonbar_items, - gc_contact=self.gc_contact) + gc_contact=self.gc_contact, + is_anonymous=self.room_ctrl.is_anonymous) return menu class GroupchatControl(ChatControlBase): diff -r 6763cf2504e6 -r 0a8585330cca src/gui_menu_builder.py --- a/src/gui_menu_builder.py Sun Apr 15 23:42:53 2012 +0200 +++ b/src/gui_menu_builder.py Mon Apr 16 23:03:30 2012 +0200 @@ -153,7 +153,7 @@ def get_contact_menu(contact, account, use_multiple_contacts=True, show_start_chat=True, show_encryption=False, show_buttonbar_items=True, -control=None, gc_contact=None): +control=None, gc_contact=None, is_anonymous=True): """ Build contact popup menu for roster and chat window. If control is not set, we hide invite_contacts_menuitem @@ -236,8 +236,14 @@ if contact.supports(NS_COMMANDS): execute_command_menuitem.set_sensitive(True) - execute_command_menuitem.connect('activate', roster.on_execute_command, - contact, account, contact.resource) + if gc_contact and gc_contact.jid and not is_anonymous: + execute_command_menuitem.connect('activate', + roster.on_execute_command, gc_contact, account, + gc_contact.resource) + else: + execute_command_menuitem.connect('activate', + roster.on_execute_command, contact, account, + contact.resource) else: execute_command_menuitem.set_sensitive(False)

1 0

gajim: handle see-other-host stream error. Fixes #7134
by Yann Leboulanger 15 Apr '12

15 Apr '12

changeset 6763cf2504e6 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6763cf2504e6 description: handle see-other-host stream error. Fixes #7134 diffstat: src/common/connection.py | 18 ++++++++++++++---- src/common/connection_handlers.py | 17 ++++++++++++++++- 2 files changed, 30 insertions(+), 5 deletions(-) diffs (78 lines): diff -r 77bf2919b7ed -r 6763cf2504e6 src/common/connection.py --- a/src/common/connection.py Sat Apr 14 13:40:55 2012 +0200 +++ b/src/common/connection.py Sun Apr 15 23:42:53 2012 +0200 @@ -689,6 +689,7 @@ self.try_connecting_for_foo_secs = 45 # holds the actual hostname to which we are connected self.connected_hostname = None + self.redirected = None self.last_time_to_reconnect = None self.new_account_info = None self.new_account_form = None @@ -1039,10 +1040,17 @@ self.name, 'try_connecting_for_foo_secs') proxy = helpers.get_proxy_info(self.name) use_srv = gajim.config.get_per('accounts', self.name, 'use_srv') - use_custom = gajim.config.get_per('accounts', self.name, + if self.redirected: + use_custom = True + custom_h = self.redirected['host'] + custom_p = self.redirected['port'] + else: + use_custom = gajim.config.get_per('accounts', self.name, 'use_custom_host') - custom_h = gajim.config.get_per('accounts', self.name, 'custom_host') - custom_p = gajim.config.get_per('accounts', self.name, 'custom_port') + custom_h = gajim.config.get_per('accounts', self.name, + 'custom_host') + custom_p = gajim.config.get_per('accounts', self.name, + 'custom_port') # create connection if it doesn't already exist self.connected = 1 @@ -1054,8 +1062,10 @@ h = custom_h p = custom_p ssl_p = custom_p - use_srv = False + if not self.redirected: + use_srv = False + self.redirected = None # SRV resolver self._proxy = proxy self._hosts = [ {'host': h, 'port': p, 'ssl_port': ssl_p, 'prio': 10, diff -r 77bf2919b7ed -r 6763cf2504e6 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sat Apr 14 13:40:55 2012 +0200 +++ b/src/common/connection_handlers.py Sun Apr 15 23:42:53 2012 +0200 @@ -190,7 +190,7 @@ query.setAttr('node', 'http://gajim.org#' + gajim.version.split('-', 1)[ 0]) for f in (common.xmpp.NS_BYTESTREAM, common.xmpp.NS_SI, - common.xmpp.NS_FILE, common.xmpp.NS_COMMANDS, + common.xmpp.NS_FILE, common.xmpp.NS_COMMANDS, common.xmpp.NS_JINGLE_FILE_TRANSFER, common.xmpp.NS_JINGLE_XTLS, common.xmpp.NS_PUBKEY_PUBKEY, common.xmpp.NS_PUBKEY_REVOKE, common.xmpp.NS_PUBKEY_ATTEST): @@ -2014,6 +2014,21 @@ if obj.getTag('conflict'): # disconnected because of a resource conflict self.dispatch('RESOURCE_CONFLICT', ()) + other_host = obj.getTag('see-other-host') + if other_host and self.last_connection_type in ('ssl', 'tls'): + host = other_host.getData() + if ':' in host: + host_l = host.split(':', 1) + h = host_l[0] + p = host_l[1] + else: + h = host + p = 5222 + if h.startswith('[') and h.endswith(']'): + h = h[1:-1] + self.redirected = {'host': h, 'port': p} + self.disconnect(on_purpose=True) + self.connect() def _register_handlers(self, con, con_type): # try to find another way to register handlers in each class

1 0

gajim: merge jingleFT branch! Thanks to Zhenchao Li and Jefry La...
by Yann Leboulanger 14 Apr '12

14 Apr '12

changeset 77bf2919b7ed in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=77bf2919b7ed description: merge jingleFT branch! Thanks to Zhenchao Li and Jefry Lagrange for their work. diffstat: src/chat_control.py | 6 +- src/common/caps_cache.py | 4 +- src/common/check_paths.py | 14 + src/common/configpaths.py | 3 +- src/common/connection_handlers.py | 47 +- src/common/connection_handlers_events.py | 101 +- src/common/gajim.py | 6 +- src/common/helpers.py | 4 + src/common/jingle.py | 80 +- src/common/jingle_content.py | 21 +- src/common/jingle_ft.py | 375 ++++++++ src/common/jingle_ftstates.py | 244 +++++ src/common/jingle_rtp.py | 2 +- src/common/jingle_session.py | 211 +++- src/common/jingle_transport.py | 262 ++++++- src/common/jingle_xtls.py | 239 +++++ src/common/protocol/bytestream.py | 66 +- src/common/socks5.py | 1258 +++++++++++++++++++---------- src/common/xmpp/protocol.py | 91 ++- src/dialogs.py | 7 +- src/filetransfers_window.py | 80 +- src/gui_interface.py | 104 ++- src/gui_menu_builder.py | 4 +- src/roster_window.py | 3 + test/unit/test_jingle.py | 157 +++ test/unit/test_socks5.py | 177 ++++ 26 files changed, 2971 insertions(+), 595 deletions(-) diffs (truncated from 4863 to 300 lines): diff -r f6f78f3802c0 -r 77bf2919b7ed src/chat_control.py --- a/src/chat_control.py Thu Apr 12 07:17:50 2012 +0200 +++ b/src/chat_control.py Sat Apr 14 13:40:55 2012 +0200 @@ -53,7 +53,7 @@ from common.pep import MOODS, ACTIVITIES from common.xmpp.protocol import NS_XHTML, NS_XHTML_IM, NS_FILE, NS_MUC from common.xmpp.protocol import NS_RECEIPTS, NS_ESESSION -from common.xmpp.protocol import NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO, NS_JINGLE_ICE_UDP +from common.xmpp.protocol import NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO, NS_JINGLE_ICE_UDP, NS_JINGLE_FILE_TRANSFER from common.xmpp.protocol import NS_CHATSTATES from common.connection_handlers_events import MessageOutgoingEvent from common.exceptions import GajimGeneralException @@ -1722,13 +1722,13 @@ self._video_button.set_sensitive(self.video_available) # Send file - if self.contact.supports(NS_FILE) and (self.type_id == 'chat' or \ + if (self.contact.supports(NS_FILE) or self.contact.supports(NS_JINGLE_FILE_TRANSFER)) and (self.type_id == 'chat' or \ self.gc_contact.resource): self._send_file_button.set_sensitive(True) self._send_file_button.set_tooltip_text('') else: self._send_file_button.set_sensitive(False) - if not self.contact.supports(NS_FILE): + if not (self.contact.supports(NS_FILE) or self.contact.supports(NS_JINGLE_FILE_TRANSFER)): self._send_file_button.set_tooltip_text(_( "This contact does not support file transfer.")) else: diff -r f6f78f3802c0 -r 77bf2919b7ed src/common/caps_cache.py --- a/src/common/caps_cache.py Thu Apr 12 07:17:50 2012 +0200 +++ b/src/common/caps_cache.py Sat Apr 14 13:40:55 2012 +0200 @@ -38,10 +38,10 @@ log = logging.getLogger('gajim.c.caps_cache') from common.xmpp import (NS_XHTML_IM, NS_RECEIPTS, NS_ESESSION, NS_CHATSTATES, - NS_JINGLE_ICE_UDP, NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO, NS_CAPS) + NS_JINGLE_ICE_UDP, NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO, NS_CAPS, NS_JINGLE_FILE_TRANSFER) # Features where we cannot safely assume that the other side supports them FEATURE_BLACKLIST = [NS_CHATSTATES, NS_XHTML_IM, NS_RECEIPTS, NS_ESESSION, - NS_JINGLE_ICE_UDP, NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO] + NS_JINGLE_ICE_UDP, NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO, NS_JINGLE_FILE_TRANSFER] # Query entry status codes NEW = 0 diff -r f6f78f3802c0 -r 77bf2919b7ed src/common/check_paths.py --- a/src/common/check_paths.py Thu Apr 12 07:17:50 2012 +0200 +++ b/src/common/check_paths.py Sat Apr 14 13:40:55 2012 +0200 @@ -30,6 +30,7 @@ from common import gajim import logger +from common import jingle_xtls # DO NOT MOVE ABOVE OF import gajim import sqlite3 as sqlite @@ -266,6 +267,8 @@ MY_DATA = configpaths.gajimpaths['MY_DATA'] MY_CONFIG = configpaths.gajimpaths['MY_CONFIG'] MY_CACHE = configpaths.gajimpaths['MY_CACHE'] + XTLS_CERTS = configpaths.gajimpaths['MY_PEER_CERTS'] + LOCAL_XTLS_CERTS = configpaths.gajimpaths['MY_CERT'] PLUGINS_CONFIG_PATH = gajim.PLUGINS_CONFIG_DIR @@ -342,6 +345,17 @@ print _('%s is a directory but should be a file') % CACHE_DB_PATH print _('Gajim will now exit') sys.exit() + + if not os.path.exists(XTLS_CERTS): + create_path(XTLS_CERTS) + if not os.path.exists(LOCAL_XTLS_CERTS): + create_path(LOCAL_XTLS_CERTS) + cert_name = os.path.join(LOCAL_XTLS_CERTS, + jingle_xtls.SELF_SIGNED_CERTIFICATE) + if not (os.path.exists(cert_name + '.cert') and os.path.exists( + cert_name + '.pkey')): + jingle_xtls.make_certs(cert_name, 'gajim') + def create_path(directory): head, tail = os.path.split(directory) diff -r f6f78f3802c0 -r 77bf2919b7ed src/common/configpaths.py --- a/src/common/configpaths.py Thu Apr 12 07:17:50 2012 +0200 +++ b/src/common/configpaths.py Sat Apr 14 13:40:55 2012 +0200 @@ -141,7 +141,7 @@ d = {'MY_DATA': '', 'LOG_DB': u'logs.db', 'MY_CACERTS': u'cacerts.pem', 'MY_EMOTS': u'emoticons', 'MY_ICONSETS': u'iconsets', 'MY_MOOD_ICONSETS': u'moods', 'MY_ACTIVITY_ICONSETS': u'activities', - 'PLUGINS_USER': u'plugins'} + 'PLUGINS_USER': u'plugins', 'MY_PEER_CERTS': u'certs'} for name in d: self.add(name, TYPE_DATA, windowsify(d[name])) @@ -151,6 +151,7 @@ self.add(name, TYPE_CACHE, windowsify(d[name])) self.add('MY_CONFIG', TYPE_CONFIG, '') + self.add('MY_CERT', TYPE_CONFIG, '') basedir = fse(os.environ.get(u'GAJIM_BASEDIR', defs.basedir)) self.add('DATA', None, os.path.join(basedir, windowsify(u'data'))) diff -r f6f78f3802c0 -r 77bf2919b7ed src/common/connection_handlers.py --- a/src/common/connection_handlers.py Thu Apr 12 07:17:50 2012 +0200 +++ b/src/common/connection_handlers.py Sat Apr 14 13:40:55 2012 +0200 @@ -45,6 +45,7 @@ from common import gajim from common import exceptions from common import dataforms +from common import jingle_xtls from common.commands import ConnectionCommands from common.pubsub import ConnectionPubSub from common.pep import ConnectionPEP @@ -189,7 +190,10 @@ query.setAttr('node', 'http://gajim.org#' + gajim.version.split('-', 1)[ 0]) for f in (common.xmpp.NS_BYTESTREAM, common.xmpp.NS_SI, - common.xmpp.NS_FILE, common.xmpp.NS_COMMANDS): + common.xmpp.NS_FILE, common.xmpp.NS_COMMANDS, + common.xmpp.NS_JINGLE_FILE_TRANSFER, common.xmpp.NS_JINGLE_XTLS, + common.xmpp.NS_PUBKEY_PUBKEY, common.xmpp.NS_PUBKEY_REVOKE, + common.xmpp.NS_PUBKEY_ATTEST): feature = common.xmpp.Node('feature') feature.setAttr('var', f) query.addChild(node=feature) @@ -1979,10 +1983,37 @@ gajim.nec.push_incoming_event(SearchFormReceivedEvent(None, conn=self, stanza=iq_obj)) - def _StreamCB(self, con, iq_obj): - log.debug('StreamCB') - gajim.nec.push_incoming_event(StreamReceivedEvent(None, - conn=self, stanza=iq_obj)) + def _search_fields_received(self, con, iq_obj): + jid = jid = helpers.get_jid_from_iq(iq_obj) + tag = iq_obj.getTag('query', namespace = common.xmpp.NS_SEARCH) + if not tag: + self.dispatch('SEARCH_FORM', (jid, None, False)) + return + df = tag.getTag('x', namespace = common.xmpp.NS_DATA) + if df: + self.dispatch('SEARCH_FORM', (jid, df, True)) + return + df = {} + for i in iq_obj.getQueryPayload(): + df[i.getName()] = i.getData() + self.dispatch('SEARCH_FORM', (jid, df, False)) + + def _PubkeyGetCB(self, con, iq_obj): + log.info('PubkeyGetCB') + jid_from = helpers.get_full_jid_from_iq(iq_obj) + sid = iq_obj.getAttr('id') + jingle_xtls.send_cert(con, jid_from, sid) + raise common.xmpp.NodeProcessed + + def _PubkeyResultCB(self, con, iq_obj): + log.info('PubkeyResultCB') + jid_from = helpers.get_full_jid_from_iq(iq_obj) + jingle_xtls.handle_new_cert(con, iq_obj, jid_from) + + def _StreamCB(self, con, obj): + if obj.getTag('conflict'): + # disconnected because of a resource conflict + self.dispatch('RESOURCE_CONFLICT', ()) def _register_handlers(self, con, con_type): # try to find another way to register handlers in each class @@ -2070,5 +2101,7 @@ con.RegisterHandler('iq', self._ResultCB, 'result') con.RegisterHandler('presence', self._StanzaArrivedCB) con.RegisterHandler('message', self._StanzaArrivedCB) - con.RegisterHandler('unknown', self._StreamCB, - common.xmpp.NS_XMPP_STREAMS, xmlns=common.xmpp.NS_STREAMS) + con.RegisterHandler('unknown', self._StreamCB, 'urn:ietf:params:xml:ns:xmpp-streams', xmlns='http://etherx.jabber.org/streams') + con.RegisterHandler('iq', self._PubkeyGetCB, 'get', common.xmpp.NS_PUBKEY_PUBKEY) + con.RegisterHandler('iq', self._PubkeyResultCB, 'result', common.xmpp.NS_PUBKEY_PUBKEY) + diff -r f6f78f3802c0 -r 77bf2919b7ed src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Thu Apr 12 07:17:50 2012 +0200 +++ b/src/common/connection_handlers_events.py Sat Apr 14 13:40:55 2012 +0200 @@ -36,6 +36,7 @@ from common.logger import LOG_DB_PATH from common.pep import SUPPORTED_PERSONAL_USER_EVENTS from common.xmpp.protocol import NS_CHATSTATES +from common.jingle_transport import JingleTransportSocks5 import gtkgui_helpers @@ -1392,6 +1393,16 @@ self.jid, self.resource = gajim.get_room_and_nick_from_fjid(self.fjid) self.sid = self.jingle_session.sid return True + +class JingleTransferCancelledEvent(nec.NetworkIncomingEvent): + name = 'jingleFT-cancelled-received' + base_network_events = [] + + def generate(self): + self.fjid = self.jingle_session.peerjid + self.jid, self.resource = gajim.get_room_and_nick_from_fjid(self.fjid) + self.sid = self.jingle_session.sid + return True class JingleErrorReceivedEvent(nec.NetworkIncomingEvent): name = 'jingle-error-received' @@ -1901,6 +1912,10 @@ name = 'file-request-received' base_network_events = [] + def init(self): + self.jingle_content = None + self.FT_content = None + def generate(self): self.get_id() self.fjid = self.conn._ft_get_from(self.stanza) @@ -1908,28 +1923,36 @@ self.file_props = {'type': 'r'} self.file_props['sender'] = self.fjid self.file_props['request-id'] = self.id_ - si = self.stanza.getTag('si') - profile = si.getAttr('profile') - if profile != xmpp.NS_FILE: - self.conn.send_file_rejection(self.file_props, code='400', typ='profile') - raise xmpp.NodeProcessed - feature_tag = si.getTag('feature', namespace=xmpp.NS_FEATURE) - if not feature_tag: - return - form_tag = feature_tag.getTag('x', namespace=xmpp.NS_DATA) - if not form_tag: - return - self.dataform = dataforms.ExtendForm(node=form_tag) - for f in self.dataform.iter_fields(): - if f.var == 'stream-method' and f.type == 'list-single': - values = [o[1] for o in f.options] - self.file_props['stream-methods'] = ' '.join(values) - if xmpp.NS_BYTESTREAM in values or xmpp.NS_IBB in values: - break + if self.jingle_content: + self.file_props['session-type'] = 'jingle' + self.file_props['stream-methods'] = xmpp.NS_BYTESTREAM + file_tag = self.jingle_content.getTag('description').getTag( + 'offer').getTag('file') else: - self.conn.send_file_rejection(self.file_props, code='400', typ='stream') - raise xmpp.NodeProcessed - file_tag = si.getTag('file') + si = self.stanza.getTag('si') + profile = si.getAttr('profile') + if profile != xmpp.NS_FILE: + self.conn.send_file_rejection(self.file_props, code='400', + typ='profile') + raise xmpp.NodeProcessed + feature_tag = si.getTag('feature', namespace=xmpp.NS_FEATURE) + if not feature_tag: + return + form_tag = feature_tag.getTag('x', namespace=xmpp.NS_DATA) + if not form_tag: + return + self.dataform = dataforms.ExtendForm(node=form_tag) + for f in self.dataform.iter_fields(): + if f.var == 'stream-method' and f.type == 'list-single': + values = [o[1] for o in f.options] + self.file_props['stream-methods'] = ' '.join(values) + if xmpp.NS_BYTESTREAM in values or xmpp.NS_IBB in values: + break + else: + self.conn.send_file_rejection(self.file_props, code='400', + typ='stream') + raise xmpp.NodeProcessed + file_tag = si.getTag('file') for attribute in file_tag.getAttrs(): if attribute in ('name', 'size', 'hash', 'date'): val = file_tag.getAttr(attribute) @@ -1940,13 +1963,41 @@ if file_desc_tag is not None: self.file_props['desc'] = file_desc_tag.getData() - mime_type = si.getAttr('mime-type') - if mime_type is not None: - self.file_props['mime-type'] = mime_type + if not self.jingle_content: + mime_type = si.getAttr('mime-type') + if mime_type is not None: + self.file_props['mime-type'] = mime_type self.file_props['receiver'] = self.conn._ft_get_our_jid() - self.file_props['sid'] = unicode(si.getAttr('id')) self.file_props['transfered_size'] = [] + if self.jingle_content: + self.FT_content.use_security = bool(self.jingle_content.getTag( + 'security')) + self.file_props['session-sid'] = unicode(self.stanza.getTag( + 'jingle').getAttr('sid')) + + self.FT_content.file_props = self.file_props + if not self.FT_content.transport: + self.FT_content.transport = JingleTransportSocks5() + self.FT_content.transport.set_our_jid( + self.FT_content.session.ourjid)

1 0

gajim: merge from trunk
by Yann Leboulanger 12 Apr '12

12 Apr '12

changeset 93f6e8ddbc2a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=93f6e8ddbc2a description: merge from trunk diffstat: ChangeLog | 3 +- README.html | 7 +- autogen.sh | 10 +- configure.ac | 4 +- data/gui/accounts_window.ui | 2 +- data/gui/advanced_configuration_window.ui | 58 +- data/gui/chat_control.ui | 2 +- data/gui/groupchat_control.ui | 2 +- data/gui/roster_window.ui | 2 +- data/sounds/attention.wav | Bin debian/README.Debian | 2 +- debian/changelog | 4 +- debian/control | 8 +- debian/copyright | 2 +- gajim.nsi | 138 +- plugins/dbus_plugin/plugin.py | 2 +- plugins/snarl_notifications/PySnarl.py | 772 ----- plugins/snarl_notifications/__init__.py | 1 - plugins/snarl_notifications/manifest.ini | 11 - plugins/snarl_notifications/plugin.py | 71 - po/POTFILES.skip | 3 - po/fr.po | 3623 +++++++++++++----------- po/ja.po | 3652 +++++++++++++----------- po/ru.po | 2264 ++++++++------- po/uk.po | 2600 +++++++++------- setup_win32.py | 2 +- src/adhoc_commands.py | 6 +- src/advanced_configuration_window.py | 57 +- src/atom_window.py | 2 +- src/cell_renderer_image.py | 2 +- src/chat_control.py | 197 +- src/command_system/implementation/standard.py | 24 +- src/common/atom.py | 2 +- src/common/caps_cache.py | 2 +- src/common/check_X509.py | 178 + src/common/check_paths.py | 2 +- src/common/commands.py | 20 +- src/common/config.py | 117 +- src/common/configpaths.py | 2 +- src/common/connection.py | 89 +- src/common/connection_handlers.py | 12 +- src/common/connection_handlers_events.py | 60 +- src/common/contacts.py | 2 +- src/common/dataforms.py | 2 +- src/common/dbus_support.py | 2 +- src/common/defs.py | 7 +- src/common/demandimport.py | 30 +- src/common/dh.py | 2 +- src/common/events.py | 4 +- src/common/exceptions.py | 2 +- src/common/fuzzyclock.py | 2 +- src/common/gajim.py | 12 +- src/common/ged.py | 6 + src/common/gnupg.py | 2 +- src/common/gpg.py | 2 +- src/common/helpers.py | 10 +- src/common/i18n.py | 2 +- src/common/jingle.py | 2 +- src/common/jingle_rtp.py | 79 +- src/common/jingle_transport.py | 32 +- src/common/latex.py | 19 +- src/common/location_listener.py | 2 +- src/common/logger.py | 51 +- src/common/optparser.py | 5 +- src/common/passwords.py | 4 +- src/common/pep.py | 2 +- src/common/protocol/bytestream.py | 2 +- src/common/proxy65_manager.py | 2 +- src/common/pubsub.py | 2 +- src/common/rst_xhtml_generator.py | 2 +- src/common/sleepy.py | 2 +- src/common/socks5.py | 2 +- src/common/stanza_session.py | 4 +- src/common/xmpp/auth_nb.py | 13 +- src/common/xmpp/client_nb.py | 1 + src/common/xmpp/protocol.py | 1 + src/common/xmpp/smacks.py | 2 + src/common/xmpp/stringprepare.py | 2 +- src/common/xmpp/tls_nb.py | 2 - src/common/zeroconf/client_zeroconf.py | 12 +- src/common/zeroconf/connection_zeroconf.py | 11 +- src/config.py | 25 +- src/conversation_textview.py | 8 +- src/dataforms_widget.py | 2 +- src/dialogs.py | 45 +- src/disco.py | 2 +- src/features_window.py | 21 +- src/filetransfers_window.py | 2 +- src/gajim-remote.py | 2 +- src/gajim.py | 14 +- src/gajim_themes_window.py | 2 +- src/groupchat_control.py | 12 +- src/groups.py | 2 +- src/gtkexcepthook.py | 2 +- src/gtkgui_helpers.py | 2 +- src/gui_interface.py | 17 +- src/gui_menu_builder.py | 7 +- src/history_manager.py | 2 +- src/history_window.py | 2 +- src/htmltextview.py | 2 +- src/ipython_view.py | 176 +- src/message_control.py | 2 +- src/message_textview.py | 2 +- src/message_window.py | 3 +- src/music_track_listener.py | 2 +- src/negotiation.py | 2 +- src/network_manager_listener.py | 2 +- src/notify.py | 33 +- src/plugins/pluginmanager.py | 5 +- src/profile_window.py | 2 +- src/remote_control.py | 4 +- src/roster_window.py | 315 +- src/search_window.py | 2 +- src/session.py | 6 +- src/statusicon.py | 2 +- src/tooltips.py | 7 +- src/upower_listener.py | 2 +- src/vcard.py | 14 +- 118 files changed, 8019 insertions(+), 7093 deletions(-) diffs (truncated from 33805 to 300 lines): diff -r 17e362df3348 -r 93f6e8ddbc2a ChangeLog --- a/ChangeLog Sat Apr 07 23:12:15 2012 -0400 +++ b/ChangeLog Thu Apr 12 22:07:30 2012 +0200 @@ -1,4 +1,4 @@ -Gajim 0.15 (XX XX 2011) +Gajim 0.15 (18 March 2012) * Plugin system * Whiteboard (via a plugin) @@ -9,6 +9,7 @@ * Roster filtrering * UPower support * GPG support for windows + * Spell checking support for windows Gajim 0.14.4 (22 July 2011) diff -r 17e362df3348 -r 93f6e8ddbc2a README.html --- a/README.html Sat Apr 07 23:12:15 2012 -0400 +++ b/README.html Thu Apr 12 22:07:30 2012 +0200 @@ -15,12 +15,13 @@ <h2>Runtime Requirements</h2> <ul> <li>python2.5 or higher</li> -<li>pygtk2.16 or higher</li> +<li>pygtk2.22 or higher</li> </ul> <h2>Optional Runtime Requirements</h2> <ul> -<li><a href="http://pyopenssl.sourceforge.net/">PyOpenSSL</a> (python-pyopenssl package in Debian) (>=0.9) for <em>secure</em> SSL/TLS. Python's default SSL is insecure, so this package is highly recommended!</li> +<li><a href="http://pyopenssl.sourceforge.net/">PyOpenSSL</a> (python-pyopenssl package in Debian) (>=0.12) for <em>secure</em> SSL/TLS. Python's default SSL is insecure, so this package is highly recommended!</li> +<li>python-pyasn1 to check SSL/TLS certificate</li> <li>python-crypto to enable End to end encryption</li> <li>For idle module, libxss library</li> <li>For zeroconf (bonjour), the "enable link-local messaging" checkbox, you need dbus-glib, python-avahi</li> @@ -111,7 +112,7 @@ <br/> <br/> <br/> -(C) 2003-2011<br/> +(C) 2003-2012<br/> The Gajim Team<br/> http://gajim.org<br/> <br/> diff -r 17e362df3348 -r 93f6e8ddbc2a autogen.sh --- a/autogen.sh Sat Apr 07 23:12:15 2012 -0400 +++ b/autogen.sh Thu Apr 12 22:07:30 2012 +0200 @@ -1,5 +1,5 @@ #!/usr/bin/env bash - gajimversion="0.15-beta2" + gajimversion="0.15" if [ -d ".hg" ]; then node=$(hg tip --template "{node}") hgversion="-${node:0:12}" @@ -20,8 +20,12 @@ && for p in `ls data/gui/*.ui`; do echo "[type: gettext/glade]$p" >> \ po/POTFILES.in; done \ && ls -1 data/gajim.desktop.in.in \ - src/*py src/common/*py src/common/zeroconf/*.py src/plugins/*.py| grep -v ipython_view.py >> \ - po/POTFILES.in || exit 1 + src/*.py src/common/*.py src/command_system/implementation/*.py src/common/zeroconf/*.py src/plugins/*.py | grep -v ipython_view.py >> \ + po/POTFILES.in \ + && echo -e "data/gajim.desktop.in\nsrc/ipython_view.py" > po/POTFILES.skip || exit 1 + if [ $(find plugins/ -name '*.py' | wc -l) -gt 0 ];then + ls -1 plugins/*/*.py plugins/*/*.ui >> po/POTFILES.skip + fi if test -z `which pkg-config 2>/dev/null`;then echo "***Error: pkg-config not found***" echo "See README.html for build requirements." diff -r 17e362df3348 -r 93f6e8ddbc2a configure.ac --- a/configure.ac Sat Apr 07 23:12:15 2012 -0400 +++ b/configure.ac Thu Apr 12 22:07:30 2012 +0200 @@ -47,11 +47,11 @@ instead of DATADIR/gajim/src.])] , AC_SUBST([gajim_srcdir], [\${pkgpythondir}]) -AC_SUBST([gajim_pluginsdir], [\${pkgpythondir}]) , AC_SUBST([gajim_srcdir], [\${datadir}/\${PACKAGE}/src]) +) + AC_SUBST([gajim_pluginsdir], [\${datadir}/\${PACKAGE}/plugins]) -) AS_AC_EXPAND(GAJIM_SRCDIR, "${gajim_srcdir}") AS_AC_EXPAND(PKGDATADIR, "${datadir}/${PACKAGE}") diff -r 17e362df3348 -r 93f6e8ddbc2a data/gui/accounts_window.ui --- a/data/gui/accounts_window.ui Sat Apr 07 23:12:15 2012 -0400 +++ b/data/gui/accounts_window.ui Thu Apr 12 22:07:30 2012 +0200 @@ -308,7 +308,7 @@ <property name="homogeneous">True</property> <child> <object class="GtkButton" id="synchronise_contacts_button1"> - <property name="label" translatable="yes">Synchronise contacts</property> + <property name="label" translatable="yes">Synchronize contacts</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> diff -r 17e362df3348 -r 93f6e8ddbc2a data/gui/advanced_configuration_window.ui --- a/data/gui/advanced_configuration_window.ui Sat Apr 07 23:12:15 2012 -0400 +++ b/data/gui/advanced_configuration_window.ui Thu Apr 12 22:07:30 2012 +0200 @@ -1,24 +1,25 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <interface> <requires lib="gtk+" version="2.16"/> -  <object class="GtkWindow" id="advanced_configuration_window"> + <property name="can_focus">False</property> <property name="border_width">6</property> <property name="title" translatable="yes">Advanced Configuration Editor</property> <property name="role">ace</property> <property name="default_width">650</property> <property name="default_height">540</property> <property name="type_hint">dialog</property> - <signal name="destroy" handler="on_advanced_configuration_window_destroy"/> + <signal name="destroy" handler="on_advanced_configuration_window_destroy" swapped="no"/> <child> <object class="GtkVBox" id="vbox70"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkTable" id="table26"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="n_rows">2</property> <property name="n_columns">2</property> <property name="column_spacing">12</property> @@ -26,6 +27,7 @@ <child> <object class="GtkLabel" id="label248"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Filter:</property> </object> @@ -38,7 +40,7 @@ <object class="GtkEntry" id="advanced_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - <signal name="changed" handler="on_advanced_entry_changed"/> + <signal name="changed" handler="on_advanced_entry_changed" swapped="no"/> </object> <packing> <property name="left_attach">1</property> @@ -51,14 +53,16 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="hscrollbar_policy">never</property> - <property name="vscrollbar_policy">automatic</property> <property name="shadow_type">in</property> <child> <object class="GtkTreeView" id="advanced_treeview"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="rules_hint">True</property> - <signal name="row_activated" handler="on_advanced_treeview_row_activated"/> + <signal name="row-activated" handler="on_advanced_treeview_row_activated" swapped="no"/> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection1"/> + </child> </object> </child> </object> @@ -71,23 +75,28 @@ </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkFrame" id="frame36"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="border_width">3</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> <object class="GtkAlignment" id="alignment90"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="border_width">6</property> <property name="left_padding">12</property> <child> <object class="GtkLabel" id="advanced_desc_label"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="wrap">True</property> </object> @@ -97,6 +106,7 @@ <child type="label"> <object class="GtkLabel" id="label357"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes"><b>Description</b></property> <property name="use_markup">True</property> </object> @@ -104,11 +114,13 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkLabel" id="restart_label"> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes"><b>NOTE:</b> You should restart Gajim for some settings to take effect</property> <property name="use_markup">True</property> @@ -123,27 +135,50 @@ <child> <object class="GtkHButtonBox" id="hbuttonbox18"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="spacing">6</property> <property name="layout_style">end</property> <child> + <object class="GtkButton" id="reset_button"> + <property name="label" translatable="yes">_Reset to default</property> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_action_appearance">False</property> + <property name="image">image1</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="on_reset_button_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> <object class="GtkButton" id="advanced_close_button"> <property name="label">gtk-close</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> <property name="use_stock">True</property> - <signal name="clicked" handler="on_advanced_close_button_clicked"/> + <signal name="clicked" handler="on_advanced_close_button_clicked" swapped="no"/> </object> <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="padding">6</property> <property name="position">3</property> </packing> @@ -151,4 +186,9 @@ </object> </child> </object> + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-undo</property> + </object> </interface> diff -r 17e362df3348 -r 93f6e8ddbc2a data/gui/chat_control.ui --- a/data/gui/chat_control.ui Sat Apr 07 23:12:15 2012 -0400 +++ b/data/gui/chat_control.ui Thu Apr 12 22:07:30 2012 +0200 @@ -60,7 +60,7 @@ <object class="GtkLabel" id="banner_label"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">label</property> + <property name="label">label</property> <property name="use_markup">True</property> <property name="selectable">True</property> <signal name="populate_popup" handler="on_banner_label_populate_popup"/> diff -r 17e362df3348 -r 93f6e8ddbc2a data/gui/groupchat_control.ui --- a/data/gui/groupchat_control.ui Sat Apr 07 23:12:15 2012 -0400 +++ b/data/gui/groupchat_control.ui Thu Apr 12 22:07:30 2012 +0200 @@ -54,7 +54,7 @@ <object class="GtkLabel" id="banner_label"> <property name="visible">True</property>

1 0

gajim: fix a loop. Fixes #7142
by Yann Leboulanger 12 Apr '12

12 Apr '12

changeset f6f78f3802c0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f6f78f3802c0 description: fix a loop. Fixes #7142 diffstat: src/common/latex.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (19 lines): diff -r ab4f06e5e024 -r f6f78f3802c0 src/common/latex.py --- a/src/common/latex.py Wed Apr 11 21:30:05 2012 +0200 +++ b/src/common/latex.py Thu Apr 12 07:17:50 2012 +0200 @@ -59,6 +59,7 @@ def get_tmpfile_name(): random.seed() + nb = 0 while(nb < 100): int_ = random.randint(0, 10000) filename = os.path.join(gettempdir(), 'gajimtex_' + int_.__str__()) @@ -71,6 +72,7 @@ break if ok: return filename + nb += 1 return filename def write_latex(filename, str_):

1 0

gajim: fix usage of get_per(). Fixes #7140
by Yann Leboulanger 11 Apr '12

11 Apr '12

changeset ab4f06e5e024 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ab4f06e5e024 description: fix usage of get_per(). Fixes #7140 diffstat: src/common/connection.py | 2 +- src/common/helpers.py | 2 +- src/config.py | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diffs (46 lines): diff -r bac8e353d25c -r ab4f06e5e024 src/common/connection.py --- a/src/common/connection.py Tue Apr 10 17:25:32 2012 +0200 +++ b/src/common/connection.py Wed Apr 11 21:30:05 2012 +0200 @@ -1024,7 +1024,7 @@ proxy = {} proxyptr = gajim.config.get_per('proxies', p) for key in proxyptr.keys(): - proxy[key] = proxyptr[key][1] + proxy[key] = proxyptr[key] else: proxy = None use_srv = True diff -r bac8e353d25c -r ab4f06e5e024 src/common/helpers.py --- a/src/common/helpers.py Tue Apr 10 17:25:32 2012 +0200 +++ b/src/common/helpers.py Wed Apr 11 21:30:05 2012 +0200 @@ -1435,7 +1435,7 @@ if not proxyptr: return proxy for key in proxyptr.keys(): - proxy[key] = proxyptr[key][1] + proxy[key] = proxyptr[key] return proxy def _get_img_direct(attrs): diff -r bac8e353d25c -r ab4f06e5e024 src/config.py --- a/src/config.py Tue Apr 10 17:25:32 2012 +0200 +++ b/src/config.py Wed Apr 11 21:30:05 2012 +0200 @@ -1485,8 +1485,7 @@ gajim.config.del_per('proxies', old_name) gajim.config.add_per('proxies', new_name) for option in config: - gajim.config.set_per('proxies', new_name, option, - config[option][common.config.OPT_VAL]) + gajim.config.set_per('proxies', new_name, option, config[option]) model.set_value(iter_, 0, new_name) def on_proxytype_combobox_changed(self, widget): @@ -2116,7 +2115,7 @@ gajim.config.add_per('accounts', new_name) old_config = gajim.config.get_per('accounts', old_name) for opt in old_config: - gajim.config.set_per('accounts', new_name, opt, old_config[opt][1]) + gajim.config.set_per('accounts', new_name, opt, old_config[opt]) gajim.config.del_per('accounts', old_name) if self.current_account == old_name: self.current_account = new_name

1 0

gajim: improve temp file search when using latex to prevent over...
by Yann Leboulanger 10 Apr '12

10 Apr '12

changeset bac8e353d25c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=bac8e353d25c description: improve temp file search when using latex to prevent overwriting files diffstat: src/common/latex.py | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diffs (25 lines): diff -r a360737332cd -r bac8e353d25c src/common/latex.py --- a/src/common/latex.py Wed Apr 04 15:11:20 2012 +0200 +++ b/src/common/latex.py Tue Apr 10 17:25:32 2012 +0200 @@ -59,8 +59,19 @@ def get_tmpfile_name(): random.seed() - int_ = random.randint(0, 100) - return os.path.join(gettempdir(), 'gajimtex_' + int_.__str__()) + while(nb < 100): + int_ = random.randint(0, 10000) + filename = os.path.join(gettempdir(), 'gajimtex_' + int_.__str__()) + # Check if a file to not overwrite it + ok = True + extensions = ['.tex', '.log', '.aux', '.dvi'] + for ext in extensions: + if os.path.exists(filename + ext): + ok = False + break + if ok: + return filename + return filename def write_latex(filename, str_): texstr = '\\documentclass[12pt]{article}\\usepackage[dvips]{graphicx}'

1 0

gajim: improve tooltip code a little bit
by Yann Leboulanger 10 Apr '12

10 Apr '12

changeset a360737332cd in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a360737332cd description: improve tooltip code a little bit diffstat: src/roster_window.py | 119 ++++++++++++++++++++++++++------------------------ 1 files changed, 61 insertions(+), 58 deletions(-) diffs (151 lines): diff -r a86f481b6a6b -r a360737332cd src/roster_window.py --- a/src/roster_window.py Tue Apr 10 00:04:19 2012 +0200 +++ b/src/roster_window.py Wed Apr 04 15:11:20 2012 +0200 @@ -2768,9 +2768,9 @@ return if model[titer][C_TYPE] in ('contact', 'self_contact'): # we're on a contact entry in the roster - account = model[titer][C_ACCOUNT].decode('utf-8') - jid = model[titer][C_JID].decode('utf-8') if self.tooltip.timeout == 0 or self.tooltip.id != props[0]: + account = model[titer][C_ACCOUNT].decode('utf-8') + jid = model[titer][C_JID].decode('utf-8') self.tooltip.id = row contacts = gajim.contacts.get_contacts(account, jid) connected_contacts = [] @@ -2782,76 +2782,79 @@ connected_contacts = contacts self.tooltip.account = account self.tooltip.timeout = gobject.timeout_add(500, - self.show_tooltip, connected_contacts) + self.show_tooltip, connected_contacts) elif model[titer][C_TYPE] == 'groupchat': - account = model[titer][C_ACCOUNT].decode('utf-8') - jid = model[titer][C_JID].decode('utf-8') if self.tooltip.timeout == 0 or self.tooltip.id != props[0]: + account = model[titer][C_ACCOUNT].decode('utf-8') + jid = model[titer][C_JID].decode('utf-8') self.tooltip.id = row contact = gajim.contacts.get_contacts(account, jid) self.tooltip.account = account self.tooltip.timeout = gobject.timeout_add(500, - self.show_tooltip, contact) + self.show_tooltip, contact) elif model[titer][C_TYPE] == 'account': # we're on an account entry in the roster - account = model[titer][C_ACCOUNT].decode('utf-8') - if account == 'all': - if self.tooltip.timeout == 0 or self.tooltip.id != props[0]: + if self.tooltip.timeout == 0 or self.tooltip.id != props[0]: + account = model[titer][C_ACCOUNT].decode('utf-8') + if account == 'all': self.tooltip.id = row self.tooltip.account = None self.tooltip.timeout = gobject.timeout_add(500, - self.show_tooltip, []) - return - jid = gajim.get_jid_from_account(account) - contacts = [] - connection = gajim.connections[account] - # get our current contact info - - nbr_on, nbr_total = gajim.contacts.get_nb_online_total_contacts( - accounts = [account]) - account_name = account - if gajim.account_is_connected(account): - account_name += ' (%s/%s)' % (repr(nbr_on), repr(nbr_total)) - contact = gajim.contacts.create_self_contact(jid=jid, - account=account, name=account_name, - show=connection.get_status(), status=connection.status, - resource=connection.server_resource, - priority=connection.priority) - if gajim.connections[account].gpg: - contact.keyID = gajim.config.get_per('accounts', - connection.name, 'keyid') - contacts.append(contact) - # if we're online ... - if connection.connection: - roster = connection.connection.getRoster() - # in threadless connection when no roster stanza is sent, - # 'roster' is None - if roster and roster.getItem(jid): - resources = roster.getResources(jid) - # ...get the contact info for our other online resources - for resource in resources: - # Check if we already have this resource - found = False - for contact_ in contacts: - if contact_.resource == resource: - found = True - break - if found: - continue - show = roster.getShow(jid+'/'+resource) - if not show: - show = 'online' - contact = gajim.contacts.create_self_contact( - jid=jid, account=account, show=show, - status=roster.getStatus(jid + '/' + resource), - priority=roster.getPriority( - jid + '/' + resource), resource=resource) - contacts.append(contact) - if self.tooltip.timeout == 0 or self.tooltip.id != props[0]: + self.show_tooltip, []) + return + jid = gajim.get_jid_from_account(account) + contacts = [] + connection = gajim.connections[account] + # get our current contact info + + nbr_on, nbr_total = gajim.\ + contacts.get_nb_online_total_contacts( + accounts=[account]) + account_name = account + if gajim.account_is_connected(account): + account_name += ' (%s/%s)' % (repr(nbr_on), + repr(nbr_total)) + contact = gajim.contacts.create_self_contact(jid=jid, + account=account, name=account_name, + show=connection.get_status(), status=connection.status, + resource=connection.server_resource, + priority=connection.priority) + if gajim.connections[account].gpg: + contact.keyID = gajim.config.get_per('accounts', + connection.name, 'keyid') + contacts.append(contact) + # if we're online ... + if connection.connection: + roster = connection.connection.getRoster() + # in threadless connection when no roster stanza is sent + # 'roster' is None + if roster and roster.getItem(jid): + resources = roster.getResources(jid) + # ...get the contact info for our other online + # resources + for resource in resources: + # Check if we already have this resource + found = False + for contact_ in contacts: + if contact_.resource == resource: + found = True + break + if found: + continue + show = roster.getShow(jid+'/'+resource) + if not show: + show = 'online' + contact = gajim.contacts.create_self_contact( + jid=jid, account=account, show=show, + status=roster.getStatus( + jid + '/' + resource), + priority=roster.getPriority( + jid + '/' + resource), resource=resource) + contacts.append(contact) self.tooltip.id = row self.tooltip.account = None self.tooltip.timeout = gobject.timeout_add(500, - self.show_tooltip, contacts) + self.show_tooltip, contacts) def on_agent_logging(self, widget, jid, state, account): """

1 0

gajim: ability to press ctrl+shift+u to enable rosterfilter. Fix...
by Yann Leboulanger 09 Apr '12

09 Apr '12

changeset a86f481b6a6b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a86f481b6a6b description: ability to press ctrl+shift+u to enable rosterfilter. Fixes #7139 diffstat: src/roster_window.py | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diffs (24 lines): diff -r 4afcbe72821f -r a86f481b6a6b src/roster_window.py --- a/src/roster_window.py Mon Apr 09 23:22:53 2012 +0200 +++ b/src/roster_window.py Tue Apr 10 00:04:19 2012 +0200 @@ -3418,6 +3418,10 @@ num = gtk.gdk.keyval_to_unicode(event.keyval) self.enable_rfilter(unichr(num)) + elif event.state & gtk.gdk.CONTROL_MASK and event.state & gtk.gdk.SHIFT_MASK and event.keyval == gtk.keysyms.U: + self.enable_rfilter('') + self.rfilter_entry.emit('key_press_event', event) + elif event.keyval == gtk.keysyms.Left: treeselection = self.tree.get_selection() model, list_of_paths = treeselection.get_selected_rows() @@ -4325,6 +4329,9 @@ elif event.keyval in (gtk.keysyms.Up, gtk.keysyms.Down): self.tree.grab_focus() self.tree.emit('key_press_event', event) + elif event.keyval == gtk.keysyms.BackSpace: + if widget.get_text() == '': + self.disable_rfilter() def enable_rfilter(self, search_string): if self.rfilter_enabled:

1 0

gajim: handle right / left to expand / collapse rows in treeview...
by Yann Leboulanger 09 Apr '12

09 Apr '12

changeset 4afcbe72821f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4afcbe72821f description: handle right / left to expand / collapse rows in treeview. Fixes #7138 diffstat: src/roster_window.py | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diffs (31 lines): diff -r fbc0211b84da -r 4afcbe72821f src/roster_window.py --- a/src/roster_window.py Mon Apr 09 21:57:51 2012 +0200 +++ b/src/roster_window.py Mon Apr 09 23:22:53 2012 +0200 @@ -3418,6 +3418,27 @@ num = gtk.gdk.keyval_to_unicode(event.keyval) self.enable_rfilter(unichr(num)) + elif event.keyval == gtk.keysyms.Left: + treeselection = self.tree.get_selection() + model, list_of_paths = treeselection.get_selected_rows() + if len(list_of_paths) != 1: + return + path = list_of_paths[0] + iter_ = model.get_iter(path) + if model.iter_has_child(iter_): + self.tree.collapse_row(path) + return True + elif event.keyval == gtk.keysyms.Right: + treeselection = self.tree.get_selection() + model, list_of_paths = treeselection.get_selected_rows() + if len(list_of_paths) != 1: + return + path = list_of_paths[0] + iter_ = model.get_iter(path) + if model.iter_has_child(iter_): + self.tree.expand_row(path, False) + return True + def on_roster_treeview_button_release_event(self, widget, event): try: path = self.tree.get_path_at_pos(int(event.x), int(event.y))[0]

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits