Commits

commits@gajim.org

17632 discussions

gajim: merge
by Jefry Lagrange 16 Jun '12

16 Jun '12

changeset 0f13f6f2b647 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0f13f6f2b647 description: merge diffstat: src/common/config.py | 12 ++++++++++++ src/common/connection_handlers.py | 2 +- src/tooltips.py | 39 ++++++++++++++++++++++++--------------- 3 files changed, 37 insertions(+), 16 deletions(-) diffs (121 lines): diff -r 61f42e72a6fc -r 0f13f6f2b647 src/common/config.py --- a/src/common/config.py Sat Jun 16 18:41:33 2012 -0400 +++ b/src/common/config.py Sat Jun 16 18:46:21 2012 -0400 @@ -222,6 +222,18 @@ 'roster_avatar_height': [opt_int, 32], 'tooltip_avatar_width': [opt_int, 125], 'tooltip_avatar_height': [opt_int, 125], + 'tooltip_status_online_color': [opt_color, '#73D216'], + 'tooltip_status_free_for_chat_color': [opt_color, '#3465A4'], + 'tooltip_status_away_color': [opt_color, '#EDD400'], + 'tooltip_status_busy_color': [opt_color, '#F57900'], + 'tooltip_status_na_color': [opt_color, '#CC0000'], + 'tooltip_status_offline_color': [opt_color, '#555753'], + 'tooltip_affiliation_none_color': [opt_color, '#555753'], + 'tooltip_affiliation_member_color': [opt_color, '#73D216'], + 'tooltip_affiliation_administrator_color': [opt_color, '#F57900'], + 'tooltip_affiliation_owner_color': [opt_color, '#CC0000'], + 'tooltip_account_name_color': [opt_color, '#888A85'], + 'tooltip_idle_color': [opt_color, '#888A85'], 'vcard_avatar_width': [opt_int, 200], 'vcard_avatar_height': [opt_int, 200], 'notification_preview_message': [opt_bool, True, _('Preview new messages in notification popup?')], diff -r 61f42e72a6fc -r 0f13f6f2b647 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sat Jun 16 18:41:33 2012 -0400 +++ b/src/common/connection_handlers.py Sat Jun 16 18:46:21 2012 -0400 @@ -2024,7 +2024,7 @@ def _StreamCB(self, con, obj): log.debug('StreamCB') gajim.nec.push_incoming_event(StreamReceivedEvent(None, - conn=self, stanza=iq_obj)) + conn=self, stanza=obj)) def _register_handlers(self, con, con_type): # try to find another way to register handlers in each class diff -r 61f42e72a6fc -r 0f13f6f2b647 src/tooltips.py --- a/src/tooltips.py Sat Jun 16 18:41:33 2012 -0400 +++ b/src/tooltips.py Sat Jun 16 18:46:21 2012 -0400 @@ -181,18 +181,21 @@ semantics. Color palette is the Tango. """ formatted = "%s" + color = None if status.startswith(Q_("?user status:Available")): - status = formatted % ('#73D216', status) + color = gajim.config.get('tooltip_status_online_color') elif status.startswith(_("Free for Chat")): - status = formatted % ('#3465A4', status) + color = gajim.config.get('tooltip_status_free_for_chat_color') elif status.startswith(_("Away")): - status = formatted % ('#EDD400', status) + color = gajim.config.get('tooltip_status_away_color') elif status.startswith(_("Busy")): - status = formatted % ('#F57900', status) + color = gajim.config.get('tooltip_status_busy_color') elif status.startswith(_("Not Available")): - status = formatted % ('#CC0000', status) + color = gajim.config.get('tooltip_status_na_color') elif status.startswith(_("Offline")): - status = formatted % ('#555753', status) + color = gajim.config.get('tooltip_status_offline_color') + if color: + status = formatted % (color, status) return status @staticmethod @@ -202,14 +205,17 @@ it's semantics. Color palette is the Tango. """ formatted = "%s" + color = None if affiliation.startswith(Q_("?Group Chat Contact Affiliation:None")): - affiliation = formatted % ('#555753', affiliation) + color = gajim.conig.get('tooltip_affiliation_none_color') elif affiliation.startswith(_("Member")): - affiliation = formatted % ('#73D216', affiliation) + color = gajim.conig.get('tooltip_affiliation_member_color') elif affiliation.startswith(_("Administrator")): - affiliation = formatted % ('#F57900', affiliation) + color = gajim.conig.get('tooltip_affiliation_administrator_color') elif affiliation.startswith(_("Owner")): - affiliation = formatted % ('#CC0000', affiliation) + color = gajim.conig.get('tooltip_affiliation_owner_color') + if color: + affiliation = formatted % (color, affiliation) return affiliation class StatusTable: @@ -493,9 +499,9 @@ gobject.markup_escape_text(prim_contact.get_shown_name())\ + '' if gajim.config.get('mergeaccounts'): - name_markup += u" (" + \ - gobject.markup_escape_text(prim_contact.account.name) \ - + ')' + name_markup += u" (%s)" % ( + gajim.config.get('tooltip_account_name_color'), + gobject.markup_escape_text(prim_contact.account.name)) if self.account and helpers.jid_is_blocked(self.account, prim_contact.jid): @@ -528,7 +534,8 @@ iconset = gajim.config.get('iconset') if not iconset: iconset = 'dcraven' - file_path = os.path.join(helpers.get_iconset_path(iconset), '16x16') + file_path = os.path.join(helpers.get_iconset_path(iconset), + '16x16') contact_keys = sorted(contacts_dict.keys()) contact_keys.reverse() @@ -641,7 +648,9 @@ # is no meaningful difference between last activity time and # current time. if diff.days > 0 or diff.seconds > 0: - cs = "%s" + cs = "" % gajim.config.get( + 'tooltip_idle_color') + cs += '%s' properties.append((str(), None)) properties.append(((cs % _("Idle since %s")) % formatted, None)) properties.append(((cs % _("Idle for %s")) % str(diff), None))

1 0

gajim: send files to gc peer. Fixes #7171
by Jefry Lagrange 16 Jun '12

16 Jun '12

changeset 61f42e72a6fc in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=61f42e72a6fc description: send files to gc peer. Fixes #7171 diffstat: src/chat_control.py | 5 +++-- src/common/contacts.py | 34 ++++++++++++++++++++++++++++++---- src/common/jingle.py | 4 ++++ src/common/jingle_ft.py | 9 ++++++++- src/common/jingle_transport.py | 2 ++ 5 files changed, 47 insertions(+), 7 deletions(-) diffs (129 lines): diff -r 8c3223cea458 -r 61f42e72a6fc src/chat_control.py --- a/src/chat_control.py Wed Jun 13 17:17:45 2012 +0400 +++ b/src/chat_control.py Sat Jun 16 18:41:33 2012 -0400 @@ -1722,8 +1722,9 @@ self._video_button.set_sensitive(self.video_available) # Send file - if (self.contact.supports(NS_FILE) or self.contact.supports(NS_JINGLE_FILE_TRANSFER)) and (self.type_id == 'chat' or \ - self.gc_contact.resource): + if (self.contact.supports(NS_FILE) or \ + self.contact.supports(NS_JINGLE_FILE_TRANSFER)) or \ + self.type_id == 'chat' or self.gc_contact.resource: self._send_file_button.set_sensitive(True) self._send_file_button.set_tooltip_text('') else: diff -r 8c3223cea458 -r 61f42e72a6fc src/common/contacts.py --- a/src/common/contacts.py Wed Jun 13 17:17:45 2012 +0400 +++ b/src/common/contacts.py Sat Jun 16 18:41:33 2012 -0400 @@ -28,10 +28,13 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## - -from common import caps_cache -from common.account import Account -import common.gajim +try: + from common import caps_cache + from common.account import Account + import common.gajim +except ImportError, e: + if __name__ != "__main__": + raise ImportError(e) class XMPPEntity(object): """ @@ -411,6 +414,9 @@ def get_gc_contact(self, account, room_jid, nick): return self._accounts[account].gc_contacts.get_gc_contact(room_jid, nick) + def is_gc_contact(self, account, jid): + return self._accounts[account].gc_contacts.is_gc_contact(jid) + def get_nb_role_total_gc_contacts(self, account, room_jid, role): return self._accounts[account].gc_contacts.get_nb_role_total_gc_contacts(room_jid, role) @@ -564,6 +570,21 @@ return None return self._rooms[room_jid][nick] + def is_gc_contact(self, jid): + """ + >>> gc = GC_Contacts() + >>> gc._rooms = {'gajim(a)conference.gajim.org' : {'test' : True}} + >>> gc.is_gc_contact('gajim(a)conference.gajim.org/test') + True + >>> gc.is_gc_contact('test(a)jabbim.com') + False + """ + jid = jid.split('/') + if len(jid) != 2: + return False + gcc = self.get_gc_contact(jid[0], jid[1]) + return gcc != None + def get_nb_role_total_gc_contacts(self, room_jid, role): """ Return the number of group chat contacts for the given role and the total @@ -827,3 +848,8 @@ """ family.sort(cmp=self._compare_metacontacts) return family[-1] + + +if __name__ == "__main__": + import doctest + doctest.testmod() diff -r 8c3223cea458 -r 61f42e72a6fc src/common/jingle.py --- a/src/common/jingle.py Wed Jun 13 17:17:45 2012 +0400 +++ b/src/common/jingle.py Sat Jun 16 18:41:33 2012 -0400 @@ -145,6 +145,10 @@ logger.info("start file transfer with file: %s" % file_props) contact = gajim.contacts.get_contact_with_highest_priority(self.name, gajim.get_jid_without_resource(jid)) + if gajim.contacts.is_gc_contact(self.name,jid): + gcc = jid.split('/') + if len(gcc) == 2: + contact = gajim.contacts.get_gc_contact(self.name, gcc[0], gcc[1]) if contact is None: return use_security = contact.supports(xmpp.NS_JINGLE_XTLS) diff -r 8c3223cea458 -r 61f42e72a6fc src/common/jingle_ft.py --- a/src/common/jingle_ft.py Wed Jun 13 17:17:45 2012 +0400 +++ b/src/common/jingle_ft.py Sat Jun 16 18:41:33 2012 -0400 @@ -19,6 +19,7 @@ Handles Jingle File Transfer (XEP 0234) """ +import hashlib import gajim import xmpp from jingle_content import contents, JingleContent @@ -97,7 +98,13 @@ self.session = session self.media = 'file' self.nominated_cand = {} - + if gajim.contacts.is_gc_contact(session.connection.name, + session.peerjid): + roomjid = session.peerjid.split('/')[0] + dstaddr = hashlib.sha1('%s%s%s' % (self.file_props['sid'], + session.ourjid, + roomjid)).hexdigest() + self.file_props['dstaddr'] = dstaddr self.state = STATE_NOT_STARTED self.states = {STATE_INITIALIZED : StateInitialized(self), STATE_CAND_SENT : StateCandSent(self), diff -r 8c3223cea458 -r 61f42e72a6fc src/common/jingle_transport.py --- a/src/common/jingle_transport.py Wed Jun 13 17:17:45 2012 +0400 +++ b/src/common/jingle_transport.py Sat Jun 16 18:41:33 2012 -0400 @@ -132,6 +132,8 @@ transport = xmpp.Node('transport') transport.setNamespace(xmpp.NS_JINGLE_BYTESTREAM) transport.setAttr('sid', self.sid) + if 'dstaddr' in self.file_props: + transport.setAttr('dstaddr', self.file_props['dstaddr']) return transport def parse_transport_stanza(self, transport):

1 0

gajim: make tooltip colors configurable. Fixes #7165
by Yann Leboulanger 16 Jun '12

16 Jun '12

changeset 31c837c4e8c9 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=31c837c4e8c9 description: make tooltip colors configurable. Fixes #7165 diffstat: src/common/config.py | 12 ++++++++++++ src/tooltips.py | 39 ++++++++++++++++++++++++--------------- 2 files changed, 36 insertions(+), 15 deletions(-) diffs (109 lines): diff -r 4b8e79f6938c -r 31c837c4e8c9 src/common/config.py --- a/src/common/config.py Sat Jun 16 13:51:54 2012 +0200 +++ b/src/common/config.py Sat Jun 16 22:58:46 2012 +0200 @@ -222,6 +222,18 @@ 'roster_avatar_height': [opt_int, 32], 'tooltip_avatar_width': [opt_int, 125], 'tooltip_avatar_height': [opt_int, 125], + 'tooltip_status_online_color': [opt_color, '#73D216'], + 'tooltip_status_free_for_chat_color': [opt_color, '#3465A4'], + 'tooltip_status_away_color': [opt_color, '#EDD400'], + 'tooltip_status_busy_color': [opt_color, '#F57900'], + 'tooltip_status_na_color': [opt_color, '#CC0000'], + 'tooltip_status_offline_color': [opt_color, '#555753'], + 'tooltip_affiliation_none_color': [opt_color, '#555753'], + 'tooltip_affiliation_member_color': [opt_color, '#73D216'], + 'tooltip_affiliation_administrator_color': [opt_color, '#F57900'], + 'tooltip_affiliation_owner_color': [opt_color, '#CC0000'], + 'tooltip_account_name_color': [opt_color, '#888A85'], + 'tooltip_idle_color': [opt_color, '#888A85'], 'vcard_avatar_width': [opt_int, 200], 'vcard_avatar_height': [opt_int, 200], 'notification_preview_message': [opt_bool, True, _('Preview new messages in notification popup?')], diff -r 4b8e79f6938c -r 31c837c4e8c9 src/tooltips.py --- a/src/tooltips.py Sat Jun 16 13:51:54 2012 +0200 +++ b/src/tooltips.py Sat Jun 16 22:58:46 2012 +0200 @@ -181,18 +181,21 @@ semantics. Color palette is the Tango. """ formatted = "%s" + color = None if status.startswith(Q_("?user status:Available")): - status = formatted % ('#73D216', status) + color = gajim.config.get('tooltip_status_online_color') elif status.startswith(_("Free for Chat")): - status = formatted % ('#3465A4', status) + color = gajim.config.get('tooltip_status_free_for_chat_color') elif status.startswith(_("Away")): - status = formatted % ('#EDD400', status) + color = gajim.config.get('tooltip_status_away_color') elif status.startswith(_("Busy")): - status = formatted % ('#F57900', status) + color = gajim.config.get('tooltip_status_busy_color') elif status.startswith(_("Not Available")): - status = formatted % ('#CC0000', status) + color = gajim.config.get('tooltip_status_na_color') elif status.startswith(_("Offline")): - status = formatted % ('#555753', status) + color = gajim.config.get('tooltip_status_offline_color') + if color: + status = formatted % (color, status) return status @staticmethod @@ -202,14 +205,17 @@ it's semantics. Color palette is the Tango. """ formatted = "%s" + color = None if affiliation.startswith(Q_("?Group Chat Contact Affiliation:None")): - affiliation = formatted % ('#555753', affiliation) + color = gajim.conig.get('tooltip_affiliation_none_color') elif affiliation.startswith(_("Member")): - affiliation = formatted % ('#73D216', affiliation) + color = gajim.conig.get('tooltip_affiliation_member_color') elif affiliation.startswith(_("Administrator")): - affiliation = formatted % ('#F57900', affiliation) + color = gajim.conig.get('tooltip_affiliation_administrator_color') elif affiliation.startswith(_("Owner")): - affiliation = formatted % ('#CC0000', affiliation) + color = gajim.conig.get('tooltip_affiliation_owner_color') + if color: + affiliation = formatted % (color, affiliation) return affiliation class StatusTable: @@ -493,9 +499,9 @@ gobject.markup_escape_text(prim_contact.get_shown_name())\ + '' if gajim.config.get('mergeaccounts'): - name_markup += u" (" + \ - gobject.markup_escape_text(prim_contact.account.name) \ - + ')' + name_markup += u" (%s)" % ( + gajim.config.get('tooltip_account_name_color'), + gobject.markup_escape_text(prim_contact.account.name)) if self.account and helpers.jid_is_blocked(self.account, prim_contact.jid): @@ -528,7 +534,8 @@ iconset = gajim.config.get('iconset') if not iconset: iconset = 'dcraven' - file_path = os.path.join(helpers.get_iconset_path(iconset), '16x16') + file_path = os.path.join(helpers.get_iconset_path(iconset), + '16x16') contact_keys = sorted(contacts_dict.keys()) contact_keys.reverse() @@ -641,7 +648,9 @@ # is no meaningful difference between last activity time and # current time. if diff.days > 0 or diff.seconds > 0: - cs = "%s" + cs = "" % gajim.config.get( + 'tooltip_idle_color') + cs += '%s' properties.append((str(), None)) properties.append(((cs % _("Idle since %s")) % formatted, None)) properties.append(((cs % _("Idle for %s")) % str(diff), None))

1 0

gajim: fix typo. Fixes #7161
by Yann Leboulanger 16 Jun '12

16 Jun '12

changeset 4b8e79f6938c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4b8e79f6938c description: fix typo. Fixes #7161 diffstat: src/common/connection_handlers.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 8c3223cea458 -r 4b8e79f6938c src/common/connection_handlers.py --- a/src/common/connection_handlers.py Wed Jun 13 17:17:45 2012 +0400 +++ b/src/common/connection_handlers.py Sat Jun 16 13:51:54 2012 +0200 @@ -2024,7 +2024,7 @@ def _StreamCB(self, con, obj): log.debug('StreamCB') gajim.nec.push_incoming_event(StreamReceivedEvent(None, - conn=self, stanza=iq_obj)) + conn=self, stanza=obj)) def _register_handlers(self, con, con_type): # try to find another way to register handlers in each class

1 0

gajim: handle ft_send_local_ips option with jingle FT
by Yann Leboulanger 14 Jun '12

14 Jun '12

changeset 9d43ef511f51 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9d43ef511f51 description: handle ft_send_local_ips option with jingle FT diffstat: src/common/jingle_transport.py | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diffs (49 lines): diff -r 8c052a48f991 -r 9d43ef511f51 src/common/jingle_transport.py --- a/src/common/jingle_transport.py Thu Jun 14 12:45:11 2012 -0400 +++ b/src/common/jingle_transport.py Thu Jun 14 19:46:17 2012 +0200 @@ -78,7 +78,7 @@ Return the list of transport candidates from a transport stanza """ return [] - + def set_connection(self, conn): self.connection = conn if not self.sid: @@ -89,7 +89,7 @@ def set_our_jid(self, jid): self.ourjid = jid - + def set_sid(self, sid): self.sid = sid @@ -168,6 +168,9 @@ self.candidates.append(cand) def _add_local_ips_as_candidates(self): + if not gajim.config.get_per('accounts', self.connection.name, + 'ft_send_local_ips'): + return if not self.connection: return local_ip_cand = [] @@ -259,7 +262,7 @@ self.file_props.session_sid) if sesn is None: return - + iq = xmpp.Iq(to=proxy['jid'], frm=self.ourjid, typ='set') auth_id = "au_" + proxy['sid'] iq.setID(auth_id) @@ -321,7 +324,7 @@ transport.setAttr('block-size', self.block_sz) transport.setAttr('sid', self.sid) return transport - + try: import farstream except Exception:

1 0

gajim: minor fixes
by Jefry Lagrange 14 Jun '12

14 Jun '12

changeset 8c052a48f991 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8c052a48f991 description: minor fixes diffstat: src/common/file_props.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 12b831df9681 -r 8c052a48f991 src/common/file_props.py --- a/src/common/file_props.py Thu Jun 14 18:43:47 2012 +0200 +++ b/src/common/file_props.py Thu Jun 14 12:45:11 2012 -0400 @@ -134,6 +134,7 @@ self.fd = None self.startexmpp = None self.session_type = None + self.request_id = None def getsid(self): # Getter of the property sid

1 0

gajim: some typo + disable Jingle FT for the moment
by Yann Leboulanger 14 Jun '12

14 Jun '12

changeset 12b831df9681 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=12b831df9681 description: some typo + disable Jingle FT for the moment diffstat: src/common/protocol/bytestream.py | 2 +- src/filetransfers_window.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diffs (48 lines): diff -r 09b7322ab266 -r 12b831df9681 src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Thu Jun 14 18:34:07 2012 +0200 +++ b/src/common/protocol/bytestream.py Thu Jun 14 18:43:47 2012 +0200 @@ -216,7 +216,7 @@ self.connection.send(iq) def _siResultCB(self, con, iq_obj): - file_props = FilesProp.getFileProp(con.name, iq_obj.getAttr('id')) + file_props = FilesProp.getFileProp(self.name, iq_obj.getAttr('id')) if not file_props: return if file_props.request_id: diff -r 09b7322ab266 -r 12b831df9681 src/filetransfers_window.py --- a/src/filetransfers_window.py Thu Jun 14 18:34:07 2012 +0200 +++ b/src/filetransfers_window.py Thu Jun 14 18:43:47 2012 +0200 @@ -250,11 +250,11 @@ def show_hash_error(self, jid, file_props, account): def on_yes(dummy): # Request the file to the sender - sid = gajim.connections[account].start_file_transfer(jid, - file_props, + sid = gajim.connections[account].start_file_transfer(jid, + file_props, True) file_props.sid = sid - + if file_props.type_ == 'r': file_name = os.path.basename(file_props.file_name) @@ -336,7 +336,7 @@ file_path, file_name, file_desc) if file_props is None: return False - if contact.supports(NS_JINGLE_FILE_TRANSFER): + if contact.supports(NS_JINGLE_FILE_TRANSFER) and False: log.info("contact %s supports jingle file transfer"%(contact.get_full_jid())) gajim.connections[account].start_file_transfer(contact.get_full_jid(), file_props) @@ -574,7 +574,7 @@ gajim.events.remove_events(account, jid, event) gajim.interface.roster.draw_contact(jid, account) gajim.interface.roster.show_title() - FilesProp.deleteFileProp(files_props) + FilesProp.deleteFileProp(file_props) del(file_props) def set_progress(self, typ, sid, transfered_size, iter_=None):

1 0

gajim: jingle IBB and normal IBB are different
by Yann Leboulanger 14 Jun '12

14 Jun '12

changeset 09b7322ab266 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=09b7322ab266 description: jingle IBB and normal IBB are different diffstat: src/common/connection_handlers_events.py | 36 +++++++++++++++++++------------ src/common/protocol/bytestream.py | 14 ++++++------ src/common/xmpp/protocol.py | 28 ++++++++++++------------ 3 files changed, 43 insertions(+), 35 deletions(-) diffs (196 lines): diff -r d2bdd3a5f1f2 -r 09b7322ab266 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Thu Jun 14 12:27:23 2012 -0400 +++ b/src/common/connection_handlers_events.py Thu Jun 14 18:34:07 2012 +0200 @@ -1978,6 +1978,21 @@ self.file_props.stream_methods = xmpp.NS_BYTESTREAM file_tag = self.jingle_content.getTag('description').getTag( 'offer').getTag('file') + for child in file_tag.getChildren(): + name = child.getName() + val = child.getData() + if val is None: + continue + if name == 'name': + self.file_props.name = val + if name == 'size': + self.file_props.size = val + if name == 'hash': + self.file_props.algo = child.getAttr('algo') + self.file_props.hash_ = val + if name == 'date': + self.file_props.date = val + else: profile = si.getAttr('profile') if profile != xmpp.NS_FILE: @@ -2002,20 +2017,13 @@ typ='stream') raise xmpp.NodeProcessed file_tag = si.getTag('file') - for child in file_tag.getChildren(): - name = child.getName() - val = child.getData() - if val is None: - continue - if name == 'name': - self.file_props.name = val - if name == 'size': - self.file_props.size = val - if name == 'hash': - self.file_props.algo = child.getAttr('algo') - self.file_props.hash_ = val - if name == 'date': - self.file_props.date = val + for name, val in file_tag.getAttrs().items(): + if val is None: + continue + if name == 'name': + self.file_props.name = val + if name == 'size': + self.file_props.size = val file_desc_tag = file_tag.getTag('desc') if file_desc_tag is not None: self.file_props.desc = file_desc_tag.getData() diff -r d2bdd3a5f1f2 -r 09b7322ab266 src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Thu Jun 14 12:27:23 2012 -0400 +++ b/src/common/protocol/bytestream.py Thu Jun 14 18:34:07 2012 +0200 @@ -569,7 +569,7 @@ err.setData(msg) self.connection.send(iq) if code == 404: - file_props = FilesProp.getFileProp(self.name, sid) + file_props = FilesProp.getFileProp(self.name, sid) if file_props is not None: self.disconnect_transfer(file_props) file_props.error = -3 @@ -584,7 +584,7 @@ """ if not self.connection or self.connected < 2: return - file_props = FilesProp.getFileProp(self.connection, proxy['sid']) + file_props = FilesProp.getFileProp(self.connection, proxy['sid']) iq = xmpp.Iq(to=proxy['initiator'], typ='set') auth_id = "au_" + proxy['sid'] iq.setID(auth_id) @@ -617,7 +617,7 @@ id_ = unicode(iq_obj.getAttr('id')) query = iq_obj.getTag('query') sid = unicode(query.getAttr('sid')) - file_props = FilesProp.getFileProp(self.name, sid) + file_props = FilesProp.getFileProp(self.name, sid) streamhosts = [] for item in query.getChildren(): if item.getName() == 'streamhost': @@ -780,14 +780,14 @@ blocksize = stanza.getTagAttr('open', 'block-size') log.debug('StreamOpenHandler called sid->%s blocksize->%s' % (sid, blocksize)) - file_props = FilesProp.getFileProp(self.name, sid) + file_props = FilesProp.getFileProp(self.name, sid) try: blocksize = int(blocksize) except: err = xmpp.ERR_BAD_REQUEST if not sid or not blocksize: err = xmpp.ERR_BAD_REQUEST - elif not file_props: + elif not file_props: err = xmpp.ERR_UNEXPECTED_REQUEST if err: rep = xmpp.Error(stanza, err) @@ -900,8 +900,8 @@ seq = '' data = '' err = None - file_props = FilesProp.getFileProp(self.name, sid) - if file_props is None: + file_props = FilesProp.getFileProp(self.name, sid) + if file_props is None: err = xmpp.ERR_ITEM_NOT_FOUND else: if not data: diff -r d2bdd3a5f1f2 -r 09b7322ab266 src/common/xmpp/protocol.py --- a/src/common/xmpp/protocol.py Thu Jun 14 12:27:23 2012 -0400 +++ b/src/common/xmpp/protocol.py Thu Jun 14 18:34:07 2012 +0200 @@ -167,7 +167,7 @@ NS_HASHES_SHA1 = 'urn:xmpp:hash-function-textual-names:sha-1' NS_HASHES_SHA256 = 'urn:xmpp:hash-function-textual-names:sha-256' NS_HASHES_SHA512 = 'urn:xmpp:hash-function-textual-names:sha-512' - + xmpp_stream_error_conditions = ''' bad-format -- -- -- The entity has sent XML that cannot be processed. bad-namespace-prefix -- -- -- The entity has sent a namespace prefix that is unsupported, or has sent no namespace prefix on an element that requires such a prefix. @@ -1037,12 +1037,12 @@ attrs={'id': self.getID()}) iq.setQuery(self.getQuery().getName()).setNamespace(self.getQueryNS()) return iq - -class Hashes(Node): + +class Hashes(Node): """ Hash elements for various XEPs as defined in XEP-300 """ - + """ RECOMENDED HASH USE: Algorithm Support @@ -1053,14 +1053,14 @@ SHA-256 MUST SHA-512 SHOULD """ - + supported = ('md5', 'sha-1', 'sha-256', 'sha-512') - + def __init__(self, nsp=NS_HASHES): Node.__init__(self, None, {}, [], None, None, False, None) self.setNamespace(nsp) self.setName('hash') - + def calculateHash(self, algo, file_string): """ Calculate the hash and add it. It is preferable doing it here @@ -1078,12 +1078,12 @@ hl = hashlib.sha256() elif algo == 'sha-512': hl = hashlib.sha512() - + if hl: hl.update(file_string) hash_ = hl.hexdigest() else: # if it is a file - + if algo == 'md5': hl = hashlib.md5() elif algo == 'sha-1': @@ -1092,18 +1092,18 @@ hl = hashlib.sha256() elif algo == 'sha-512': hl = hashlib.sha512() - + if hl: for line in file_string: hl.update(line) hash_ = hl.hexdigest() - - return hash_ - + + return hash_ + def addHash(self, hash_, algo): self.setAttr('algo', algo) self.setData(hash_) - + class Acks(Node): """ Acknowledgement elements for Stream Management

1 0

gajim: file_props refactoring
by Jefry Lagrange 14 Jun '12

14 Jun '12

changeset d2bdd3a5f1f2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d2bdd3a5f1f2 description: file_props refactoring diffstat: src/chat_control.py | 18 +- src/common/connection_handlers_events.py | 99 +++--- src/common/file_props.py | 153 ++++++++++ src/common/jingle.py | 2 +- src/common/jingle_content.py | 16 +- src/common/jingle_ft.py | 46 +- src/common/jingle_ftstates.py | 43 +- src/common/jingle_transport.py | 18 +- src/common/protocol/bytestream.py | 448 ++++++++++++++---------------- src/common/proxy65_manager.py | 15 +- src/common/socks5.py | 389 ++++++++++++-------------- src/filetransfers_window.py | 273 +++++++++--------- src/gui_interface.py | 109 +++---- src/tooltips.py | 49 +- 14 files changed, 875 insertions(+), 803 deletions(-) diffs (truncated from 3333 to 300 lines): diff -r e7832358c2e3 -r d2bdd3a5f1f2 src/chat_control.py --- a/src/chat_control.py Sun Jun 10 17:08:54 2012 -0400 +++ b/src/chat_control.py Thu Jun 14 12:27:23 2012 -0400 @@ -3203,11 +3203,11 @@ """ Show an InfoBar on top of control """ - markup = '%s: %s' % (_('File transfer'), file_props['name']) - if 'desc' in file_props and file_props['desc']: - markup += ' (%s)' % file_props['desc'] + markup = '%s: %s' % (_('File transfer'), file_props.name) + if file_props.desc: + markup += ' (%s)' % file_props.desc markup += '\n%s: %s' % (_('Size'), helpers.convert_bytes( - file_props['size'])) + file_props.size)) b1 = gtk.Button(_('_Accept')) b1.connect('clicked', self._on_accept_file_request, file_props) b2 = gtk.Button(stock=gtk.STOCK_CANCEL) @@ -3216,9 +3216,7 @@ gtk.MESSAGE_QUESTION) def _on_open_ft_folder(self, widget, file_props): - if 'file-name' not in file_props: - return - path = os.path.split(file_props['file-name'])[0] + path = os.path.split(file_props.file_name)[0] if os.path.exists(path) and os.path.isdir(path): helpers.launch_file_manager(path) ev = self._get_file_props_event(file_props, 'file-completed') @@ -3232,9 +3230,9 @@ def _got_file_completed(self, file_props): markup = '%s: %s' % (_('File transfer completed'), - file_props['name']) - if 'desc' in file_props and file_props['desc']: - markup += ' (%s)' % file_props['desc'] + file_props.name) + if file_props.desc: + markup += ' (%s)' % file_props.desc b1 = gtk.Button(_('_Open Containing Folder')) b1.connect('clicked', self._on_open_ft_folder, file_props) b2 = gtk.Button(stock=gtk.STOCK_OK) diff -r e7832358c2e3 -r d2bdd3a5f1f2 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sun Jun 10 17:08:54 2012 -0400 +++ b/src/common/connection_handlers_events.py Thu Jun 14 12:27:23 2012 -0400 @@ -37,6 +37,7 @@ from common.pep import SUPPORTED_PERSONAL_USER_EVENTS from common.xmpp.protocol import NS_CHATSTATES from common.jingle_transport import JingleTransportSocks5 +from common.file_props import FilesProp import gtkgui_helpers @@ -1940,16 +1941,44 @@ self.get_id() self.fjid = self.conn._ft_get_from(self.stanza) self.jid = gajim.get_jid_without_resource(self.fjid) - self.file_props = {'type': 'r'} - self.file_props['sender'] = self.fjid - self.file_props['request-id'] = self.id_ if self.jingle_content: - self.file_props['session-type'] = 'jingle' - self.file_props['stream-methods'] = xmpp.NS_BYTESTREAM + self.FT_content.use_security = bool(self.jingle_content.getTag( + 'security')) + if not self.FT_content.transport: + self.FT_content.transport = JingleTransportSocks5() + self.FT_content.transport.set_our_jid( + self.FT_content.session.ourjid) + self.FT_content.transport.set_connection( + self.FT_content.session.connection) + sid = self.FT_content.transport.sid + self.file_props = FilesProp.getNewFileProp(self.conn.name, sid) + self.file_props.session_sid = unicode( + self.stanza.getTag('jingle').getAttr('sid') + ) + self.FT_content.file_props = self.file_props + self.FT_content.transport.set_file_props(self.file_props) + if self.file_props.streamhosts: + self.file_props.streamhosts.extend( + self.FT_content.transport.remote_candidates) + else: + self.file_props.streamhosts = \ + self.FT_content.transport.remote_candidates + for host in self.file_props.streamhosts: + host['initiator'] = self.FT_content.session.initiator + host['target'] = self.FT_content.session.responder + else: + si = self.stanza.getTag('si') + self.file_props = FilesProp.getNewFileProp(self.conn.name, + unicode(si.getAttr('id')) + ) + self.file_props.sender = self.fjid + self.file_props.request_id = self.id_ + if self.jingle_content: + self.file_props.session_type = 'jingle' + self.file_props.stream_methods = xmpp.NS_BYTESTREAM file_tag = self.jingle_content.getTag('description').getTag( 'offer').getTag('file') else: - si = self.stanza.getTag('si') profile = si.getAttr('profile') if profile != xmpp.NS_FILE: self.conn.send_file_rejection(self.file_props, code='400', @@ -1965,7 +1994,7 @@ for f in self.dataform.iter_fields(): if f.var == 'stream-method' and f.type == 'list-single': values = [o[1] for o in f.options] - self.file_props['stream-methods'] = ' '.join(values) + self.file_props.stream_methods = ' '.join(values) if xmpp.NS_BYTESTREAM in values or xmpp.NS_IBB in values: break else: @@ -1975,54 +2004,30 @@ file_tag = si.getTag('file') for child in file_tag.getChildren(): name = child.getName() - if name in ('name', 'size', 'hash', 'date'): - val = child.getData() - if val is None: - continue - self.file_props[name] = val - # Delete this, it shouldn't be necesary after file_props gets - # refactored. - if name == 'hash': - self.file_props['algo'] = child.getAttr('algo') + val = child.getData() + if val is None: + continue + if name == 'name': + self.file_props.name = val + if name == 'size': + self.file_props.size = val + if name == 'hash': + self.file_props.algo = child.getAttr('algo') + self.file_props.hash_ = val + if name == 'date': + self.file_props.date = val file_desc_tag = file_tag.getTag('desc') if file_desc_tag is not None: - self.file_props['desc'] = file_desc_tag.getData() + self.file_props.desc = file_desc_tag.getData() if not self.jingle_content: mime_type = si.getAttr('mime-type') if mime_type is not None: - self.file_props['mime-type'] = mime_type + self.file_props.mime_type = mime_type - self.file_props['receiver'] = self.conn._ft_get_our_jid() - self.file_props['transfered_size'] = [] - if self.jingle_content: - self.FT_content.use_security = bool(self.jingle_content.getTag( - 'security')) - self.file_props['session-sid'] = unicode(self.stanza.getTag( - 'jingle').getAttr('sid')) + self.file_props.receiver = self.conn._ft_get_our_jid() + self.file_props.transfered_size = [] - self.FT_content.file_props = self.file_props - if not self.FT_content.transport: - self.FT_content.transport = JingleTransportSocks5() - self.FT_content.transport.set_our_jid( - self.FT_content.session.ourjid) - self.FT_content.transport.set_connection( - self.FT_content.session.connection) - self.file_props['sid'] = self.FT_content.transport.sid - self.FT_content.session.connection.files_props[ - self.file_props['sid']] = self.file_props - self.FT_content.transport.set_file_props(self.file_props) - if self.file_props.has_key('streamhosts'): - self.file_props['streamhosts'].extend( - self.FT_content.transport.remote_candidates) - else: - self.file_props['streamhosts'] = \ - self.FT_content.transport.remote_candidates - for host in self.file_props['streamhosts']: - host['initiator'] = self.FT_content.session.initiator - host['target'] = self.FT_content.session.responder - else: - self.file_props['sid'] = unicode(si.getAttr('id')) return True class FileRequestErrorEvent(nec.NetworkIncomingEvent): diff -r e7832358c2e3 -r d2bdd3a5f1f2 src/common/file_props.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/common/file_props.py Thu Jun 14 12:27:23 2012 -0400 @@ -0,0 +1,153 @@ +""" +This module is in charge of taking care of all the infomation related to +individual files. Files are identified by the account name and its sid. + + +>>> print FilesProp.getFileProp('jabberid', '10') +None +>>> fp = FilesProp() +Traceback (most recent call last): + ... +Exception: this class should not be instatiated +>>> print FilesProp.getAllFileProp() +[] +>>> fp = FilesProp.getNewFileProp('jabberid', '10') +>>> fp2 = FilesProp.getFileProp('jabberid', '10') +>>> fp == fp2 +True +""" + +class FilesProp: + _files_props = {} + + def __init__(self): + raise Exception('this class should not be instatiated') + + @classmethod + def getNewFileProp(cls, account, sid): + fp = FileProp(account, sid) + cls.setFileProp(fp, account, sid) + return fp + + @classmethod + def getFileProp(cls, account, sid): + if (account, sid) in cls._files_props.keys(): + return cls._files_props[account, sid] + + @classmethod + def getFilePropByAccount(cls, account): + # Returns a list of file_props in one account + file_props = [] + for account, sid in cls._files_props: + if account == account: + file_props.append(cls._files_props[account, sid]) + return file_props + + @classmethod + def getFilePropByType(cls, type_, sid): + # This method should be deleted. Getting fileprop by type and sid is not + # unique enough. More than one fileprop might have the same type and sid + files_prop = cls.getAllFileProp() + for fp in files_prop: + if fp.type_ == type_ and fp.sid == sid: + return fp + + @classmethod + def getFilePropBySid(cls, sid): + # This method should be deleted. It is kept to make things compatible + # This method should be replaced and instead get the file_props by + # account and sid + files_prop = cls.getAllFileProp() + for fp in files_prop: + if fp.sid == sid: + return fp + + @classmethod + def getAllFileProp(cls): + return cls._files_props.values() + + @classmethod + def setFileProp(cls, fp, account, sid): + cls._files_props[account, sid] = fp + + @classmethod + def deleteFileProp(cls, file_prop): + files_props = cls._files_props + a = s = None + for account, sid in files_props: + fp = files_props[account, sid] + if fp is file_prop: + a = account + s = sid + if a != None and s != None: + del files_props[a, s] + + +class FileProp(object): + + def __init__(self, account, sid): + # Do not instatiate this class directly. Call FilesProp.getNeFileProp + # instead + self.streamhosts = [] + self.transfered_size = [] + self.started = False + self.completed = False + self.paused = False + self.stalled = False + self.connected = False + self.stopped = False + self.is_a_proxy = False + self.proxyhost = None + self.proxy_sender = None + self.proxy_receiver = None + self.streamhost_used = None + # method callback called in case of transfer failure + self.failure_cb = None + # method callback called when disconnecting + self.disconnect_cb = None + self.continue_cb = None + self.sha_str = None + # transfer type: 's' for sending and 'r' for receiving + self.type_ = None

1 0

gajim: [Schnouki ] using paint_shadow() rather than paint_flat_b...
by Fomin Denis 13 Jun '12

13 Jun '12

changeset 8c3223cea458 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8c3223cea458 description: [Schnouki ] using paint_shadow() rather than paint_flat_box() to add these borders/shadows. Fixes #5899 diffstat: src/tooltips.py | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diffs (20 lines): diff -r e7832358c2e3 -r 8c3223cea458 src/tooltips.py --- a/src/tooltips.py Sun Jun 10 17:08:54 2012 -0400 +++ b/src/tooltips.py Wed Jun 13 17:17:45 2012 +0400 @@ -135,14 +135,8 @@ def expose(self, widget, event): style = self.win.get_style() size = self.win.get_size() - style.paint_flat_box(self.win.window, gtk.STATE_NORMAL, gtk.SHADOW_OUT, - None, self.win, 'tooltip', 0, 0, -1, 1) - style.paint_flat_box(self.win.window, gtk.STATE_NORMAL, gtk.SHADOW_OUT, - None, self.win, 'tooltip', 0, size[1] - 1, -1, 1) - style.paint_flat_box(self.win.window, gtk.STATE_NORMAL, gtk.SHADOW_OUT, - None, self.win, 'tooltip', 0, 0, 1, -1) - style.paint_flat_box(self.win.window, gtk.STATE_NORMAL, gtk.SHADOW_OUT, - None, self.win, 'tooltip', size[0] - 1, 0, 1, -1) + style.paint_shadow(self.win.window, gtk.STATE_NORMAL, gtk.SHADOW_OUT, + None, self.win, 'tooltip', 0, 0, size[0], size[1]) return True def show_tooltip(self, data, widget_height, widget_y_position):

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits