Commits July 2010

commits@gajim.org

7 participants
83 discussions

gajim: use nec / ged to handle time, version and last received e...
by Yann Leboulanger 20 Jul '10

20 Jul '10

changeset 15842e7b3a0c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=15842e7b3a0c description: use nec / ged to handle time, version and last received event diffstat: src/common/connection_handlers.py | 238 +++++++++++++++++++++++-------------- src/gui_interface.py | 55 +------- src/remote_control.py | 20 +++ src/vcard.py | 30 +++- 4 files changed, 198 insertions(+), 145 deletions(-) diffs (truncated from 498 to 300 lines): diff -r be6a772cc4aa -r 15842e7b3a0c src/common/connection_handlers.py --- a/src/common/connection_handlers.py Tue Jul 20 10:35:38 2010 +0200 +++ b/src/common/connection_handlers.py Tue Jul 20 16:53:07 2010 +0200 @@ -815,33 +815,16 @@ def _ErrorCB(self, con, iq_obj): log.debug('ErrorCB') - jid_from = helpers.get_full_jid_from_iq(iq_obj) - jid_stripped, resource = gajim.get_room_and_nick_from_fjid(jid_from) id_ = unicode(iq_obj.getID()) if id_ in self.last_ids: - self.dispatch('LAST_STATUS_TIME', (jid_stripped, resource, -1, '')) - self.last_ids.remove(id_) - return + gajim.nec.push_incoming_event(LastResultReceivedEvent(None, + conn=self, iq_obj=iq_obj)) + return True def _LastResultCB(self, con, iq_obj): log.debug('LastResultCB') - qp = iq_obj.getTag('query') - seconds = qp.getAttr('seconds') - status = qp.getData() - try: - seconds = int(seconds) - except Exception: - return - id_ = iq_obj.getID() - if id_ in self.groupchat_jids: - who = self.groupchat_jids[id_] - 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)) + gajim.nec.push_incoming_event(LastResultReceivedEvent(None, conn=self, + iq_obj=iq_obj)) def get_sessions(self, jid): """ @@ -1043,18 +1026,18 @@ def _ErrorCB(self, con, iq_obj): log.debug('ErrorCB') - ConnectionHandlersBase._ErrorCB(self, con, iq_obj) - jid_from = helpers.get_full_jid_from_iq(iq_obj) - jid_stripped, resource = gajim.get_room_and_nick_from_fjid(jid_from) + if ConnectionHandlersBase._ErrorCB(self, con, iq_obj): + return id_ = unicode(iq_obj.getID()) if id_ in self.version_ids: - self.dispatch('OS_INFO', (jid_stripped, resource, '', '')) - self.version_ids.remove(id_) + gajim.nec.push_incoming_event(VersionResultReceivedEvent(None, + conn=self, iq_obj=iq_obj)) return if id_ in self.entity_time_ids: - self.dispatch('ENTITY_TIME', (jid_stripped, resource, '')) - self.entity_time_ids.remove(id_) + gajim.nec.push_incoming_event(LastResultReceivedEvent(None, + conn=self, iq_obj=iq_obj)) return + jid_from = helpers.get_full_jid_from_iq(iq_obj) errmsg = iq_obj.getErrorMsg() errcode = iq_obj.getErrorCode() self.dispatch('ERROR_ANSWER', (id_, jid_from, errmsg, errcode)) @@ -1220,25 +1203,8 @@ def _VersionResultCB(self, con, iq_obj): log.debug('VersionResultCB') - client_info = '' - os_info = '' - qp = iq_obj.getTag('query') - if qp.getTag('name'): - client_info += qp.getTag('name').getData() - if qp.getTag('version'): - client_info += ' ' + qp.getTag('version').getData() - if qp.getTag('os'): - os_info += qp.getTag('os').getData() - id_ = iq_obj.getID() - if id_ in self.groupchat_jids: - who = self.groupchat_jids[id_] - del self.groupchat_jids[id_] - 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)) + gajim.nec.push_incoming_event(VersionResultReceivedEvent(None, + conn=self, iq_obj=iq_obj)) def _TimeCB(self, con, iq_obj): log.debug('TimeCB') @@ -1270,50 +1236,8 @@ def _TimeRevisedResultCB(self, con, iq_obj): log.debug('TimeRevisedResultCB') - time_info = '' - qp = iq_obj.getTag('time') - if not qp: - # wrong answer - return - tzo = qp.getTag('tzo').getData() - if tzo.lower() == 'z': - tzo = '0:0' - tzoh, tzom = tzo.split(':') - utc_time = qp.getTag('utc').getData() - ZERO = datetime.timedelta(0) - class UTC(datetime.tzinfo): - def utcoffset(self, dt): - return ZERO - def tzname(self, dt): - return "UTC" - def dst(self, dt): - return ZERO - - class contact_tz(datetime.tzinfo): - def utcoffset(self, dt): - return datetime.timedelta(hours=int(tzoh), minutes=int(tzom)) - def tzname(self, dt): - return "remote timezone" - def dst(self, dt): - return ZERO - - try: - t = datetime.datetime.strptime(utc_time, '%Y-%m-%dT%H:%M:%SZ') - t = t.replace(tzinfo=UTC()) - time_info = t.astimezone(contact_tz()).strftime('%c') - except ValueError, e: - log.info('Wrong time format: %s' % str(e)) - - id_ = iq_obj.getID() - if id_ in self.groupchat_jids: - who = self.groupchat_jids[id_] - del self.groupchat_jids[id_] - 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.entity_time_ids: - self.entity_time_ids.remove(id_) - self.dispatch('ENTITY_TIME', (jid_stripped, resource, time_info)) + gajim.nec.push_incoming_event(TimeResultReceivedEvent(None, + conn=self, iq_obj=iq_obj)) def _gMailNewMailCB(self, con, gm): """ @@ -2466,6 +2390,18 @@ con.RegisterHandler('message', self._StanzaArrivedCB) con.RegisterHandler('unknown', self._StreamCB, 'urn:ietf:params:xml:ns:xmpp-streams', xmlns='http://etherx.jabber.org/streams') +class HelperEvent: + def get_jid_resource(self): + if self.id_ in self.conn.groupchat_jids: + who = self.conn.groupchat_jids[self.id_] + del self.conn.groupchat_jids[self.id_] + else: + who = helpers.get_full_jid_from_iq(self.iq_obj) + self.jid, self.resource = gajim.get_room_and_nick_from_fjid(who) + + def get_id(self): + self.id_ = self.iq_obj.getID() + class HttpAuthReceivedEvent(nec.NetworkIncomingEvent): name = 'http-auth-received' base_network_events = [] @@ -2483,3 +2419,121 @@ # In case it's a message with a body self.msg = self.iq_obj.getTagData('body') return True + +class LastResultReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): + name = 'last-result-received' + base_network_events = [] + + def generate(self): + if not self.conn: + self.conn = self.base_event.conn + if not self.iq_obj: + self.iq_obj = self.base_event.xmpp_iq + + self.get_id() + self.get_jid_resource() + if self.id_ in self.conn.last_ids: + self.conn.last_ids.remove(self.id_) + + self.status = '' + self.seconds = -1 + + if self.iq_obj.getType() == 'error': + return True + + qp = self.iq_obj.getTag('query') + sec = qp.getAttr('seconds') + self.status = qp.getData() + try: + self.seconds = int(sec) + except Exception: + return + + return True + +class VersionResultReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): + name = 'version-result-received' + base_network_events = [] + + def generate(self): + if not self.conn: + self.conn = self.base_event.conn + if not self.iq_obj: + self.iq_obj = self.base_event.xmpp_iq + + self.get_id() + self.get_jid_resource() + if self.id_ in self.conn.version_ids: + self.conn.version_ids.remove(self.id_) + + self.client_info = '' + self.os_info = '' + + if self.iq_obj.getType() == 'error': + return True + + qp = self.iq_obj.getTag('query') + if qp.getTag('name'): + self.client_info += qp.getTag('name').getData() + if qp.getTag('version'): + self.client_info += ' ' + qp.getTag('version').getData() + if qp.getTag('os'): + self.os_info += qp.getTag('os').getData() + + return True + +class TimeResultReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): + name = 'version-result-received' + base_network_events = [] + + def generate(self): + if not self.conn: + self.conn = self.base_event.conn + if not self.iq_obj: + self.iq_obj = self.base_event.xmpp_iq + + self.get_id() + self.get_jid_resource() + if self.id_ in self.conn.entity_time_ids: + self.conn.entity_time_ids.remove(self.id_) + + self.time_info = '' + + if self.iq_obj.getType() == 'error': + return True + + qp = self.iq_obj.getTag('time') + if not qp: + # wrong answer + return + tzo = qp.getTag('tzo').getData() + if tzo.lower() == 'z': + tzo = '0:0' + tzoh, tzom = tzo.split(':') + utc_time = qp.getTag('utc').getData() + ZERO = datetime.timedelta(0) + class UTC(datetime.tzinfo): + def utcoffset(self, dt): + return ZERO + def tzname(self, dt): + return "UTC" + def dst(self, dt): + return ZERO + + class contact_tz(datetime.tzinfo): + def utcoffset(self, dt): + return datetime.timedelta(hours=int(tzoh), minutes=int(tzom)) + def tzname(self, dt): + return "remote timezone" + def dst(self, dt): + return ZERO + + try: + t = datetime.datetime.strptime(utc_time, '%Y-%m-%dT%H:%M:%SZ') + t = t.replace(tzinfo=UTC()) + self.time_info = t.astimezone(contact_tz()).strftime('%c') + except ValueError, e: + log.info('Wrong time format: %s' % str(e)) + return + + return True diff -r be6a772cc4aa -r 15842e7b3a0c src/gui_interface.py --- a/src/gui_interface.py Tue Jul 20 10:35:38 2010 +0200 +++ b/src/gui_interface.py Tue Jul 20 16:53:07 2010 +0200 @@ -825,57 +825,24 @@ if self.remote_ctrl: self.remote_ctrl.raise_signal('VcardInfo', (account, vcard)) - def handle_event_last_status_time(self, account, array): + def handle_event_last_status_time(self, obj): # ('LAST_STATUS_TIME', account, (jid, resource, seconds, status))

1 0

gajim: use Network Event Dispatcher in connection_handler to han...
by Yann Leboulanger 20 Jul '10

20 Jul '10

changeset be6a772cc4aa in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=be6a772cc4aa description: use Network Event Dispatcher in connection_handler to handle HttpAuth events. diffstat: src/common/connection_handlers.py | 44 +++++++++++++++++++++++++------- src/common/ged.py | 6 +++- src/common/nec.py | 52 +++++++++++++++++++------------------- src/gui_interface.py | 31 ++++++++++++----------- 4 files changed, 81 insertions(+), 52 deletions(-) diffs (253 lines): diff -r af67a464c402 -r be6a772cc4aa src/common/connection_handlers.py --- a/src/common/connection_handlers.py Mon Jul 19 19:53:29 2010 +0200 +++ b/src/common/connection_handlers.py Tue Jul 20 10:35:38 2010 +0200 @@ -41,6 +41,7 @@ import datetime import common.xmpp +import common.caps_cache as capscache from common import helpers from common import gajim @@ -50,8 +51,10 @@ from common.pep import ConnectionPEP from common.protocol.caps import ConnectionCaps from common.protocol.bytestream import ConnectionSocks5Bytestream -import common.caps_cache as capscache +from common import ged +from common import nec from common.nec import NetworkEvent +from plugins import GajimPlugin if gajim.HAVE_FARSIGHT: from common.jingle import ConnectionJingle else: @@ -1008,6 +1011,9 @@ self.gmail_last_tid = None self.gmail_last_time = None + gajim.ged.register_event_handler('http-auth-received', ged.CORE, + self._nec_http_auth_received) + def build_http_auth_answer(self, iq_obj, answer): if not self.connection or self.connected < 2: return @@ -1022,17 +1028,17 @@ common.xmpp.protocol.ERR_NOT_AUTHORIZED) self.connection.send(err) + def _nec_http_auth_received(self, obj): + if obj.conn.name != self.name: + return + if obj.opt in ('yes', 'no'): + obj.conn.build_http_auth_answer(obj.iq_obj, obj.opt) + return True + def _HttpAuthCB(self, con, iq_obj): log.debug('HttpAuthCB') - opt = gajim.config.get_per('accounts', self.name, 'http_auth') - if opt in ('yes', 'no'): - self.build_http_auth_answer(iq_obj, opt) - else: - id_ = iq_obj.getTagAttr('confirm', 'id') - method = iq_obj.getTagAttr('confirm', 'method') - url = iq_obj.getTagAttr('confirm', 'url') - msg = iq_obj.getTagData('body') # In case it's a message with a body - self.dispatch('HTTP_AUTH', (method, url, id_, iq_obj, msg)) + gajim.nec.push_incoming_event(HttpAuthReceivedEvent(None, conn=self, + iq_obj=iq_obj)) raise common.xmpp.NodeProcessed def _ErrorCB(self, con, iq_obj): @@ -2459,3 +2465,21 @@ con.RegisterHandler('presence', self._StanzaArrivedCB) con.RegisterHandler('message', self._StanzaArrivedCB) con.RegisterHandler('unknown', self._StreamCB, 'urn:ietf:params:xml:ns:xmpp-streams', xmlns='http://etherx.jabber.org/streams') + +class HttpAuthReceivedEvent(nec.NetworkIncomingEvent): + name = 'http-auth-received' + base_network_events = [] + + def generate(self): + if not self.conn: + self.conn = self.base_event.conn + if not self.iq_obj: + self.iq_obj = self.base_event.xmpp_iq + + self.opt = gajim.config.get_per('accounts', self.conn.name, 'http_auth') + self.iq_id = self.iq_obj.getTagAttr('confirm', 'id') + self.method = self.iq_obj.getTagAttr('confirm', 'method') + self.url = self.iq_obj.getTagAttr('confirm', 'url') + # In case it's a message with a body + self.msg = self.iq_obj.getTagData('body') + return True diff -r af67a464c402 -r be6a772cc4aa src/common/ged.py --- a/src/common/ged.py Mon Jul 19 19:53:29 2010 +0200 +++ b/src/common/ged.py Tue Jul 20 10:35:38 2010 +0200 @@ -30,6 +30,9 @@ PRECORE = 30 CORE = 40 POSTCORE = 50 +GUI1 = 60 +GUI2 = 70 +POSTGUI = 80 class GlobalEventsDispatcher(object): @@ -61,4 +64,5 @@ log.debug('%s\nArgs: %s'%(event_name, str(args))) if event_name in self.handlers: for priority, handler in self.handlers[event_name]: - handler(*args, **kwargs) + if handler(*args, **kwargs): + return diff -r af67a464c402 -r be6a772cc4aa src/common/nec.py --- a/src/common/nec.py Mon Jul 19 19:53:29 2010 +0200 +++ b/src/common/nec.py Tue Jul 20 10:35:38 2010 +0200 @@ -41,7 +41,9 @@ def register_incoming_event(self, event_class): for base_event_name in event_class.base_network_events: - self.incoming_events_generators.setdefault(base_event_name, []).append(event_class) + event_list = self.incoming_events_generators.setdefault(base_event_name, []) + if not event_class in event_list: + event_list.append(event_class) def unregister_incoming_event(self, event_class): for base_event_name in event_class.base_network_events: @@ -55,8 +57,9 @@ pass def push_incoming_event(self, event_object): - if self._generate_events_based_on_incoming_event(event_object): - gajim.ged.raise_event(event_object.name, event_object) + if event_object.generate(): + if self._generate_events_based_on_incoming_event(event_object): + gajim.ged.raise_event(event_object.name, event_object) def push_outgoing_event(self, event_object): pass @@ -93,25 +96,7 @@ def init(self): pass - def _set_kwargs_as_attributes(self, **kwargs): - for k, v in kwargs.iteritems(): - setattr(self, k, v) - - def __str__(self): - return '<NetworkEvent object> Attributes: %s'%(pformat(self.__dict__)) - - def __repr__(self): - return '<NetworkEvent object> Attributes: %s'%(pformat(self.__dict__)) - -class NetworkIncomingEvent(NetworkEvent): - base_network_events = [] - ''' - Names of base network events that new event is going to be generated on. - ''' - - def init(self): - pass - + def generate(self): ''' Generates new event (sets it's attributes) based on event object. @@ -125,10 +110,25 @@ :return: True if generated event should be dispatched, False otherwise. ''' - pass + return True + + def _set_kwargs_as_attributes(self, **kwargs): + for k, v in kwargs.iteritems(): + setattr(self, k, v) + + def __str__(self): + return '<NetworkEvent object> Attributes: %s'%(pformat(self.__dict__)) + + def __repr__(self): + return '<NetworkEvent object> Attributes: %s'%(pformat(self.__dict__)) + + +class NetworkIncomingEvent(NetworkEvent): + base_network_events = [] + ''' + Names of base network events that new event is going to be generated on. + ''' class NetworkOutgoingEvent(NetworkEvent): - - def init(self): - pass + pass \ No newline at end of file diff -r af67a464c402 -r be6a772cc4aa src/gui_interface.py --- a/src/gui_interface.py Mon Jul 19 19:53:29 2010 +0200 +++ b/src/gui_interface.py Tue Jul 20 10:35:38 2010 +0200 @@ -147,23 +147,24 @@ self.instances['change_nick_dialog'] = dialogs.ChangeNickDialog( account, room_jid, title, prompt) - def handle_event_http_auth(self, account, data): + def handle_event_http_auth(self, obj): #('HTTP_AUTH', account, (method, url, transaction_id, iq_obj, msg)) - def response(account, iq_obj, answer): - gajim.connections[account].build_http_auth_answer(iq_obj, answer) - - def on_yes(is_checked, account, iq_obj): - response(account, iq_obj, 'yes') - + def response(account, answer): + obj.conn.build_http_auth_answer(obj.iq_obj, answer) + + def on_yes(is_checked, obj): + response(obj, 'yes') + + account = obj.conn.name sec_msg = _('Do you accept this request?') if gajim.get_number_of_connected_accounts() > 1: sec_msg = _('Do you accept this request on account %s?') % account - if data[4]: - sec_msg = data[4] + '\n' + sec_msg + if obj.msg: + sec_msg = obj.msg + '\n' + sec_msg dialog = dialogs.YesNoDialog(_('HTTP (%(method)s) Authorization for ' - '%(url)s (id: %(id)s)') % {'method': data[0], 'url': data[1], - 'id': data[2]}, sec_msg, on_response_yes=(on_yes, account, data[3]), - on_response_no=(response, account, data[3], 'no')) + '%(url)s (id: %(id)s)') % {'method': obj.method, 'url': obj.url, + 'id': obj.iq_id}, sec_msg, on_response_yes=(on_yes, obj), + on_response_no=(response, obj, 'no')) def handle_event_error_answer(self, account, array): #('ERROR_ANSWER', account, (id, jid_from, errmsg, errcode)) @@ -2140,7 +2141,6 @@ 'FILE_SEND_ERROR': [self.handle_event_file_send_error], 'STANZA_ARRIVED': [self.handle_event_stanza_arrived], 'STANZA_SENT': [self.handle_event_stanza_sent], - 'HTTP_AUTH': [self.handle_event_http_auth], 'VCARD_PUBLISHED': [self.handle_event_vcard_published], 'VCARD_NOT_PUBLISHED': [self.handle_event_vcard_not_published], 'ASK_NEW_NICK': [self.handle_event_ask_new_nick], @@ -2181,7 +2181,8 @@ 'JINGLE_DISCONNECTED': [self.handle_event_jingle_disconnected], 'JINGLE_ERROR': [self.handle_event_jingle_error], 'PEP_RECEIVED': [self.handle_event_pep_received], - 'CAPS_RECEIVED': [self.handle_event_caps_received] + 'CAPS_RECEIVED': [self.handle_event_caps_received], + 'http-auth-received': [self.handle_event_http_auth], } def register_core_handlers(self): @@ -2192,7 +2193,7 @@ """ for event_name, event_handlers in self.handlers.iteritems(): for event_handler in event_handlers: - gajim.ged.register_event_handler(event_name, ged.CORE, + gajim.ged.register_event_handler(event_name, ged.GUI1, event_handler) ################################################################################

1 0

gajim: merge with trunk
by Yann Leboulanger 20 Jul '10

20 Jul '10

changeset af67a464c402 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=af67a464c402 description: merge with trunk diffstat: AUTHORS | 10 +- README.html | 9 +- README.transifex | 11 + autogen.sh | 4 +- data/gui/account_context_menu.ui | 16 +- data/gui/accounts_window.ui | 66 +- data/gui/adhoc_commands_window.ui | 24 +- data/gui/advanced_menuitem_menu.ui | 4 +- data/gui/blocked_contacts_window.ui | 2 +- data/gui/chat_context_menu.ui | 14 +- data/gui/chat_control.ui | 1369 +- data/gui/chat_to_muc_window.ui | 3 - data/gui/filetransfers.ui | 6 +- data/gui/gc_control_popup_menu.ui | 14 +- data/gui/gc_occupants_menu.ui | 12 +- data/gui/groupchat_control.ui | 182 +- data/gui/history_manager.ui | 2 +- data/gui/input_dialog.ui | 1 + data/gui/join_groupchat_window.ui | 80 +- data/gui/manage_bookmarks_window.ui | 3 +- data/gui/message_window.ui | 3 +- data/gui/popup_notification_window.ui | 4 +- data/gui/preferences_window.ui | 48 +- data/gui/profile_window.ui | 1 + data/gui/roster_window.ui | 43 +- data/gui/service_discovery_window.ui | 10 +- data/gui/subscription_request_popup_menu.ui | 2 +- data/gui/systray_context_menu.ui | 10 +- data/gui/xml_console_window.ui | 4 +- data/gui/zeroconf_context_menu.ui | 4 +- debian/changelog | 23 + debian/control | 6 +- debian/copyright | 6 +- debian/pycompat | 1 - debian/pyversions | 2 +- debian/rules | 5 +- debian/watch | 8 + icons/hicolor/16x16/status/audio-mic-volume-high.png | 0 icons/hicolor/16x16/status/audio-mic-volume-low.png | 0 icons/hicolor/16x16/status/audio-mic-volume-medium.png | 0 icons/hicolor/16x16/status/audio-mic-volume-muted.png | 0 po/LINGUAS | 2 + po/be.po | 5002 +++--- po/be(a)latin.po | 5014 +++--- po/bg.po | 5041 +++--- po/br.po | 4946 +++--- po/cs.po | 6955 +++++---- po/da.po | 5027 +++--- po/de.po | 7503 ++++++---- po/el.po | 4991 +++--- po/en_GB.po | 5071 +++--- po/eo.po | 5006 +++--- po/es.po | 4950 +++--- po/eu.po | 5016 +++--- po/fr.po | 6997 ++++----- po/gl.po | 4920 +++--- po/hr.po | 5037 +++--- po/it.po | 5008 +++--- po/ja.po | 10374 +++++++++++++++ po/kk.po | 9846 ++++++++++++++ po/lt.po | 4906 +++--- po/nb.po | 5050 +++--- po/nl.po | 8431 ++++++----- po/no.po | 5050 +++--- po/pl.po | 7328 ++++++---- po/pt.po | 4961 +++--- po/pt_BR.po | 4627 +++--- po/ru.po | 7198 +++++----- po/sk.po | 6088 ++++---- po/sr.po | 5027 +++--- po/sr(a)Latn.po | 5032 +++--- po/sv.po | 5076 +++--- po/tr.po | 9439 +++++++++++++ po/uk.po | 6986 ++++----- po/zh_CN.po | 4987 +++--- scripts/dev/run-pylint.py | 2 +- setup_win32.py | 2 +- src/adhoc_commands.py | 100 +- src/advanced_configuration_window.py | 4 +- src/atom_window.py | 46 +- src/cell_renderer_image.py | 2 +- src/chat_control.py | 230 +- src/command_system/__init__.py | 8 +- src/command_system/dispatching.py | 9 +- src/command_system/errors.py | 13 +- src/command_system/framework.py | 192 +- src/command_system/implementation/__init__.py | 7 +- src/command_system/implementation/custom.py | 40 +- src/command_system/implementation/hosts.py | 18 +- src/command_system/implementation/middleware.py | 56 +- src/command_system/implementation/standard.py | 99 +- src/command_system/mapping.py | 206 +- src/common/GnuPG.py | 3 +- src/common/GnuPGInterface.py | 2 +- src/common/atom.py | 2 +- src/common/caps_cache.py | 2 +- src/common/check_paths.py | 14 +- src/common/commands.py | 41 +- src/common/config.py | 10 +- src/common/configpaths.py | 4 +- src/common/connection.py | 291 +- src/common/connection_handlers.py | 287 +- src/common/contacts.py | 9 +- src/common/dataforms.py | 87 +- src/common/dbus_support.py | 9 +- src/common/defs.py | 4 +- src/common/dh.py | 2 +- src/common/events.py | 2 +- src/common/exceptions.py | 2 +- src/common/fuzzyclock.py | 2 +- src/common/gajim.py | 12 +- src/common/helpers.py | 19 +- src/common/i18n.py | 36 +- src/common/jingle.py | 54 +- src/common/jingle_content.py | 5 + src/common/jingle_rtp.py | 105 +- src/common/jingle_session.py | 109 +- src/common/latex.py | 2 +- src/common/location_listener.py | 71 +- src/common/logger.py | 2 +- src/common/multimedia_helpers.py | 10 +- src/common/optparser.py | 19 +- src/common/passwords.py | 2 +- src/common/pep.py | 4 +- src/common/protocol/bytestream.py | 381 +- src/common/proxy65_manager.py | 7 +- src/common/pubsub.py | 28 +- 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 | 153 +- src/common/xmpp/client_nb.py | 7 +- src/common/xmpp/dispatcher_nb.py | 4 - src/common/xmpp/idlequeue.py | 2 +- src/common/xmpp/protocol.py | 7 + src/common/xmpp/roster_nb.py | 8 +- src/common/xmpp/stringprepare.py | 2 +- src/common/xmpp/tls_nb.py | 40 +- src/common/xmpp/transports_nb.py | 11 +- src/common/zeroconf/client_zeroconf.py | 15 +- src/common/zeroconf/connection_handlers_zeroconf.py | 10 +- src/common/zeroconf/connection_zeroconf.py | 13 +- src/common/zeroconf/zeroconf_bonjour.py | 6 +- src/config.py | 291 +- src/conversation_textview.py | 26 +- src/dataforms_widget.py | 30 +- src/dialogs.py | 208 +- src/disco.py | 14 +- src/features_window.py | 5 +- src/filetransfers_window.py | 4 +- src/gajim-remote.py | 4 +- src/gajim.py | 130 +- src/gajim_themes_window.py | 2 +- src/groupchat_control.py | 607 +- src/groups.py | 4 +- src/gtkexcepthook.py | 2 +- src/gtkgui_helpers.py | 92 +- src/gui_interface.py | 1117 +- src/gui_menu_builder.py | 15 +- src/history_manager.py | 2 +- src/history_window.py | 9 +- src/htmltextview.py | 2 +- src/ipython_view.py | 2 +- src/message_control.py | 6 +- src/message_textview.py | 2 +- src/message_window.py | 10 +- src/music_track_listener.py | 2 +- src/negotiation.py | 2 +- src/network_manager_listener.py | 2 +- src/notify.py | 215 +- src/profile_window.py | 20 +- src/remote_control.py | 2 +- src/roster_window.py | 1145 +- src/search_window.py | 2 +- src/session.py | 31 +- src/statusicon.py | 26 +- src/tooltips.py | 112 +- src/vcard.py | 8 +- 179 files changed, 123803 insertions(+), 82213 deletions(-) diffs (truncated from 369107 to 300 lines): diff -r e80de54a6600 -r af67a464c402 AUTHORS --- a/AUTHORS Thu Apr 08 01:20:17 2010 +0200 +++ b/AUTHORS Mon Jul 19 19:53:29 2010 +0200 @@ -1,13 +1,8 @@ CURRENT DEVELOPERS: Alexander Cherniuk (ts33kr AT gmail.com) -Nikos Kouremenos (kourem AT gmail.com) Yann Leboulanger (asterix AT lagaule.org) -Julien Pivotto (roidelapluie AT gmail.com) Jonathan Schleifer (js-gajim AT webkeks.org) -Travis Shirk (travis AT pobox.com) -Brendan Taylor (whateley AT gmail.com) -Jean-Marie Traissard (jim AT lapin.org) PAST DEVELOPERS: @@ -15,3 +10,8 @@ Stephan Erb (steve-e AT h3c.de) Vincent Hanquez (tab AT snarc.org) Dimitur Kirov (dkirov AT gmail.com) +Nikos Kouremenos (kourem AT gmail.com) +Julien Pivotto (roidelapluie AT gmail.com) +Travis Shirk (travis AT pobox.com) +Brendan Taylor (whateley AT gmail.com) +Jean-Marie Traissard (jim AT lapin.org) diff -r e80de54a6600 -r af67a464c402 README.html --- a/README.html Thu Apr 08 01:20:17 2010 +0200 +++ b/README.html Mon Jul 19 19:53:29 2010 +0200 @@ -23,7 +23,7 @@ <h2>Optional Runtime Requirements</h2> <ul> -<li><a href="http://pyopenssl.sourceforge.net/">PyOpenSSL</a> (python-pyopenssl package in Debian) 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.9) for <em>secure</em> SSL/TLS. Python's default SSL is insecure, so this package is highly recommended!</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> @@ -63,7 +63,7 @@ <p>To specify where to install do:</p> <pre> - su -c make PREFIX=custom_path install + ./configure --prefix=custom_path </pre> <h2>Running Gajim</h2> @@ -98,7 +98,8 @@ If you want to remove it from custom directory provide it as: </p> <pre> - make PREFIX=custom_path uninstall + ./configure --prefix=custom_path + make uninstall </pre> <h2>Miscellaneous</h2> @@ -119,7 +120,7 @@ <br/> <br/> <br/> -(C) 2003-200888888888<br/> +(C) 2003-2010<br/> The Gajim Team<br/> http://gajim.org<br/> <br/> diff -r e80de54a6600 -r af67a464c402 README.transifex --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/README.transifex Mon Jul 19 19:53:29 2010 +0200 @@ -0,0 +1,11 @@ +Transifex.net Token Verification +================================= + +The list of tokens bellow guarantee the respective users to be able to enable +submission on components using the following repository url: + +ssh://hg.gajim.org/gajim + +Tokens: + +JzQjKFEfvEhybB3vKxvsNYfusnpxWth3 / asterix diff -r e80de54a6600 -r af67a464c402 autogen.sh --- a/autogen.sh Thu Apr 08 01:20:17 2010 +0200 +++ b/autogen.sh Mon Jul 19 19:53:29 2010 +0200 @@ -8,7 +8,9 @@ fi echo "[encoding: UTF-8]" > po/POTFILES.in \ - && ls -1 data/gajim.desktop.in.in data/gui/*.ui \ + && 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 | grep -v ipython_view.py >> \ po/POTFILES.in || exit 1 if test -z `which pkg-config 2>/dev/null`;then diff -r e80de54a6600 -r af67a464c402 data/gui/account_context_menu.ui --- a/data/gui/account_context_menu.ui Thu Apr 08 01:20:17 2010 +0200 +++ b/data/gui/account_context_menu.ui Mon Jul 19 19:53:29 2010 +0200 @@ -5,7 +5,7 @@ <object class="GtkMenu" id="account_context_menu"> <child> <object class="GtkImageMenuItem" id="status_menuitem"> - <property name="label">_Status</property> + <property name="label" translatable="yes">_Status</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image1</property> @@ -14,7 +14,7 @@ </child> <child> <object class="GtkImageMenuItem" id="pep_menuitem"> - <property name="label">_Personal Events</property> + <property name="label" translatable="yes">_Personal Events</property> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="use_underline">True</property> @@ -30,7 +30,7 @@ </child> <child> <object class="GtkImageMenuItem" id="start_chat_menuitem"> - <property name="label">_Start Chat...</property> + <property name="label" translatable="yes">_Start Chat...</property> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="use_underline">True</property> @@ -40,7 +40,7 @@ </child> <child> <object class="GtkImageMenuItem" id="join_group_chat_menuitem"> - <property name="label">Join _Group Chat...</property> + <property name="label" translatable="yes">Join _Group Chat...</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image4</property> @@ -54,7 +54,7 @@ </child> <child> <object class="GtkImageMenuItem" id="add_contact_menuitem"> - <property name="label">_Add Contact...</property> + <property name="label" translatable="yes">_Add Contact...</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image5</property> @@ -63,7 +63,7 @@ </child> <child> <object class="GtkImageMenuItem" id="service_discovery_menuitem"> - <property name="label">_Discover Services</property> + <property name="label" translatable="yes">_Discover Services</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image6</property> @@ -72,7 +72,7 @@ </child> <child> <object class="GtkImageMenuItem" id="execute_command_menuitem"> - <property name="label">_Execute Command...</property> + <property name="label" translatable="yes">_Execute Command...</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image7</property> @@ -93,7 +93,7 @@ </child> <child> <object class="GtkImageMenuItem" id="edit_account_menuitem"> - <property name="label">_Modify Account</property> + <property name="label" translatable="yes">_Modify Account</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image8</property> diff -r e80de54a6600 -r af67a464c402 data/gui/accounts_window.ui --- a/data/gui/accounts_window.ui Thu Apr 08 01:20:17 2010 +0200 +++ b/data/gui/accounts_window.ui Mon Jul 19 19:53:29 2010 +0200 @@ -4,7 +4,7 @@  <object class="GtkListStore" id="liststore1"> <columns> -  +  <column type="gchararray"/> </columns> <data> @@ -203,7 +203,7 @@ <object class="GtkTable" id="table1"> <property name="visible">True</property> <property name="border_width">6</property> - <property name="n_rows">5</property> + <property name="n_rows">6</property> <property name="n_columns">3</property> <property name="column_spacing">6</property> <property name="row_spacing">6</property> @@ -445,6 +445,68 @@ <property name="y_options"></property> </packing> </child> + <child> + <object class="GtkExpander" id="expander2"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <child> + <object class="GtkHBox" id="hbox2"> + <property name="visible">True</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="label28"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Client Cert File:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">cert_entry1</property> + </object> + <packing> + <property name="expand">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="cert_entry1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip_text" translatable="yes">The path to the client certificate and key in PKCS#12 format</property> + <property name="invisible_char">●</property> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="browse_for_client_cert_button"> + <property name="label" translatable="yes">Browse...</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Choose Client Cert</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="label" translatable="yes">Client certificate</property> + </object> + </child> + </object> + <packing> + <property name="right_attach">3</property> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> + <property name="y_options">GTK_FILL</property> + </packing> + </child> </object> </child> <child type="tab"> diff -r e80de54a6600 -r af67a464c402 data/gui/adhoc_commands_window.ui --- a/data/gui/adhoc_commands_window.ui Thu Apr 08 01:20:17 2010 +0200 +++ b/data/gui/adhoc_commands_window.ui Mon Jul 19 19:53:29 2010 +0200 @@ -359,6 +359,22 @@ <property name="spacing">12</property> <property name="layout_style">end</property> <child> + <object class="GtkButton" id="restart_button"> + <property name="label">gtk-goto-first</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_stock">True</property> + <signal name="clicked" handler="on_restart_button_clicked"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> <object class="GtkButton" id="back_button"> <property name="label">gtk-go-back</property> <property name="visible">True</property> @@ -371,7 +387,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <child> @@ -387,7 +403,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">1</property>

1 0

gajim: Added an ability to execute a command when a new Gmail ev...
by Alexander Cherniuk 20 Jul '10

20 Jul '10

changeset 8b2f1eaa32a9 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8b2f1eaa32a9 description: Added an ability to execute a command when a new Gmail event arrives. Thanks to umonkey. Fixes #5818 diffstat: src/common/config.py | 1 + src/gui_interface.py | 5 +++++ 2 files changed, 6 insertions(+), 0 deletions(-) diffs (33 lines): diff -r d56f53e6ffd2 -r 8b2f1eaa32a9 src/common/config.py --- a/src/common/config.py Mon Jul 12 04:35:06 2010 +0000 +++ b/src/common/config.py Tue Jul 20 20:15:44 2010 +0300 @@ -161,6 +161,7 @@ 'after_nickname': [ opt_str, ':', _('Characters that are printed after the nickname in conversations') ], 'notify_on_new_gmail_email': [ opt_bool, True ], 'notify_on_new_gmail_email_extra': [ opt_bool, False ], + 'notify_on_new_gmail_email_command': [ opt_str, '', _('Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q') ], 'use_gpg_agent': [ opt_bool, False ], 'change_roster_title': [ opt_bool, True, _('Add * and [n] in roster title?')], 'restore_lines': [opt_int, 4, _('How many lines to remember from previous conversation when a chat tab/window is reopened.')], diff -r d56f53e6ffd2 -r 8b2f1eaa32a9 src/gui_interface.py --- a/src/gui_interface.py Mon Jul 12 04:35:06 2010 +0000 +++ b/src/gui_interface.py Tue Jul 20 20:15:44 2010 +0300 @@ -40,6 +40,7 @@ import re import time import math +from subprocess import Popen import gtk import gobject @@ -1348,6 +1349,10 @@ 'snippet': gmessage['Snippet']} cnt += 1 + command = gajim.config.get('notify_on_new_gmail_email_command') + if command: + Popen(command, shell=True) + if gajim.config.get_per('soundevents', 'gmail_received', 'enabled'): helpers.play_sound('gmail_received') notify.popup(_('New E-mail'), jid, account, 'gmail',

1 0

gajim: fix incorrect use of jid where account name should be use...
by fantasticsid＠lagaule.org 15 Jul '10

15 Jul '10

changeset 919d1c16d62a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=919d1c16d62a description: fix incorrect use of jid where account name should be used as parameter diffstat: src/common/jingle_ft.py | 12 +++++------- src/common/protocol/bytestream.py | 3 +-- src/gui_interface.py | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-) diffs (58 lines): diff -r 1b2d593e102a -r 919d1c16d62a src/common/jingle_ft.py --- a/src/common/jingle_ft.py Thu Jul 15 13:38:53 2010 +0800 +++ b/src/common/jingle_ft.py Thu Jul 15 14:32:34 2010 +0800 @@ -169,13 +169,12 @@ self.file_props['is_a_proxy'] = True receiver = Socks5Receiver(gajim.idlequeue, streamhost_used, self.file_props['sid'], self.file_props) - #gajim.socks5queue.add_file_props(self.session.ourjid, self.file_props) - gajim.socks5queue.add_receiver(self.session.ourjid, receiver) + gajim.socks5queue.add_receiver(self.session.connection.name, receiver) streamhost_used['idx'] = receiver.queue_idx gajim.socks5queue.on_success = self.transport._on_proxy_auth_ok else: jid = gajim.get_jid_without_resource(self.session.ourjid) - gajim.socks5queue.send_file(self.file_props, jid) + gajim.socks5queue.send_file(self.file_props, self.session.connection.name) def __on_iq_result(self, stanza, content, error, action): log.info("__on_iq_result") @@ -199,10 +198,9 @@ # send error message, notify the user elif not self.weinitiate and self.state == STATE_NOT_STARTED: # session-accept iq-result self.state = STATE_ACCEPTED - if not gajim.socks5queue.get_file_props(self.session.ourjid, self.file_props['sid']): - gajim.socks5queue.add_file_props(self.session.ourjid, self.file_props) - jid = gajim.get_jid_without_resource(self.session.ourjid) - gajim.socks5queue.connect_to_hosts(jid, self.file_props['sid'], + if not gajim.socks5queue.get_file_props(self.session.connection.name, self.file_props['sid']): + gajim.socks5queue.add_file_props(self.session.connection.name, self.file_props) + gajim.socks5queue.connect_to_hosts(self.session.connection.name, self.file_props['sid'], self.send_candidate_used, self._on_connect_error) elif not self.weinitiate and self.state == STATE_ACCEPTED: # transport-info iq-result self.state = STATE_TRANSPORT_INFO diff -r 1b2d593e102a -r 919d1c16d62a src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Thu Jul 15 13:38:53 2010 +0800 +++ b/src/common/protocol/bytestream.py Thu Jul 15 14:32:34 2010 +0800 @@ -138,8 +138,7 @@ jid = gajim.get_jid_without_resource(file_props['sender']) resource = gajim.get_resource_from_jid(file_props['sender']) sid = file_props['sid'] - wr_ourjid = gajim.get_jid_without_resource(session.ourjid) - gajim.socks5queue.add_file_props(wr_ourjid, file_props) + gajim.socks5queue.add_file_props(self.name, file_props) if not session.accepted: session.approve_session() diff -r 1b2d593e102a -r 919d1c16d62a src/gui_interface.py --- a/src/gui_interface.py Thu Jul 15 13:38:53 2010 +0800 +++ b/src/gui_interface.py Thu Jul 15 14:32:34 2010 +0800 @@ -1510,7 +1510,7 @@ # send session-terminate stanza if 'session-type' in file_props and file_props['session-type'] == 'jingle': sender = gajim.get_jid_without_resource(file_props['sender']) - jingle_session = gajim.connections[sender].get_jingle_session(sender, file_props['sid']) + jingle_session = gajim.connections[account].get_jingle_session(sender, file_props['sid']) jingle_session.end_session() path = gtkgui_helpers.get_icon_path(img_name, 48) else:

1 0

gajim: send proxy activated stanza to peer
by fantasticsid＠lagaule.org 15 Jul '10

15 Jul '10

changeset 1b2d593e102a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1b2d593e102a description: send proxy activated stanza to peer diffstat: src/common/jingle_ft.py | 31 +++++++++++++++++++++++-------- src/common/jingle_session.py | 1 + src/common/jingle_transport.py | 24 ++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 8 deletions(-) diffs (114 lines): diff -r 17d9a5292396 -r 1b2d593e102a src/common/jingle_ft.py --- a/src/common/jingle_ft.py Tue Jul 13 10:43:14 2010 +0800 +++ b/src/common/jingle_ft.py Thu Jul 15 13:38:53 2010 +0800 @@ -30,6 +30,11 @@ log = logging.getLogger('gajim.c.jingle_ft') +STATE_NOT_STARTED = 0 +STATE_INITIALIZED = 1 +STATE_ACCEPTED = 2 +STATE_TRANSPORT_INFO = 3 +STATE_PROXY_ACTIVATED = 4 class JingleFileTransfer(JingleContent): def __init__(self, session, transport=None, file_props=None): @@ -47,6 +52,8 @@ self.callbacks['transport-info'] += [self.__on_transport_info] self.callbacks['iq-result'] += [self.__on_iq_result] + self.state = STATE_NOT_STARTED + self.file_props = file_props if file_props is None: self.weinitiate = False @@ -137,6 +144,8 @@ def __on_transport_info(self, stanza, content, error, action): log.info("__on_transport_info") + if not self.weinitiate: # proxy activated from initiator + return streamhost_cid = content.getTag('transport').getTag('candidate-used').getAttr('cid') streamhost_used = None for cand in self.transport.candidates: @@ -171,7 +180,8 @@ def __on_iq_result(self, stanza, content, error, action): log.info("__on_iq_result") - if self.weinitiate: + if self.weinitiate and self.state == STATE_NOT_STARTED: + self.state = STATE_INITIALIZED self.session.connection.files_props[self.file_props['sid']] = self.file_props receiver = self.file_props['receiver'] sender = self.file_props['sender'] @@ -187,13 +197,18 @@ if not listener: return # send error message, notify the user - else: # session-accept iq-result - if not gajim.socks5queue.get_file_props(self.session.ourjid, self.file_props['sid']): - gajim.socks5queue.add_file_props(self.session.ourjid, self.file_props) - jid = gajim.get_jid_without_resource(self.session.ourjid) - gajim.socks5queue.connect_to_hosts(jid, self.file_props['sid'], - self.send_candidate_used, self._on_connect_error) - + elif not self.weinitiate and self.state == STATE_NOT_STARTED: # session-accept iq-result + self.state = STATE_ACCEPTED + if not gajim.socks5queue.get_file_props(self.session.ourjid, self.file_props['sid']): + gajim.socks5queue.add_file_props(self.session.ourjid, self.file_props) + jid = gajim.get_jid_without_resource(self.session.ourjid) + gajim.socks5queue.connect_to_hosts(jid, self.file_props['sid'], + self.send_candidate_used, self._on_connect_error) + elif not self.weinitiate and self.state == STATE_ACCEPTED: # transport-info iq-result + self.state = STATE_TRANSPORT_INFO + elif self.weinitiate and self.state == STATE_INITIALIZED: # proxy activated + self.state = STATE_PROXY_ACTIVATED + def send_candidate_used(self, streamhost): """ send candidate-used stanza diff -r 17d9a5292396 -r 1b2d593e102a src/common/jingle_session.py --- a/src/common/jingle_session.py Tue Jul 13 10:43:14 2010 +0800 +++ b/src/common/jingle_session.py Thu Jul 15 13:38:53 2010 +0800 @@ -277,6 +277,7 @@ stanza, jingle = self.__make_jingle('transport-info') jingle.addChild(node=content) self.connection.connection.send(stanza) + self.collect_iq_id(stanza.getID()) def send_description_info(self, content): assert self.state != JingleStates.ended diff -r 17d9a5292396 -r 1b2d593e102a src/common/jingle_transport.py --- a/src/common/jingle_transport.py Tue Jul 13 10:43:14 2010 +0800 +++ b/src/common/jingle_transport.py Thu Jul 15 13:38:53 2010 +0800 @@ -229,6 +229,30 @@ activate.setData(file_props['proxy_receiver']) iq.setID(auth_id) self.connection.connection.send(iq) + + content = xmpp.Node('content') + content.setAttr('creator', 'initiator') + content.setAttr('name', 'file') + transport = xmpp.Node('transport') + transport.setAttr('xmlns', xmpp.NS_JINGLE_BYTESTREAM) + activated = xmpp.Node('activated') + cid = None + for host in self.candidates: + if host['host'] == proxy['host'] and \ + host['jid'] == proxy['jid'] and \ + host['port'] == proxy['port']: + cid = host['candidate_id'] + break + if cid is None: + return + activated.setAttr('cid', cid) + transport.addChild(node=activated) + content.addChild(node=transport) + sesn = self.connection.get_jingle_session(self.ourjid, self.file_props['sid']) + + if sesn is None: + return + sesn.send_transport_info(content) import farsight

1 0

gajim: remove "pass"
by fantasticsid＠lagaule.org 13 Jul '10

13 Jul '10

changeset 17d9a5292396 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=17d9a5292396 description: remove "pass" diffstat: src/common/jingle_ft.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diffs (11 lines): diff -r 7607024a6573 -r 17d9a5292396 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Tue Jul 13 10:38:31 2010 +0800 +++ b/src/common/jingle_ft.py Tue Jul 13 10:43:14 2010 +0800 @@ -164,7 +164,6 @@ gajim.socks5queue.add_receiver(self.session.ourjid, receiver) streamhost_used['idx'] = receiver.queue_idx gajim.socks5queue.on_success = self.transport._on_proxy_auth_ok - pass else: jid = gajim.get_jid_without_resource(self.session.ourjid) gajim.socks5queue.send_file(self.file_props, jid)

1 0

gajim: enable FT over proxy
by fantasticsid＠lagaule.org 13 Jul '10

13 Jul '10

changeset 7607024a6573 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7607024a6573 description: enable FT over proxy diffstat: src/common/jingle_ft.py | 37 +++++++++++++++++++++++++++++++++++-- src/common/jingle_transport.py | 21 +++++++++++++++++++++ 2 files changed, 56 insertions(+), 2 deletions(-) diffs (114 lines): diff -r ad143e6a69e9 -r 7607024a6573 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Mon Jul 12 10:20:31 2010 +0800 +++ b/src/common/jingle_ft.py Tue Jul 13 10:38:31 2010 +0800 @@ -24,6 +24,7 @@ from jingle_content import contents, JingleContent from jingle_transport import JingleTransportICEUDP, JingleTransportSocks5 from common import helpers +from common.socks5 import Socks5Receiver import logging @@ -99,6 +100,7 @@ file_props['transfered_size'] = [] self.file_props = file_props + self.session.connection.files_props[file_props['sid']] = file_props if self.transport is None: self.transport = JingleTransportSocks5() self.transport.set_our_jid(self.session.ourjid) @@ -134,13 +136,44 @@ def __on_transport_info(self, stanza, content, error, action): log.info("__on_transport_info") - jid = gajim.get_jid_without_resource(self.session.ourjid) - gajim.socks5queue.send_file(self.file_props, jid) + streamhost_cid = content.getTag('transport').getTag('candidate-used').getAttr('cid') + streamhost_used = None + for cand in self.transport.candidates: + if cand['candidate_id'] == streamhost_cid: + streamhost_used = cand + break + if streamhost_used == None: + log.info("unknow streamhost") + return + if streamhost_used['type'] == 'proxy': + self.file_props['streamhost-used'] = True + for proxy in self.file_props['proxyhosts']: + if proxy['host'] == streamhost_used['host'] and \ + proxy['port'] == streamhost_used['port'] and \ + proxy['jid'] == streamhost_used['jid']: + streamhost_used = proxy + break + if 'streamhosts' not in self.file_props: + self.file_props['streamhosts'] = [] + self.file_props['streamhosts'].append(streamhost_used) + self.file_props['is_a_proxy'] = True + receiver = Socks5Receiver(gajim.idlequeue, streamhost_used, + self.file_props['sid'], self.file_props) + #gajim.socks5queue.add_file_props(self.session.ourjid, self.file_props) + gajim.socks5queue.add_receiver(self.session.ourjid, receiver) + streamhost_used['idx'] = receiver.queue_idx + gajim.socks5queue.on_success = self.transport._on_proxy_auth_ok + pass + else: + jid = gajim.get_jid_without_resource(self.session.ourjid) + gajim.socks5queue.send_file(self.file_props, jid) + def __on_iq_result(self, stanza, content, error, action): log.info("__on_iq_result") if self.weinitiate: + self.session.connection.files_props[self.file_props['sid']] = self.file_props receiver = self.file_props['receiver'] sender = self.file_props['sender'] diff -r ad143e6a69e9 -r 7607024a6573 src/common/jingle_transport.py --- a/src/common/jingle_transport.py Mon Jul 12 10:20:31 2010 +0800 +++ b/src/common/jingle_transport.py Tue Jul 13 10:38:31 2010 +0800 @@ -160,6 +160,8 @@ c['type'] = 'direct' c['jid'] = self.ourjid c['priority'] = (2**16) * type_preference + c['initiator'] = self.file_props['sender'] + c['target'] = self.file_props['receiver'] local_ip_cand.append(c) self.candidates += local_ip_cand @@ -181,6 +183,8 @@ c['type'] = 'direct' c['jid'] = self.ourjid c['priority'] = (2**16) * type_preference + c['initiator'] = self.file_props['sender'] + c['target'] = self.file_props['receiver'] additional_ip_cand.append(c) self.candidates += additional_ip_cand @@ -205,9 +209,26 @@ c['type'] = 'proxy' c['jid'] = proxyhost['jid'] c['priority'] = (2**16) * type_preference + c['initiator'] = self.file_props['sender'] + c['target'] = self.file_props['receiver'] proxy_cand.append(c) self.candidates += proxy_cand + def _on_proxy_auth_ok(self, proxy): + log.info('proxy auth ok for ' + str(proxy)) + # send activate request to proxy, send activated confirmation to peer + if not self.connection: + return + file_props = self.file_props + iq = xmpp.Iq(to=proxy['initiator'], typ='set') + auth_id = "au_" + proxy['sid'] + iq.setID(auth_id) + query = iq.setTag('query', namespace=xmpp.NS_BYTESTREAM) + query.setAttr('sid', proxy['sid']) + activate = query.setTag('activate') + activate.setData(file_props['proxy_receiver']) + iq.setID(auth_id) + self.connection.connection.send(iq) import farsight

1 0

gajim: l10n: Updated Kazakh (kk) translation to 96%
by Baurzhan Muftakhidinov 12 Jul '10

12 Jul '10

changeset d56f53e6ffd2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d56f53e6ffd2 description: l10n: Updated Kazakh (kk) translation to 96% New status: 2031 messages complete with 0 fuzzies and 70 untranslated. Transmitted-via: Transifex (www.transifex.net). diffstat: po/kk.po | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) diffs (155 lines): diff -r 19ba2606ff0a -r d56f53e6ffd2 po/kk.po --- a/po/kk.po Mon Jul 12 04:20:21 2010 +0000 +++ b/po/kk.po Mon Jul 12 04:35:06 2010 +0000 @@ -8,7 +8,7 @@ "Project-Id-Version: gajim.trunk\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-06-30 10:15+0600\n" -"PO-Revision-Date: 2010-07-12 10:11+0600\n" +"PO-Revision-Date: 2010-07-12 10:35+0600\n" "Last-Translator: Baurzhan Muftakhidinov <baurthefirst(a)gmail.com>\n" "Language-Team: Kazakh <kk_KZ(a)googlegroups.com>\n" "Language: kk\n" @@ -689,7 +689,7 @@ #: ../data/gui/advanced_notifications_window.ui.h:12 msgid "Don't have " -msgstr "" +msgstr "Жоқ " #: ../data/gui/advanced_notifications_window.ui.h:13 msgid "File Transfer Finished" @@ -713,7 +713,7 @@ #: ../data/gui/advanced_notifications_window.ui.h:18 msgid "Have " -msgstr "" +msgstr "Бар " #: ../data/gui/advanced_notifications_window.ui.h:19 #: ../src/common/helpers.py:243 @@ -800,11 +800,11 @@ #: ../data/gui/advanced_notifications_window.ui.h:39 msgid "everybody" -msgstr "" +msgstr "әркім" #: ../data/gui/advanced_notifications_window.ui.h:40 msgid "for " -msgstr "" +msgstr "үшін: " #: ../data/gui/advanced_notifications_window.ui.h:41 msgid "group(s)" @@ -812,7 +812,7 @@ #: ../data/gui/advanced_notifications_window.ui.h:42 msgid "when I'm in" -msgstr "" +msgstr "Мен келесіде болғанда: " #: ../data/gui/atom_entry_window.ui.h:1 msgid "Entry:" @@ -2784,7 +2784,7 @@ #: ../data/gajim.desktop.in.in.h:1 msgid "A GTK+ Jabber client" -msgstr "GTK+ Jabber бағдарламасы" +msgstr "GTK+ Jabber қолданбасы" #: ../data/gajim.desktop.in.in.h:2 msgid "Gajim Instant Messenger" @@ -3260,7 +3260,7 @@ #: ../src/common/commands.py:114 msgid "Presence description:" -msgstr "" +msgstr "Бар болудың анықтамасы:" #: ../src/common/commands.py:149 #: ../src/common/commands.py:317 @@ -3430,7 +3430,7 @@ #: ../src/common/config.py:118 msgid "If True, do not remove */_ . So *abc* will be bold but with * * not removed." -msgstr "" +msgstr "Белсенді болса, */_ өшірілмейді. Мысалы, *abc* жуан қаріппен көрсетіледі, бірақ * * өшірілмейді." #: ../src/common/config.py:121 msgid "Uses ReStructured text markup to send HTML, plus ascii formatting if selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html (If you want to use this, install docutils)" @@ -3567,11 +3567,11 @@ #: ../src/common/config.py:220 msgid "If True, quits Gajim when X button of Window Manager is clicked. This setting is taken into account only if trayicon is used." -msgstr "" +msgstr "Белсенді болса, Терезелер басқарушысы ұсынған X батырмасын шерткенеде Gajim жұмысын аяқтайды. Тек трей таңбашасы қосулы болу керек." #: ../src/common/config.py:221 msgid "If True, Gajim will check if it's the default jabber client on each startup." -msgstr "" +msgstr "Белсенді болса, Gajim әр қосылған кезде жүйеде негізгі jabber клиенті ма, соны тексереді." #: ../src/common/config.py:222 msgid "If True, Gajim will display an icon on each tab containing unread messages. Depending on the theme, this icon may be animated." @@ -3607,7 +3607,7 @@ #: ../src/common/config.py:237 msgid "If True, restored messages will use a smaller font than the default one." -msgstr "" +msgstr "Белсенді болса, тарихтан алынған хабарламалар қаріпі қалыптыдан кішірек болады." #: ../src/common/config.py:238 msgid "Don't show avatar for the transport itself." @@ -3619,7 +3619,7 @@ #: ../src/common/config.py:240 msgid "If True and installed GTK+ and PyGTK versions are at least 2.8, make the window flash (the default behaviour in most Window Managers) when holding pending events." -msgstr "" +msgstr "Белсенді болса және GTK+ мен PyGTK нұсқалары кем дегенде 2.8 болса, кезекте оқиға бар болса, терезе шегі жыпылықтайды." #: ../src/common/config.py:242 msgid "Jabberd1.4 does not like sha info when one join a password protected group chat. Turn this option to False to stop sending sha info in group chat presences." @@ -3678,7 +3678,7 @@ #: ../src/common/config.py:256 msgid "Ctrl-Tab go to next composing tab when none is unread." -msgstr "" +msgstr "Оқылмағандар болмаса, Ctrl-Tab басу арқылы келесі жазылудағы бетке өтеді." #: ../src/common/config.py:257 msgid "Should we show the confirm metacontacts creation dialog or not? Empty string means we never show the dialog." @@ -7079,7 +7079,7 @@ #: ../src/dialogs.py:4861 #, python-format msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim." -msgstr "" +msgstr "Контакт кілті (%s) Gajim ішінде көрсетілгенге <b>сәйкес келмейді</b>." #: ../src/dialogs.py:4867 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages." @@ -9669,20 +9669,20 @@ #: ../src/vcard.py:343 msgid "This contact is interested in your presence information, but you are not interested in his/her presence" -msgstr "" +msgstr "Бұл контакт сіздің бар болуы ақпаратыңызға қызығада, сіз болсаңыз, оған қызықпайсыз" #: ../src/vcard.py:345 msgid "You are interested in the contact's presence information, but he/she is not interested in yours" -msgstr "" +msgstr "Сіз контакттың бар болуына қызығасыз, ол болса, сіздікіне қызықпайды" #: ../src/vcard.py:347 msgid "You and the contact are interested in each other's presence information" -msgstr "" +msgstr "Сіз бен контакт өзара бар болуы ақпаратына қызығасыз" #. None #: ../src/vcard.py:349 msgid "You are not interested in the contact's presence, and neither he/she is interested in yours" -msgstr "" +msgstr "Сіз контакттың бар болуына қызықпайсыз, және ол да өз ретінде сіздікіне қызықпайды." #: ../src/vcard.py:356 msgid "You are waiting contact's answer about your subscription request"

1 0

gajim: l10n: Updated Kazakh (kk) translation to 95%
by Baurzhan Muftakhidinov 12 Jul '10

12 Jul '10

changeset 19ba2606ff0a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=19ba2606ff0a description: l10n: Updated Kazakh (kk) translation to 95% New status: 2014 messages complete with 0 fuzzies and 87 untranslated. Transmitted-via: Transifex (www.transifex.net). diffstat: po/kk.po | 71 ++++++++++++++++++++++++++++++++++++--------------------------- 1 files changed, 40 insertions(+), 31 deletions(-) diffs (280 lines): diff -r 267d49a80c30 -r 19ba2606ff0a po/kk.po --- a/po/kk.po Sat Jul 10 11:03:46 2010 +0200 +++ b/po/kk.po Mon Jul 12 04:20:21 2010 +0000 @@ -8,7 +8,7 @@ "Project-Id-Version: gajim.trunk\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-06-30 10:15+0600\n" -"PO-Revision-Date: 2010-07-09 11:07+0600\n" +"PO-Revision-Date: 2010-07-12 10:11+0600\n" "Last-Translator: Baurzhan Muftakhidinov <baurthefirst(a)gmail.com>\n" "Language-Team: Kazakh <kk_KZ(a)googlegroups.com>\n" "Language: kk\n" @@ -1848,7 +1848,7 @@ #: ../data/gui/preferences_window.ui.h:60 msgid "Gajim will notify you via a popup window in the bottom right of the screen about contacts that just signed out" -msgstr "" +msgstr "Gajim сізді жаңа кірген контакттар туралы экранның төменгі оң жақта шығатын қалқымалы терезеде ескертеді" #: ../data/gui/preferences_window.ui.h:62 msgid "Hide all buttons in chat windows" @@ -1856,7 +1856,7 @@ #: ../data/gui/preferences_window.ui.h:63 msgid "If checked, Gajim will allow others to detect the operation system you are using" -msgstr "" +msgstr "Белгіленген болса, Gajim басқаларға сіздің операциялық жүйеңізді анықтауға рұқсат етеді" #: ../data/gui/preferences_window.ui.h:64 msgid "If checked, Gajim will also include information about the sender of the new emails" @@ -1864,11 +1864,11 @@ #: ../data/gui/preferences_window.ui.h:65 msgid "If checked, Gajim will change status to Away when the computer is unused." -msgstr "" +msgstr "Белгіленген болса, Gajim компьютеріңіз қолданылмаса, қалып-күйіңізді Кетіп қалғанға ауыстырады." #: ../data/gui/preferences_window.ui.h:66 msgid "If checked, Gajim will change status to Not Available when the computer has not been used even longer" -msgstr "" +msgstr "Белгіленген болса, Gajim компьютеріңіз одан да көп қолданылмаса, қалып-күйіңізді Қолжетерсізге ауыстырады." #: ../data/gui/preferences_window.ui.h:67 msgid "If checked, Gajim will display avatars of contacts in roster window and in group chats" @@ -2041,6 +2041,9 @@ "$S will be replaced by previous status message\n" "$T will be replaced by auto-away timeout" msgstr "" +"Авто Кетіп қалған қалып-күй хабарламасы. Бос болса, Gajim ағымдағы күй хабарламасын өзгертпейді\n" +"$S алдыңғы күй хабарласымен, ал\n" +"$T авто кетіп қалған уақыт шамасымен алмастырылады" #: ../data/gui/preferences_window.ui.h:111 msgid "" @@ -2048,6 +2051,9 @@ "$S will be replaced by previous status message\n" "$T will be replaced by auto-not-available timeout" msgstr "" +"Авто Қолжетерсіз қалып-күй хабарламасы. Бос болса, Gajim ағымдағы күй хабарламасын өзгертпейді\n" +"$S алдыңғы күй хабарласымен, ал\n" +"$T авто қолжетерсіз уақыт шамасымен алмастырылады" #: ../data/gui/preferences_window.ui.h:114 msgid "Use _transports icons" @@ -2782,7 +2788,7 @@ #: ../data/gajim.desktop.in.in.h:2 msgid "Gajim Instant Messenger" -msgstr "Gajim хабарламалармен алмасу" +msgstr "Gajim жедел хабарласу" #: ../data/gajim.desktop.in.in.h:3 msgid "Jabber IM Client" @@ -3116,7 +3122,7 @@ #: ../src/chat_control.py:2176 msgid "Session negotiation cancelled" -msgstr "" +msgstr "Сессияны бастаудан бас тартылды" #: ../src/chat_control.py:2185 msgid "This session is encrypted" @@ -3132,7 +3138,7 @@ #: ../src/chat_control.py:2195 msgid "Remote contact's identity not verified. Click the shield button for more details." -msgstr "" +msgstr "Қашықтағы контакттың шындылығы расталмаған. Көбірек білу үшін таңбашаға шертіңіз." #: ../src/chat_control.py:2197 msgid "E2E encryption disabled" @@ -3242,7 +3248,7 @@ #: ../src/common/commands.py:107 msgid "Extended away" -msgstr "" +msgstr "Кеңейтілген кетіп қалған" #: ../src/common/commands.py:108 msgid "Do not disturb" @@ -3250,7 +3256,7 @@ #: ../src/common/commands.py:109 msgid "Offline - disconnect" -msgstr "" +msgstr "Желіде емес - байланыспаған" #: ../src/common/commands.py:114 msgid "Presence description:" @@ -3269,7 +3275,7 @@ #: ../src/common/commands.py:197 #, python-format msgid "%(nickname)s on %(room_jid)s" -msgstr "" +msgstr "%(nickname)s, қайда: %(room_jid)s" #: ../src/common/commands.py:201 msgid "You have not joined a groupchat." @@ -3296,15 +3302,15 @@ #: ../src/common/commands.py:265 msgid "Forward unread messages" -msgstr "" +msgstr "Оқылмаған хабарламаларды бағдарлау" #: ../src/common/commands.py:287 msgid "All unread messages have been forwarded." -msgstr "" +msgstr "Барлық оқылмаған хабарламалар бағдарланды." #: ../src/common/commands.py:295 msgid "Forward unread message then disconnect" -msgstr "" +msgstr "Оқылмаған хабарламаны бағдарлау мен шығу" #: ../src/common/config.py:75 msgid "Play sound when user is busy" @@ -3316,11 +3322,11 @@ #: ../src/common/config.py:78 msgid "Show only online and free for chat contacts in roster." -msgstr "" +msgstr "Ростерде тек желідегі мен чатқа дайын контакттарды көрсету" #: ../src/common/config.py:81 msgid "Time in minutes, after which your status changes to away." -msgstr "" +msgstr "Қалып-күйіңіз Кетіп қалғанға ауысу үшін керек уақыт шамасы." #: ../src/common/config.py:82 msgid "$S (Away as a result of being idle more than $T min)" @@ -3328,11 +3334,11 @@ #: ../src/common/config.py:82 msgid "$S will be replaced by current status message, $T by autoaway time." -msgstr "" +msgstr "$S ағымдағы күй хабарласымен, ал $T авто қолжетерсіз уақыт шамасымен алмастырылады." #: ../src/common/config.py:84 msgid "Time in minutes, after which your status changes to not available." -msgstr "" +msgstr "Қалып-күйіңіз Қолжетерсізге ауысу үшін керек уақыт шамасы." #: ../src/common/config.py:85 msgid "$S (Not available as a result of being idle more than $T min)" @@ -3340,11 +3346,11 @@ #: ../src/common/config.py:85 msgid "$S will be replaced by current status message, $T by autoxa time." -msgstr "" +msgstr "$S ағымдағы күй хабарласымен, ал $T авто кеңейтілген қолжетерсізге уақыт шамасымен алмастырылады." #: ../src/common/config.py:88 msgid "When to show systray icon. Can be 'never', 'on_event', 'always'." -msgstr "" +msgstr "Трей таңбашасын қашан көрсету керек. Мүмкін мәндері: 'never', 'on_event', 'always'." #: ../src/common/config.py:93 msgid "Incoming nickname color." @@ -3410,6 +3416,9 @@ "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n" "'never' - never print time." msgstr "" +"'always' - уақытты әр хабарлама үшін көрсету.\n" +"'sometimes' - уақытты әр print_ichat_every_foo_minutes минут сайын көрсету.\n" +"'never' - уақытты ешқашан көрсетпеу." #: ../src/common/config.py:114 msgid "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. This is used only if print_time is 'sometimes'." @@ -3417,7 +3426,7 @@ #: ../src/common/config.py:117 msgid "Treat * / _ pairs as possible formatting characters." -msgstr "" +msgstr "* / _ жұптарын мүмкін пішімдеу таңбалары ретінде қарастыру." #: ../src/common/config.py:118 msgid "If True, do not remove */_ . So *abc* will be bold but with * * not removed." @@ -3566,11 +3575,11 @@ #: ../src/common/config.py:222 msgid "If True, Gajim will display an icon on each tab containing unread messages. Depending on the theme, this icon may be animated." -msgstr "" +msgstr "Белгіленген болса, Gajim оқылмаған хабарламалар бар әр бетте таңбашаны көрсетеді. Темаға байланысты, таңбашаның анимациясы болуы мүмкін." #: ../src/common/config.py:223 msgid "If True, Gajim will display the status message, if not empty, for every contact under the contact name in roster window." -msgstr "" +msgstr "Белгіленген болса, Gajim ростерде әр контакт астында оның қалып-күй хабарламасын көрсетеді, егер ол бар болса." #: ../src/common/config.py:229 msgid "Define the position of the avatar in roster. Can be left or right" @@ -3578,7 +3587,7 @@ #: ../src/common/config.py:230 msgid "If True, Gajim will ask for avatar each contact that did not have an avatar last time or has one cached that is too old." -msgstr "" +msgstr "Белгіленген болса, Gajim әр контакттан аватарды сұрайды, егер оның соңғы рет аватары болмаса, не кэштегі аватар тым ескі болса." #: ../src/common/config.py:231 msgid "If False, Gajim will no longer print status line in chats when a contact changes his or her status and/or his or her status message." @@ -3689,11 +3698,11 @@ #: ../src/common/config.py:261 msgid "If True, Gajim will use Gnome Keyring (if available) to store account passwords." -msgstr "" +msgstr "Белсенді болса, Gajim тіркелгі парольдерін сақтау үшін Gnome Keyring (егер қолжетерлік болса) қолданады." #: ../src/common/config.py:262 msgid "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store account passwords." -msgstr "" +msgstr "Белсенді болса, Gajim тіркелгі парольдерін сақтау үшін KDE Wallet (егер kwalletcli қолжетерлік болса) қолданады." #: ../src/common/config.py:263 msgid "If True, Gajim will show number of online and total contacts in account and group rows." @@ -3717,7 +3726,7 @@ #: ../src/common/config.py:268 msgid "Maximum number of lines that are printed in conversations. Oldest lines are cleared." -msgstr "" +msgstr "Сөйлесулерде көрсетілетін жолдардың максимал саны. Ескі жолдар өшіріледі." #: ../src/common/config.py:269 msgid "If True, notification windows from notification-daemon will be attached to systray icon." @@ -3725,7 +3734,7 @@ #: ../src/common/config.py:270 msgid "Choose interval between 2 checks of idleness." -msgstr "" +msgstr "Белсенді еместігіне екі тексеру арасындағы уақыт." #: ../src/common/config.py:271 msgid "Change the value to change the size of latex formulas displayed. The higher is larger." @@ -3761,7 +3770,7 @@ #: ../src/common/config.py:285 msgid "STUN server to use when using jingle" -msgstr "" +msgstr "STUN сервері, jingle қолдану үшін" #: ../src/common/config.py:286 msgid "If True, Gajim will show affiliation of groupchat occupants by adding a colored square to the status icon" @@ -3834,7 +3843,7 @@ #. yes, no, ask #: ../src/common/config.py:341 msgid "Jabberd2 workaround" -msgstr "" +msgstr "Jabberd2 жұмысы" #: ../src/common/config.py:344 msgid "If checked, Gajim will use your IP and proxies defined in file_transfer_proxies option for file transfer." @@ -7074,7 +7083,7 @@ #: ../src/dialogs.py:4867 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages." -msgstr "" +msgstr "Бұл контактқа ешбір GPG кілті көрсетілмеген. Сол үшін хабарламаларды шифрлей алмайсыз." #: ../src/dialogs.py:4874 msgid "GPG key is assigned to this contact, but <b>you do not trust his key</b>, so message <b>cannot</b> be encrypted. Use your GPG client to trust this key."

1 0

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

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2010