Commits November 2011

commits@gajim.org

3 participants
55 discussions

gajim: fix missing argument in some events
by Yann Leboulanger 19 Nov '11

19 Nov '11

changeset 88229d3332e4 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=88229d3332e4 description: fix missing argument in some events diffstat: src/common/connection.py | 2 +- src/common/zeroconf/connection_zeroconf.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diffs (34 lines): diff -r b43357c85e18 -r 88229d3332e4 src/common/connection.py --- a/src/common/connection.py Wed Nov 16 21:26:36 2011 +0100 +++ b/src/common/connection.py Sat Nov 19 22:19:16 2011 +0100 @@ -2348,7 +2348,7 @@ msg_iq.addChild(node = label) self.connection.send(msg_iq) gajim.nec.push_incoming_event(MessageSentEvent(None, conn=self, - jid=jid, message=msg, keyID=None)) + jid=jid, message=msg, keyID=None, chatstate=None)) def send_gc_subject(self, jid, subject): if not gajim.account_is_connected(self.name): diff -r b43357c85e18 -r 88229d3332e4 src/common/zeroconf/connection_zeroconf.py --- a/src/common/zeroconf/connection_zeroconf.py Wed Nov 16 21:26:36 2011 +0100 +++ b/src/common/zeroconf/connection_zeroconf.py Sat Nov 19 22:19:16 2011 +0100 @@ -340,7 +340,7 @@ def on_send_ok(msg_id): gajim.nec.push_incoming_event(MessageSentEvent(None, conn=self, - jid=jid, message=msg, keyID=keyID)) + jid=jid, message=msg, keyID=keyID, chatstate=None)) if callback: callback(msg_id, *callback_args) @@ -377,7 +377,8 @@ def on_send_ok(msg_id): gajim.nec.push_incoming_event(MessageSentEvent(None, conn=self, - jid=obj.jid, message=obj.message, keyID=obj.keyID)) + jid=obj.jid, message=obj.message, keyID=obj.keyID, + chatstate=None)) if obj.callback: obj.callback(obj.msg_id, *obj.callback_args)

1 0

gajim: refactoring
by Jefry Lagrange 18 Nov '11

18 Nov '11

changeset ad00da030d2b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ad00da030d2b description: refactoring diffstat: src/common/socks5.py | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diffs (52 lines): diff -r 4c7e4328c143 -r ad00da030d2b src/common/socks5.py --- a/src/common/socks5.py Fri Nov 18 15:07:25 2011 -0500 +++ b/src/common/socks5.py Fri Nov 18 18:21:34 2011 -0500 @@ -1088,6 +1088,7 @@ Socks5.__init__(self, idlequeue, host, port, initiator, target, sid) + self.type = 'server' def main(self): """ @@ -1190,6 +1191,8 @@ Socks5.__init__(self, idlequeue, host, port, initiator, target, sid) + self.type = 'client' + def main(self, timeout=0): """ Begin negotiation. on success 'address' != 0 @@ -1341,7 +1344,6 @@ Socks5Sender.__init__(self,idlequeue, sock_hash, parent,_sock, host, port, fingerprint , connected, file_props) - self.type = 'client' @@ -1358,7 +1360,6 @@ host, port, fingerprint , connected, file_props) - self.type = 'server' class Socks5ReceiverClient(Socks5Client, Socks5Receiver): @@ -1371,7 +1372,6 @@ Socks5Receiver.__init__(self, idlequeue, streamhost, sid, file_props, fingerprint) - self.type = 'client' @@ -1387,7 +1387,6 @@ Socks5Receiver.__init__(self, idlequeue, streamhost, sid, file_props, fingerprint) - self.type = 'server' class Socks5Listener(IdleObject):

1 0

gajim: refactoring
by Jefry Lagrange 18 Nov '11

18 Nov '11

changeset 4c7e4328c143 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4c7e4328c143 description: refactoring diffstat: src/common/socks5.py | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diffs (65 lines): diff -r 22bbc4e006cf -r 4c7e4328c143 src/common/socks5.py --- a/src/common/socks5.py Thu Nov 17 23:55:44 2011 -0500 +++ b/src/common/socks5.py Fri Nov 18 15:07:25 2011 -0500 @@ -311,13 +311,8 @@ def send_file(self, file_props, account, type): for key in self.senders.keys(): - if isinstance(self.senders[key], Socks5SenderClient): - objtype = 'client' - else: - objtype = 'server' - - if file_props['name'] in key and file_props['sid'] in key \ - and objtype == type: + if file_props['name'] in key and file_props['sid'] in key \ + and self.senders[key].type == type: log.info("socks5: sending file") sender = self.senders[key] @@ -575,8 +570,7 @@ self.pollend() else: - if isinstance(self, Socks5SenderClient) or isinstance(self, - Socks5ReceiverClient): + if self.type == 'client': self.queue.reconnect_client(self, self.streamhost) def open_file_for_reading(self): @@ -1347,6 +1341,8 @@ Socks5Sender.__init__(self,idlequeue, sock_hash, parent,_sock, host, port, fingerprint , connected, file_props) + self.type = 'client' + @@ -1362,6 +1358,8 @@ host, port, fingerprint , connected, file_props) + self.type = 'server' + class Socks5ReceiverClient(Socks5Client, Socks5Receiver): def __init__(self, idlequeue, streamhost, sid, file_props = None, @@ -1373,7 +1371,9 @@ Socks5Receiver.__init__(self, idlequeue, streamhost, sid, file_props, fingerprint) + self.type = 'client' + class Socks5ReceiverServer(Socks5Server, Socks5Receiver): @@ -1387,6 +1387,7 @@ Socks5Receiver.__init__(self, idlequeue, streamhost, sid, file_props, fingerprint) + self.type = 'server' class Socks5Listener(IdleObject):

1 0

gajim: refactoring
by Jefry Lagrange 18 Nov '11

18 Nov '11

changeset 22bbc4e006cf in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=22bbc4e006cf description: refactoring diffstat: src/common/jingle_ft.py | 9 +- src/common/socks5.py | 750 +++++++++++++++++++++++++---------------------- 2 files changed, 405 insertions(+), 354 deletions(-) diffs (truncated from 896 to 300 lines): diff -r 47e6370604a1 -r 22bbc4e006cf src/common/jingle_ft.py --- a/src/common/jingle_ft.py Wed Nov 02 00:09:33 2011 +0100 +++ b/src/common/jingle_ft.py Thu Nov 17 23:55:44 2011 -0500 @@ -24,7 +24,7 @@ from jingle_content import contents, JingleContent from jingle_transport import JingleTransportICEUDP, JingleTransportSocks5 from common import helpers -from common.socks5 import Socks5Receiver, Socks5Sender +from common.socks5 import Socks5ReceiverClient, Socks5SenderClient from common.connection_handlers_events import FileRequestReceivedEvent import logging @@ -419,9 +419,8 @@ if self.weinitiate: gajim.socks5queue.idx += 1 idx = gajim.socks5queue.idx - sockobj = Socks5Sender(gajim.idlequeue, idx, + sockobj = Socks5SenderClient(gajim.idlequeue, idx, gajim.socks5queue, - mode='client', _sock=None, host=str(streamhost_used['host']), port=int(streamhost_used['port']), @@ -429,8 +428,8 @@ connected=False, file_props=self.file_props) else: - sockobj = Socks5Receiver(gajim.idlequeue, streamhost_used, - sid=self.file_props['sid'], mode='client', + sockobj = Socks5ReceiverClient(gajim.idlequeue, streamhost_used, + sid=self.file_props['sid'], file_props=self.file_props, fingerprint=None) sockobj.proxy = True sockobj.streamhost = streamhost_used diff -r 47e6370604a1 -r 22bbc4e006cf src/common/socks5.py --- a/src/common/socks5.py Wed Nov 02 00:09:33 2011 +0100 +++ b/src/common/socks5.py Thu Nov 17 23:55:44 2011 -0500 @@ -144,8 +144,8 @@ fp = fingerprint if receiving: self.type = 'receiver' - socks5obj = Socks5Receiver(self.idlequeue, streamhost, sid, - 'client', file_props, fingerprint=fp) + socks5obj = Socks5ReceiverClient(self.idlequeue, streamhost, sid, + file_props, fingerprint=fp) self.add_sockobj(account, socks5obj) else: if 'sha_str' in file_props: @@ -158,10 +158,10 @@ file_props['is_a_proxy'] = True file_props['proxy_sender'] = streamhost['target'] file_props['proxy_receiver'] = streamhost['initiator'] - socks5obj = Socks5Sender(self.idlequeue, idx, - self, mode='client' , _sock=None, - host=str(streamhost['host']), port=int(streamhost['port']), - fingerprint=fp, connected=False, file_props=file_props) + socks5obj = Socks5SenderClient(self.idlequeue, idx, + self, _sock=None,host=str(streamhost['host']), + port=int(streamhost['port']),fingerprint=fp, + connected=False, file_props=file_props) socks5obj.streamhost = streamhost self.add_sockobj(account, socks5obj, type='sender') @@ -214,8 +214,8 @@ if host['state'] == -2: host['state'] = 0 # FIXME: make the sender reconnect also - client = Socks5Receiver(self.idlequeue, host, host['sid'], - 'client',file_props) + client = Socks5ReceiverClient(self.idlequeue, host, host['sid'], + file_props) self.add_sockobj(client.account, client) host['idx'] = client.queue_idx # we still have chances to connect @@ -311,8 +311,13 @@ def send_file(self, file_props, account, type): for key in self.senders.keys(): + if isinstance(self.senders[key], Socks5SenderClient): + objtype = 'client' + else: + objtype = 'server' + if file_props['name'] in key and file_props['sid'] in key \ - and self.senders[key].mode == type: + and objtype == type: log.info("socks5: sending file") sender = self.senders[key] @@ -372,7 +377,7 @@ if self.type == 'sender' and \ not self.isHashInSockObjs(self.senders, sock_hash): - sockobj = Socks5Sender(self.idlequeue, sock_hash, self, 'server', + sockobj = Socks5SenderServer(self.idlequeue, sock_hash, self, sock[0], sock[1][0], sock[1][1], fingerprint='server', file_props=listener.file_props) self._add(sockobj, self.senders, listener.file_props, sock_hash) @@ -388,9 +393,9 @@ sh['initiator'] = None sh['target'] = None - sockobj = Socks5Receiver(idlequeue=self.idlequeue, + sockobj = Socks5ReceiverServer(idlequeue=self.idlequeue, streamhost=sh,sid=None, file_props=listener.file_props, - mode='server',fingerprint='server') + fingerprint='server') self._add(sockobj, self.readers, listener.file_props, sock_hash) @@ -429,10 +434,12 @@ self.idlequeue.remove_timeout(reader.fd) if do_disconnect: reader.disconnect() + break else: if reader.streamhost is not None: reader.streamhost['state'] = -1 del(self.readers[key]) + break def remove_sender(self, idx, do_disconnect=True): """ @@ -482,11 +489,6 @@ self.connected = False self.type = '' - def start_transfer(self): - """ - Must be implemented by subclass. - """ - pass def _is_connected(self): if self.state < 5: @@ -557,255 +559,6 @@ self.idlequeue.plug_idle(self, True, False) return 1 # we are connected - def svr_main(self): - """ - Initial requests for verifying the connection - """ - if self.state == 1: # initial read - buff = self.receive() - if not self.connected: - return -1 - mechs = self._parse_auth_buff(buff) - if mechs is None: - return -1 # invalid auth methods received - elif self.state == 3: # get next request - buff = self.receive() - req_type, self.sha_msg = self._parse_request_buff(buff)[:2] - if req_type != 0x01: - return -1 # request is not of type 'connect' - self.state += 1 # go to the next step - # unplug & plug for writing - self.idlequeue.plug_idle(self, True, False) - return None - - def clnt_main(self, timeout=0): - """ - Begin negotiation. on success 'address' != 0 - """ - result = 1 - buff = self.receive() - if buff == '': - # end connection - self.pollend() - return - - if self.state == 2: # read auth response - if buff is None or len(buff) != 2: - return None - version, method = struct.unpack('!BB', buff[:2]) - if version != 0x05 or method == 0xff: - self.disconnect() - elif self.state == 4: # get approve of our request - if buff is None: - return None - sub_buff = buff[:4] - if len(sub_buff) < 4: - return None - version, address_type = struct.unpack('!BxxB', buff[:4]) - addrlen = 0 - if address_type == 0x03: - addrlen = ord(buff[4]) - address = struct.unpack('!%ds' % addrlen, buff[5:addrlen + 5]) - portlen = len(buff[addrlen + 5:]) - if portlen == 1: - port, = struct.unpack('!B', buff[addrlen + 5]) - elif portlen == 2: - port, = struct.unpack('!H', buff[addrlen + 5:]) - else: # Gaim bug :) - port, = struct.unpack('!H', buff[addrlen + 5:addrlen + 7]) - self.remaining_buff = buff[addrlen + 7:] - self.state = 5 # for senders: init file_props and send '\n' - if self.queue.on_success: - result = self.queue.send_success_reply(self.file_props, - self.streamhost) - if self.type == 'sender' and self.proxy: - self.queue.process_result( self.send_file() - , self) - return - - if result == 0: - self.state = 8 - self.disconnect() - - # for senders: init file_props - if result == 1 and self.state == 5: - if self.file_props['type'] == 's': - self.file_props['error'] = 0 - self.file_props['disconnect_cb'] = self.disconnect - self.file_props['started'] = True - self.file_props['completed'] = False - self.file_props['paused'] = False - self.file_props['stalled'] = False - self.file_props['elapsed-time'] = 0 - self.file_props['last-time'] = self.idlequeue.current_time() - self.file_props['received-len'] = 0 - self.pauses = 0 - # start sending file contents to socket - #self.idlequeue.set_read_timeout(self.fd, STALLED_TIMEOUT) - #self.idlequeue.plug_idle(self, True, False) - self.idlequeue.plug_idle(self, False, False) - else: - # receiving file contents from socket - self.idlequeue.plug_idle(self, False, True) - - self.file_props['continue_cb'] = self.continue_paused_transfer - # we have set up the connection, next - retrieve file - self.state = 6 - if self.state < 5: - self.idlequeue.plug_idle(self, True, False) - self.state += 1 - return None - - def pollout(self): - if self.mode == 'client': - self.clnt_pollout() - elif self.mode == 'server': - self.svr_pollout() - - def svr_pollout(self): - if not self.connected: - self.disconnect() - return - self.idlequeue.remove_timeout(self.fd) - if self.state == 2: # send reply with desired auth type - self.send_raw(self._get_auth_response()) - elif self.state == 4: # send positive response to the 'connect' - self.send_raw(self._get_request_buff(self.sha_msg, 0x00)) - elif self.state == 7: - if self.file_props['paused']: - self.file_props['continue_cb'] = self.continue_paused_transfer - self.idlequeue.plug_idle(self, False, False) - return - result = self.start_transfer() # send - self.queue.process_result(result, self) - if result is None or result <= 0: - self.disconnect() - return - self.idlequeue.set_read_timeout(self.fd, STALLED_TIMEOUT) - elif self.state == 8: - self.disconnect() - return - else: - self.disconnect() - if self.state < 5: - self.state += 1 - # unplug and plug this time for reading - self.idlequeue.plug_idle(self, False, True) - - def clnt_pollout(self): - self.idlequeue.remove_timeout(self.fd) - try: - if self.state == 0: - self.do_connect() - return - elif self.state == 1: # send initially: version and auth types - self.send_raw(self._get_auth_buff()) - elif self.state == 3: # send 'connect' request - self.send_raw(self._get_request_buff(self._get_sha1_auth())) - elif self.file_props['type'] != 'r': - if self.file_props['paused']: - self.idlequeue.plug_idle(self, False, False) - return - result = self.start_transfer() # send - self.queue.process_result(result, self) - return - except (OpenSSL.SSL.WantReadError, OpenSSL.SSL.WantWriteError, - OpenSSL.SSL.WantX509LookupError), e: - log.info('caught SSL exception, ignored') - return - self.state += 1 - # unplug and plug for reading - self.idlequeue.plug_idle(self, False, True) - self.idlequeue.set_read_timeout(self.fd, CONNECT_TIMEOUT) -

1 0

gajim: remove plugins that have been move to gajim-plugins repro...
by Yann Leboulanger 16 Nov '11

16 Nov '11

changeset b43357c85e18 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b43357c85e18 description: remove plugins that have been move to gajim-plugins reprository diffstat: Makefile.am | 2 +- configure.ac | 1 - plugins/Makefile.am | 17 - plugins/banner_tweaks/__init__.py | 2 - plugins/banner_tweaks/config_dialog.ui | 75 -- plugins/banner_tweaks/manifest.ini | 10 - plugins/banner_tweaks/plugin.py | 194 ----- plugins/google_translation/__init__.py | 1 - plugins/google_translation/manifest.ini | 8 - plugins/google_translation/plugin.py | 284 -------- plugins/length_notifier/__init__.py | 2 - plugins/length_notifier/config_dialog.ui | 152 ---- plugins/length_notifier/length_notifier.py | 157 ---- plugins/length_notifier/manifest.ini | 9 - plugins/plugin_installer/__init__.py | 1 - plugins/plugin_installer/config_dialog.ui | 294 -------- plugins/plugin_installer/manifest.ini | 8 - plugins/plugin_installer/plugin_installer.py | 532 --------------- plugins/triggers/__init__.py | 1 - plugins/triggers/config_dialog.ui | 910 --------------------------- plugins/triggers/manifest.ini | 7 - plugins/triggers/triggers.py | 677 -------------------- plugins/whiteboard/__init__.py | 1 - plugins/whiteboard/brush_tool.png | 0 plugins/whiteboard/line_tool.png | 0 plugins/whiteboard/manifest.ini | 7 - plugins/whiteboard/oval_tool.png | 0 plugins/whiteboard/plugin.py | 483 -------------- plugins/whiteboard/whiteboard.png | 0 plugins/whiteboard/whiteboard_widget.py | 418 ------------ plugins/whiteboard/whiteboard_widget.ui | 192 ----- 31 files changed, 1 insertions(+), 4444 deletions(-) diffs (truncated from 4570 to 300 lines): diff -r b4316d026a26 -r b43357c85e18 Makefile.am --- a/Makefile.am Wed Nov 16 20:11:25 2011 +0100 +++ b/Makefile.am Wed Nov 16 21:26:36 2011 +0100 @@ -1,4 +1,4 @@ -SUBDIRS = src data plugins po icons +SUBDIRS = src data po icons ACLOCAL_AMFLAGS = -I m4 diff -r b4316d026a26 -r b43357c85e18 configure.ac --- a/configure.ac Wed Nov 16 20:11:25 2011 +0100 +++ b/configure.ac Wed Nov 16 21:26:36 2011 +0100 @@ -79,7 +79,6 @@ scripts/gajim-remote:scripts/gajim.in scripts/gajim-history-manager:scripts/gajim.in po/Makefile.in - plugins/Makefile ]) AC_OUTPUT echo " diff -r b4316d026a26 -r b43357c85e18 plugins/Makefile.am --- a/plugins/Makefile.am Wed Nov 16 20:11:25 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ -INCLUDES = \ - $(PYTHON_INCLUDES) - -gajimpluginsdir = $(gajim_pluginsdir) - -installedplugins = acronyms_expander banner_tweaks length_notifier plugin_installer triggers whiteboard - -installedpluginsfiles = $(wildcard ${srcdir}/${p}/*.py ${srcdir}/${p}/manifest.ini ${srcdir}/${p}/*.ui ${srcdir}/${p}/*.png) - -nobase_dist_gajimplugins_PYTHON = $(foreach p, ${installedplugins}, $(installedpluginsfiles)) - -EXTRA_DIST = \ - $(srcdir)/*/*.py \ - $(srcdir)/*/manifest.ini \ - $(srcdir)/*/*.ui - -MAINTAINERCLEANFILES = Makefile.in diff -r b4316d026a26 -r b43357c85e18 plugins/banner_tweaks/__init__.py --- a/plugins/banner_tweaks/__init__.py Wed Nov 16 20:11:25 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ - -from plugin import BannerTweaksPlugin diff -r b4316d026a26 -r b43357c85e18 plugins/banner_tweaks/config_dialog.ui --- a/plugins/banner_tweaks/config_dialog.ui Wed Nov 16 20:11:25 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,75 +0,0 @@ -<?xml version="1.0"?> -<interface> - <requires lib="gtk+" version="2.16"/> -  - <object class="GtkWindow" id="window1"> - <child> - <object class="GtkVBox" id="banner_tweaks_config_vbox"> - <property name="visible">True</property> - <property name="border_width">9</property> - <property name="orientation">vertical</property> - <property name="spacing">4</property> - <child> - <object class="GtkCheckButton" id="show_banner_image_checkbutton"> - <property name="label" translatable="yes">Display status icon</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">If checked, status icon will be displayed in chat window banner.</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_show_banner_image_checkbutton_toggled"/> - </object> - <packing> - <property name="expand">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="show_banner_online_msg_checkbutton"> - <property name="label" translatable="yes">Display status message of contact</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">If checked, status message of contact will be displayed in chat window banner.</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_show_banner_online_msg_checkbutton_toggled"/> - </object> - <packing> - <property name="expand">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="show_banner_resource_checkbutton"> - <property name="label" translatable="yes">Display resource name of contact</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">If checked, resource name of contact will be displayed in chat window banner.</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_show_banner_resource_checkbutton_toggled"/> - </object> - <packing> - <property name="expand">False</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="banner_small_fonts_checkbutton"> - <property name="label" translatable="yes">Use small fonts for contact name and resource name</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">If checked, smaller font will be used to display resource name and contact name in chat window banner.</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_banner_small_fonts_checkbutton_toggled"/> - </object> - <packing> - <property name="expand">False</property> - <property name="position">3</property> - </packing> - </child> - </object> - </child> - </object> -</interface> diff -r b4316d026a26 -r b43357c85e18 plugins/banner_tweaks/manifest.ini --- a/plugins/banner_tweaks/manifest.ini Wed Nov 16 20:11:25 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ -[info] -name: Banner Tweaks -short_name: banner_tweaks -version: 0.1 -description: Allows user to tweak chat window banner appearance (eg. make it compact). - Based on patch by pb in ticket #4133: - http://trac.gajim.org/attachment/ticket/4133. -authors = Mateusz Biliński <mateusz(a)bilinski.it> -homepage = http://blog.bilinski.it - diff -r b4316d026a26 -r b43357c85e18 plugins/banner_tweaks/plugin.py --- a/plugins/banner_tweaks/plugin.py Wed Nov 16 20:11:25 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,194 +0,0 @@ -# -*- coding: utf-8 -*- - -## This file is part of Gajim. -## -## Gajim is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published -## by the Free Software Foundation; version 3 only. -## -## Gajim is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. -## - -''' -Adjustable chat window banner. - -Includes tweaks to make it compact. - -Based on patch by pb in ticket #4133: -http://trac.gajim.org/attachment/ticket/4133/gajim-chatbanneroptions-svn10008.patch - -:author: Mateusz Biliński <mateusz(a)bilinski.it> -:since: 30 July 2008 -:copyright: Copyright (2008) Mateusz Biliński <mateusz(a)bilinski.it> -:license: GPL -''' - -import sys - -import gtk -import gobject -import message_control -from common import gajim -from common import helpers - -from plugins import GajimPlugin -from plugins.helpers import log, log_calls -from plugins.gui import GajimPluginConfigDialog - -class BannerTweaksPlugin(GajimPlugin): - - @log_calls('BannerTweaksPlugin') - def init(self): - self.description = _('Allows user to tweak chat window banner ' - 'appearance (eg. make it compact).\n' - 'Based on patch by pb in ticket #4133:\n' - 'http://trac.gajim.org/attachment/ticket/4133.') - self.config_dialog = BannerTweaksPluginConfigDialog(self) - - self.gui_extension_points = { - 'chat_control_base_draw_banner': (self.chat_control_base_draw_banner_called, - self.chat_control_base_draw_banner_deactivation) - } - - self.config_default_values = { - 'show_banner_image': (True, 'If True, Gajim will display a status icon in the banner of chat windows.'), - 'show_banner_online_msg': (True, 'If True, Gajim will display the status message of the contact in the banner of chat windows.'), - 'show_banner_resource': (False, 'If True, Gajim will display the resource name of the contact in the banner of chat windows.'), - 'banner_small_fonts': (False, 'If True, Gajim will use small fonts for contact name and resource name in the banner of chat windows.'), - 'old_chat_avatar_height': (52, 'chat_avatar_height value before plugin was activated'), - } - - @log_calls('BannerTweaksPlugin') - def activate(self): - self.config['old_chat_avatar_height'] = gajim.config.get('chat_avatar_height') - #gajim.config.set('chat_avatar_height', 28) - - @log_calls('BannerTweaksPlugin') - def deactivate(self): - gajim.config.set('chat_avatar_height', self.config['old_chat_avatar_height']) - - @log_calls('BannerTweaksPlugin') - def chat_control_base_draw_banner_called(self, chat_control): - if not self.config['show_banner_online_msg']: - chat_control.banner_status_label.hide() - chat_control.banner_status_label.set_no_show_all(True) - status_text = '' - chat_control.banner_status_label.set_markup(status_text) - - if not self.config['show_banner_image']: - if chat_control.TYPE_ID == message_control.TYPE_GC: - banner_status_img = chat_control.xml.get_object( - 'gc_banner_status_image') - else: - banner_status_img = chat_control.xml.get_object( - 'banner_status_image') - banner_status_img.clear() - - # TODO: part below repeats a lot of code from ChatControl.draw_banner_text() - # This could be rewritten using re module: getting markup text from - # banner_name_label and replacing some elements based on plugin config. - # Would it be faster? - if self.config['show_banner_resource'] or self.config['banner_small_fonts']: - banner_name_label = chat_control.xml.get_object('banner_name_label') - label_text = banner_name_label.get_label() - - contact = chat_control.contact - jid = contact.jid - - name = contact.get_shown_name() - if chat_control.resource: - name += '/' + chat_control.resource - elif contact.resource and self.config['show_banner_resource']: - name += '/' + contact.resource - - if chat_control.TYPE_ID == message_control.TYPE_PM: - name = _('%(nickname)s from group chat %(room_name)s') %\ - {'nickname': name, 'room_name': chat_control.room_name} - name = gobject.markup_escape_text(name) - - # We know our contacts nick, but if another contact has the same nick - # in another account we need to also display the account. - # except if we are talking to two different resources of the same contact - acct_info = '' - for account in gajim.contacts.get_accounts(): - if account == chat_control.account: - continue - if acct_info: # We already found a contact with same nick - break - for jid in gajim.contacts.get_jid_list(account): - other_contact_ = \ - gajim.contacts.get_first_contact_from_jid(account, jid) - if other_contact_.get_shown_name() == chat_control.contact.get_shown_name(): - acct_info = ' (%s)' % \ - gobject.markup_escape_text(chat_control.account) - break - - font_attrs, font_attrs_small = chat_control.get_font_attrs() - if self.config['banner_small_fonts']: - font_attrs = font_attrs_small - - st = gajim.config.get('displayed_chat_state_notifications') - cs = contact.chatstate - if cs and st in ('composing_only', 'all'): - if contact.show == 'offline': - chatstate = '' - elif st == 'all' or cs == 'composing': - chatstate = helpers.get_uf_chatstate(cs) - else: - chatstate = '' - - label_text = '%s%s %s' % \ - (font_attrs, name, font_attrs_small, acct_info, chatstate) - else: - # weight="heavy" size="x-large" - label_text = '%s%s' % \ - (font_attrs, name, font_attrs_small, acct_info) - - banner_name_label.set_markup(label_text) - - @log_calls('BannerTweaksPlugin') - def chat_control_base_draw_banner_deactivation(self, chat_control):

1 0

gajim: make google translation plugin work with unicode char
by Yann Leboulanger 16 Nov '11

16 Nov '11

changeset b4316d026a26 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b4316d026a26 description: make google translation plugin work with unicode char diffstat: plugins/google_translation/manifest.ini | 2 +- plugins/google_translation/plugin.py | 23 +++++++---------------- 2 files changed, 8 insertions(+), 17 deletions(-) diffs (80 lines): diff -r 4a42553b0be4 -r b4316d026a26 plugins/google_translation/manifest.ini --- a/plugins/google_translation/manifest.ini Wed Nov 16 17:52:19 2011 +0100 +++ b/plugins/google_translation/manifest.ini Wed Nov 16 20:11:25 2011 +0100 @@ -1,7 +1,7 @@ [info] name: Google Translation short_name: google_translation -version: 0.1 +version: 0.2 description: Translates (currently only incoming) messages using Google Translate. authors = Mateusz Biliński <mateusz(a)bilinski.it> homepage = http://blog.bilinski.it diff -r 4a42553b0be4 -r b4316d026a26 plugins/google_translation/plugin.py --- a/plugins/google_translation/plugin.py Wed Nov 16 17:52:19 2011 +0100 +++ b/plugins/google_translation/plugin.py Wed Nov 16 20:11:25 2011 +0100 @@ -26,12 +26,10 @@ :license: GPL ''' -import re +import json import urllib2 import HTMLParser -import new import gtk -from pprint import pformat from sys import getfilesystemencoding import chat_control @@ -43,7 +41,6 @@ from plugins import GajimPlugin from plugins.helpers import log_calls, log from common import ged -from common import nec languages = { _('Afrikaans'): 'af', @@ -127,9 +124,6 @@ } self.controls = [] - self.translated_text_re = re.compile( - r'google.language.callbacks.id100$\'22\', ' - '{(?P<text>[^\}]*)}, 200, null, 200$') @log_calls('GoogleTranslationPlugin') def translate_text(self, account, text, from_lang, to_lang): @@ -137,8 +131,8 @@ # Translate. quoted_text = urllib2.quote(text.encode(getfilesystemencoding())) # prepare url - translation_url = u'http://www.google.com/uds/Gtranslate?callback='\ - 'google.language.callbacks.id100&context=22&q=%(quoted_text)s&'\ + translation_url = u'https://ajax.googleapis.com/ajax/services/' \ + 'language/translate?q=%(quoted_text)s&' \ 'langpair=%(from_lang)s%%7C%(to_lang)s&key=notsupplied&v=1.0' % \ locals() @@ -146,17 +140,14 @@ if not results: return text - result = self.translated_text_re.search(results) - if not result: + result = json.loads(results) + + if result.get('responseStatus', '') != 200: return text - dict_ = eval('{' + result.group('text') + '}') - - translated_text = dict_.get('translatedText', '') - + translated_text = result['responseData'].get('translatedText', '') if translated_text: try: - translated_text = unicode(translated_text, 'unicode_escape') htmlparser = HTMLParser.HTMLParser() translated_text = htmlparser.unescape(translated_text) except Exception:

1 0

gajim: make google translate plugin work when from language is "...
by Yann Leboulanger 16 Nov '11

16 Nov '11

changeset 4a42553b0be4 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4a42553b0be4 description: make google translate plugin work when from language is "auto" diffstat: plugins/google_translation/plugin.py | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diffs (27 lines): diff -r 2bda011265b7 -r 4a42553b0be4 plugins/google_translation/plugin.py --- a/plugins/google_translation/plugin.py Wed Nov 16 17:51:42 2011 +0100 +++ b/plugins/google_translation/plugin.py Wed Nov 16 17:52:19 2011 +0100 @@ -129,7 +129,7 @@ self.controls = [] self.translated_text_re = re.compile( r'google.language.callbacks.id100$\'22\', ' - '{"translatedText":"(?P<text>[^"]*)"}, 200, null, 200$') + '{(?P<text>[^\}]*)}, 200, null, 200\)') @log_calls('GoogleTranslationPlugin') def translate_text(self, account, text, from_lang, to_lang): @@ -146,7 +146,13 @@ if not results: return text - translated_text = self.translated_text_re.search(results).group('text') + result = self.translated_text_re.search(results) + if not result: + return text + + dict_ = eval('{' + result.group('text') + '}') + + translated_text = dict_.get('translatedText', '') if translated_text: try:

1 0

gajim: use proxy if needed in google translation plugin. Fixes #...
by Yann Leboulanger 16 Nov '11

16 Nov '11

changeset 2bda011265b7 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2bda011265b7 description: use proxy if needed in google translation plugin. Fixes #7042 diffstat: plugins/google_translation/plugin.py | 20 ++++++-------------- 1 files changed, 6 insertions(+), 14 deletions(-) diffs (55 lines): diff -r d59fd0f99886 -r 2bda011265b7 plugins/google_translation/plugin.py --- a/plugins/google_translation/plugin.py Wed Nov 16 14:07:47 2011 +0100 +++ b/plugins/google_translation/plugin.py Wed Nov 16 17:51:42 2011 +0100 @@ -116,11 +116,7 @@ self.config_default_values = { 'per_jid_config': ({}, ''), - 'user_agent' : - (u'Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.12) ' - 'Gecko/20080213 Firefox/2.0.0.11', - u'User Agent data to be used with urllib2 ' - 'when connecting to Google Translate service')} + } self.events_handlers = {'decrypted-message-received': (ged.PREGUI, self._nec_decrypted_message_received)} @@ -136,25 +132,20 @@ '{"translatedText":"(?P<text>[^"]*)"}, 200, null, 200\)') @log_calls('GoogleTranslationPlugin') - def translate_text(self, text, from_lang, to_lang): + def translate_text(self, account, text, from_lang, to_lang): # Converts text so it can be used within URL as query to Google # Translate. quoted_text = urllib2.quote(text.encode(getfilesystemencoding())) # prepare url - headers = { 'User-Agent' : self.config['user_agent'] } translation_url = u'http://www.google.com/uds/Gtranslate?callback='\ 'google.language.callbacks.id100&context=22&q=%(quoted_text)s&'\ 'langpair=%(from_lang)s%%7C%(to_lang)s&key=notsupplied&v=1.0' % \ locals() - request = urllib2.Request(translation_url, headers=headers) - try: - response = urllib2.urlopen(request) - except urllib2.URLError, e: - # print e + results = helpers.download_image(account, {'src': translation_url})[0] + if not results: return text - results = response.read() translated_text = self.translated_text_re.search(results).group('text') if translated_text: @@ -177,7 +168,8 @@ return from_lang = self.config['per_jid_config'][obj.jid]['from'] to_lang = self.config['per_jid_config'][obj.jid]['to'] - translated_text = self.translate_text(obj.msgtxt, from_lang, to_lang) + translated_text = self.translate_text(obj.conn.name, obj.msgtxt, + from_lang, to_lang) if translated_text: obj.msgtxt = translated_text + '\n/' + _('Original text:') + '/ ' +\ obj.msgtxt

1 0

gajim: ability to enable and choose languages for google transla...
by Yann Leboulanger 16 Nov '11

16 Nov '11

changeset d59fd0f99886 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d59fd0f99886 description: ability to enable and choose languages for google translation plugin per jid. diffstat: plugins/google_translation/plugin.py | 191 +++++++++++++++++++++++++++++++++- 1 files changed, 184 insertions(+), 7 deletions(-) diffs (238 lines): diff -r 21770756e973 -r d59fd0f99886 plugins/google_translation/plugin.py --- a/plugins/google_translation/plugin.py Tue Nov 15 22:23:13 2011 +0300 +++ b/plugins/google_translation/plugin.py Wed Nov 16 14:07:47 2011 +0100 @@ -30,9 +30,13 @@ import urllib2 import HTMLParser import new +import gtk from pprint import pformat from sys import getfilesystemencoding +import chat_control +import groupchat_control + from common import helpers from common import gajim @@ -41,6 +45,67 @@ from common import ged from common import nec +languages = { + _('Afrikaans'): 'af', + _('Albanian'): 'sq', + _('Armenian'): 'hy', + _('Azerbaijani'): 'az', + _('Arabic'): 'ar', + _('Basque'): 'eu', + _('Belarusian'): 'be', + _('Bulgarian'): 'bg', + _('Catalan'): 'ca', + _('Chinese (Simplified)'): 'zh-cn', + _('Chinese (Traditional)'): 'zh-tw', + _('Croatian'): 'hr', + _('Czech'): 'cs', + _('Danish'): 'da', + _('Dutch'): 'nl', + _('English'): 'en', + _('Estonian'): 'et', + _('Filipino'): 'tl', + _('Finnish'): 'fi', + _('French'): 'fr', + _('Galician'): 'gl', + _('Georgian'): 'ka', + _('German'): 'de', + _('Greek'): 'el', + _('Haitian Creole'): 'ht', + _('Hebrew'): 'iw', + _('Hindi'): 'hi', + _('Hungarian'): 'hu', + _('Icelandic'): 'is', + _('Indonesian'): 'id', + _('Italian'): 'it', + _('Irish'): 'da', + _('Japanese'): 'ja', + _('Korean'): 'ko', + _('Latvian'): 'lv', + _('Lithuanian'): 'lt', + _('Macedonian'): 'mk', + _('Malay'): 'ml', + _('Maltese'): 'mt', + _('Norwegian'): 'no', + _('Persian'): 'fa', + _('Polish'): 'pl', + _('Portuguese'): 'pt-BR', + _('Romanian'): 'ro', + _('Russian'): 'ru', + _('Serbian'): 'sr', + _('Slovak'): 'sk', + _('Slovenian'): 'sl', + _('Spanish'): 'es', + _('Swahili'): 'sw', + _('Swedish'): 'sv', + _('Thai'): 'th', + _('Turkish'): 'tr', + _('Ukrainian'): 'uk', + _('Urdu'): 'ur', + _('Vietnamese'): 'vi', + _('Welsh'): 'cy', + _('Yiddish'): 'yi', +} + class GoogleTranslationPlugin(GajimPlugin): @log_calls('GoogleTranslationPlugin') @@ -50,10 +115,7 @@ self.config_dialog = None self.config_default_values = { - 'from_lang' : - (u'en', u'Language of text to be translated'), - 'to_lang' : - (u'fr', u'Language to which translation will be made'), + 'per_jid_config': ({}, ''), 'user_agent' : (u'Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.12) ' 'Gecko/20080213 Firefox/2.0.0.11', @@ -63,6 +125,12 @@ self.events_handlers = {'decrypted-message-received': (ged.PREGUI, self._nec_decrypted_message_received)} + self.gui_extension_points = { + 'chat_control_base' : (self.connect_with_control, + self.disconnect_from_control), + } + + self.controls = [] self.translated_text_re = re.compile( r'google.language.callbacks.id100$\'22\', ' '{"translatedText":"(?P<text>[^"]*)"}, 200, null, 200$') @@ -103,11 +171,16 @@ def _nec_decrypted_message_received(self, obj): if not obj.msgtxt: return - from_lang = self.config['from_lang'] - to_lang = self.config['to_lang'] + if obj.jid not in self.config['per_jid_config']: + return + if not self.config['per_jid_config'][obj.jid]['enabled']: + return + from_lang = self.config['per_jid_config'][obj.jid]['from'] + to_lang = self.config['per_jid_config'][obj.jid]['to'] translated_text = self.translate_text(obj.msgtxt, from_lang, to_lang) if translated_text: - obj.msgtxt = translated_text + obj.msgtxt = translated_text + '\n/' + _('Original text:') + '/ ' +\ + obj.msgtxt @log_calls('GoogleTranslationPlugin') def activate(self): @@ -116,3 +189,107 @@ @log_calls('GoogleTranslationPlugin') def deactivate(self): pass + + @log_calls('GoogleTranslationPlugin') + def connect_with_control(self, control): + base = Base(self, control) + self.controls.append(base) + + @log_calls('GoogleTranslationPlugin') + def disconnect_from_control(self, chat_control): + for base in self.controls: + base.disconnect_from_control() + self.controls = [] + +class Base(object): + def __init__(self, plugin, control): + self.plugin = plugin + self.control = control + self.contact = control.contact + self.account = control.account + self.jid = self.contact.jid + if self.jid in self.plugin.config['per_jid_config']: + self.config = self.plugin.config['per_jid_config'][self.jid] + else: + self.config = {'from': '', 'to': 'en', 'enabled': False} + self.create_buttons() + + def create_buttons(self): + if isinstance(self.control, chat_control.ChatControl): + vbox = self.control.xml.get_object('vbox106') + elif isinstance(self.control, groupchat_control.GroupchatControl): + vbox = self.control.xml.get_object('gc_textviews_vbox') + else: + return + + self.expander = gtk.Expander(_('Google translation')) + hbox = gtk.HBox(spacing=6) + self.expander.add(hbox) + label = gtk.Label(_('Translate from')) + hbox.pack_start(label, False, False) + liststore1 = gtk.ListStore(str, str) + liststore2 = gtk.ListStore(str, str) + cb1 = gtk.ComboBox(liststore1) + cb2 = gtk.ComboBox(liststore2) + cell = gtk.CellRendererText() + cb1.pack_start(cell, True) + cb1.add_attribute(cell, 'text', 0) + cell = gtk.CellRendererText() + cb2.pack_start(cell, True) + cb2.add_attribute(cell, 'text', 0) + #Language to translate from + liststore1.append([_('Auto'), '']) + if self.config['from'] == '': + cb1.set_active(0) + if self.config['from'] == '': + cb1.set_active(0) + i = 0 + ls = languages.items() + ls.sort() + for l in ls: + liststore1.append(l) + if l[1] == self.config['from']: + cb1.set_active(i+1) + liststore2.append(l) + if l[1] == self.config['to']: + cb2.set_active(i) + i += 1 + + hbox.pack_start(cb1, False, False) + label = gtk.Label(_('to')) + hbox.pack_start(label, False, False) + hbox.pack_start(cb2, False, False) + + cb = gtk.CheckButton(_('enable')) + if self.config['enabled']: + cb.set_active(True) + hbox.pack_start(cb, False, False) + vbox.pack_start(self.expander, False, False) + vbox.reorder_child(self.expander, 1) + + cb1.connect('changed', self.on_cb_changed, 'from') + cb2.connect('changed', self.on_cb_changed, 'to') + cb.connect('toggled', self.on_cb_toggled) + self.expander.show_all() + + def on_cb_changed(self, widget, option): + model = widget.get_model() + it = widget.get_active_iter() + self.config[option] = model[it][1] + self.plugin.config['per_jid_config'][self.jid] = self.config + self.plugin.config.save() + + def on_cb_toggled(self, widget): + self.config['enabled'] = widget.get_active() + self.plugin.config['per_jid_config'][self.jid] = self.config + self.plugin.config.save() + + def disconnect_from_control(self): + if isinstance(self.control, chat_control.ChatControl): + vbox = self.control.xml.get_object('vbox106') + elif isinstance(self.control, groupchat_control.GroupchatControl): + vbox = self.control.xml.get_object('gc_textviews_vbox') + else: + return + + vbox.remove(self.expander)

1 0

gajim: Russian translation updated
by Fomin Denis 15 Nov '11

15 Nov '11

changeset 21770756e973 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=21770756e973 description: Russian translation updated diffstat: po/ru.po | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diffs (42 lines): diff -r d84df889a8e6 -r 21770756e973 po/ru.po --- a/po/ru.po Tue Nov 15 12:09:39 2011 +0100 +++ b/po/ru.po Tue Nov 15 22:23:13 2011 +0300 @@ -13,7 +13,7 @@ "Project-Id-Version: ru\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-11-11 00:06+0400\n" -"PO-Revision-Date: 2011-11-11 00:17+0300\n" +"PO-Revision-Date: 2011-11-15 23:22+0300\n" "Last-Translator: Fomin Denis <fominde(a)mail.ru>\n" "Language-Team: Linux Support LLC\n" "Language: ru\n" @@ -984,7 +984,6 @@ msgstr "Пригласить _участников" #: ../data/gui/contact_context_menu.ui.h:8 -#, fuzzy msgid "M_anage Contact" msgstr "_Управление контактом" @@ -3289,19 +3288,16 @@ msgstr "%(name)s теперь %(status)s" #: ../src/chat_control.py:3196 -#, fuzzy msgid "File transfer" msgstr "Передача файлов" #: ../src/chat_control.py:3199 -#, fuzzy msgid "Size" -msgstr "Размер: %s" +msgstr "Размер" #: ../src/chat_control.py:3201 -#, fuzzy msgid "_Accept" -msgstr "Принять" +msgstr "_Принять" #: ../src/chat_control.py:3224 #: ../src/filetransfers_window.py:204

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits November 2011