Commits August 2012

commits@gajim.org

3 participants
152 discussions

gajim: missing commit
by Yann Leboulanger 24 Aug '12

24 Aug '12

changeset 59be13833475 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=59be13833475 description: missing commit diffstat: src/common/connection_handlers.py | 4 ++++ src/gui_interface.py | 1 - 2 files changed, 4 insertions(+), 1 deletions(-) diffs (25 lines): diff -r a80a9012088f -r 59be13833475 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Fri Aug 24 09:50:50 2012 +0200 +++ b/src/common/connection_handlers.py Fri Aug 24 10:13:55 2012 +0200 @@ -1043,6 +1043,10 @@ gajim.nec.push_incoming_event(GcInvitationReceivedEvent(None, conn=self, msg_obj=obj)) return True + elif obj.decline_tag is not None: + gajim.nec.push_incoming_event(GcDeclineReceivedEvent(None, + conn=self, msg_obj=obj)) + return True # process and dispatch an error message def dispatch_error_message(self, msg, msgtxt, session, frm, tim): diff -r a80a9012088f -r 59be13833475 src/gui_interface.py --- a/src/gui_interface.py Fri Aug 24 09:50:50 2012 +0200 +++ b/src/gui_interface.py Fri Aug 24 10:13:55 2012 +0200 @@ -625,7 +625,6 @@ def handle_event_gc_invitation(self, obj): #('GC_INVITATION', (room_jid, jid_from, reason, password, is_continued)) - jid = gajim.get_jid_without_resource(obj.jid_from) account = obj.conn.name if helpers.allow_popup_window(account) or not self.systray_enabled: dialogs.InvitationReceivedDialog(account, obj.room_jid,

1 0

gajim: fix var name
by Yann Leboulanger 24 Aug '12

24 Aug '12

changeset a80a9012088f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a80a9012088f description: fix var name diffstat: src/dialogs.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 59e1207ca9eb -r a80a9012088f src/dialogs.py --- a/src/dialogs.py Fri Aug 24 09:37:40 2012 +0200 +++ b/src/dialogs.py Fri Aug 24 09:50:50 2012 +0200 @@ -4482,7 +4482,7 @@ sectext = _('$Contact has invited you to group chat %(room_jid)s')\ % {'room_jid': room_jid} contact = gajim.contacts.get_first_contact_from_jid(account, jid) - contact_text = contact and contact.name or contact_jid + contact_text = contact and contact.name or jid sectext = sectext.replace('$Contact', contact_text) if comment: # only if not None and not ''

1 0

gajim: send decline to the same jid (bare or full) from which we...
by Yann Leboulanger 24 Aug '12

24 Aug '12

changeset 59e1207ca9eb in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=59e1207ca9eb description: send decline to the same jid (bare or full) from which we received he invite diffstat: src/dialogs.py | 14 ++++++++------ src/gui_interface.py | 11 ++++++----- 2 files changed, 14 insertions(+), 11 deletions(-) diffs (71 lines): diff -r a3784e043e77 -r 59e1207ca9eb src/dialogs.py --- a/src/dialogs.py Fri Aug 24 09:27:31 2012 +0200 +++ b/src/dialogs.py Fri Aug 24 09:37:40 2012 +0200 @@ -4463,14 +4463,16 @@ PrivacyListWindow(self.account, name, 'EDIT') class InvitationReceivedDialog: - def __init__(self, account, room_jid, contact_jid, password=None, - comment=None, is_continued=False): + def __init__(self, account, room_jid, contact_fjid, password=None, + comment=None, is_continued=False): self.room_jid = room_jid self.account = account self.password = password self.is_continued = is_continued - self.contact_jid = contact_jid + self.contact_fjid = contact_fjid + + jid = gajim.get_jid_without_resource(contact_fjid) pritext = _('''You are invited to a groupchat''') #Don't translate $Contact @@ -4478,8 +4480,8 @@ sectext = _('$Contact has invited you to join a discussion') else: sectext = _('$Contact has invited you to group chat %(room_jid)s')\ - % {'room_jid': room_jid} - contact = gajim.contacts.get_first_contact_from_jid(account, contact_jid) + % {'room_jid': room_jid} + contact = gajim.contacts.get_first_contact_from_jid(account, jid) contact_text = contact and contact.name or contact_jid sectext = sectext.replace('$Contact', contact_text) @@ -4501,7 +4503,7 @@ def on_no(text): gajim.connections[account].decline_invitation(self.room_jid, - self.contact_jid, text) + self.contact_fjid, text) YesNoDialog(pritext, sectext, text_label=_('Reason:'), on_response_yes=on_yes, on_response_no=on_no) diff -r a3784e043e77 -r 59e1207ca9eb src/gui_interface.py --- a/src/gui_interface.py Fri Aug 24 09:27:31 2012 +0200 +++ b/src/gui_interface.py Fri Aug 24 09:37:40 2012 +0200 @@ -628,18 +628,19 @@ jid = gajim.get_jid_without_resource(obj.jid_from) account = obj.conn.name if helpers.allow_popup_window(account) or not self.systray_enabled: - dialogs.InvitationReceivedDialog(account, obj.room_jid, jid, - obj.password, obj.reason, is_continued=obj.is_continued) + dialogs.InvitationReceivedDialog(account, obj.room_jid, + obj.jid_from, obj.password, obj.reason, + is_continued=obj.is_continued) return - self.add_event(account, jid, 'gc-invitation', (obj.room_jid, + self.add_event(account, obj.jid_from, 'gc-invitation', (obj.room_jid, obj.reason, obj.password, obj.is_continued)) if helpers.allow_showing_notification(account): path = gtkgui_helpers.get_icon_path('gajim-gc_invitation', 48) event_type = _('Groupchat Invitation') - notify.popup(event_type, jid, account, 'gc-invitation', path, - event_type, obj.room_jid) + notify.popup(event_type, obj.jid_from, account, 'gc-invitation', + path, event_type, obj.room_jid) def forget_gpg_passphrase(self, keyid): if keyid in self.gpg_passphrase:

1 0

gajim: print decline reason in groupchat
by Yann Leboulanger 24 Aug '12

24 Aug '12

changeset a3784e043e77 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a3784e043e77 description: print decline reason in groupchat diffstat: src/gui_interface.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r cd07cd473ab3 -r a3784e043e77 src/gui_interface.py --- a/src/gui_interface.py Fri Aug 24 09:14:08 2012 +0200 +++ b/src/gui_interface.py Fri Aug 24 09:27:31 2012 +0200 @@ -620,8 +620,8 @@ gc_control = self.msg_win_mgr.get_gc_control(obj.room_jid, account) if gc_control: gc_control.print_conversation( - _('%(jid)s declined the invitation') % {'jid': obj.room_jid}, - graphics=False) + _('%(jid)s declined the invitation: %(reason)s') % { + 'jid': obj.room_jid, 'reason': obj.reason}, graphics=False) def handle_event_gc_invitation(self, obj): #('GC_INVITATION', (room_jid, jid_from, reason, password, is_continued))

1 0

gajim: don't call GTK functions inside a Thread.
by Yann Leboulanger 24 Aug '12

24 Aug '12

changeset cd07cd473ab3 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=cd07cd473ab3 description: don't call GTK functions inside a Thread. diffstat: src/gui_interface.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diffs (21 lines): diff -r 24193ae70518 -r cd07cd473ab3 src/gui_interface.py --- a/src/gui_interface.py Fri Aug 24 10:36:21 2012 +0400 +++ b/src/gui_interface.py Fri Aug 24 09:14:08 2012 +0200 @@ -954,13 +954,13 @@ # then the file is not corrupt jid = unicode(file_props.sender) if session.file_hash == hash_: - self.popup_ft_result(account, jid, file_props) - ft_win.set_status(file_props, 'ok') + gobject.idle_add(self.popup_ft_result, account, jid, file_props) + gobject.idle_add(ft_win.set_status, file_props, 'ok') else: # wrong hash, we need to get the file again! file_props.error = -10 - self.popup_ft_result(account, jid, file_props) - ft_win.set_status(file_props, 'hash_error') + gobject.idle_add(self.popup_ft_result, account, jid, file_props) + gobject.idle_add(ft_win.set_status, file_props, 'hash_error') # End jingle session if session: session.end_session()

1 0

gajim: merge
by Fomin Denis 24 Aug '12

24 Aug '12

changeset 24193ae70518 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=24193ae70518 description: merge

1 0

gajim: typo
by Fomin Denis 24 Aug '12

24 Aug '12

changeset 037a10dda218 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=037a10dda218 description: typo diffstat: src/dialogs.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (15 lines): diff -r e00cf699baf7 -r 037a10dda218 src/dialogs.py --- a/src/dialogs.py Thu Aug 23 22:11:21 2012 +0200 +++ b/src/dialogs.py Fri Aug 24 10:33:46 2012 +0400 @@ -1662,9 +1662,9 @@ *self.user_response_yes[1:]) else: if self.textview: + self.user_response_yes(self.is_checked(), txt) + else: self.user_response_yes(self.is_checked()) - else: - self.user_response_yes(self.is_checked(), txt) self.call_cancel_on_destroy = False self.destroy()

1 0

gajim: commenting debugging code
by Jefry Lagrange 24 Aug '12

24 Aug '12

changeset 0aa5291d7952 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0aa5291d7952 description: commenting debugging code diffstat: src/common/jingle_ft.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r f1130d95de15 -r 0aa5291d7952 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Thu Aug 23 23:16:25 2012 -0400 +++ b/src/common/jingle_ft.py Thu Aug 23 23:24:43 2012 -0400 @@ -147,7 +147,7 @@ h = xmpp.Hashes() hash_ = h.calculateHash(self.session.hash_algo, file_) # DEBUG - hash_ = '1294809248109223' + #hash_ = '1294809248109223' if not hash_: # Hash alogrithm not supported return

1 0

gajim: get file_tag from file request
by Jefry Lagrange 24 Aug '12

24 Aug '12

changeset f1130d95de15 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f1130d95de15 description: get file_tag from file request diffstat: src/common/connection_handlers_events.py | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diffs (17 lines): diff -r 9c654f640243 -r f1130d95de15 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Thu Aug 23 22:42:59 2012 -0400 +++ b/src/common/connection_handlers_events.py Thu Aug 23 23:16:25 2012 -0400 @@ -2006,8 +2006,11 @@ 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') + desc = self.jingle_content.getTag('description') + if desc.getTag('offer'): + file_tag = desc.getTag('offer').getTag('file') + else: + file_tag = desc.getTag('request').getTag('file') for child in file_tag.getChildren(): name = child.getName() val = child.getData()

1 0

gajim: use contact with highest priority when requesting file
by Jefry Lagrange 24 Aug '12

24 Aug '12

changeset 9c654f640243 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9c654f640243 description: use contact with highest priority when requesting file diffstat: src/filetransfers_window.py | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diffs (23 lines): diff -r 6e9d371624df -r 9c654f640243 src/filetransfers_window.py --- a/src/filetransfers_window.py Thu Aug 23 17:53:17 2012 -0400 +++ b/src/filetransfers_window.py Thu Aug 23 22:42:59 2012 -0400 @@ -248,14 +248,17 @@ self.tree.get_selection().unselect_all() 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, + contact = gajim.contacts.get_contact_with_highest_priority(account, + jid) + fjid = contact.get_full_jid() + sid = gajim.connections[account].start_file_transfer(fjid, file_props, True) file_props.sid = sid - if file_props.type_ == 'r': file_name = os.path.basename(file_props.file_name) else:

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
16
Older →

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 August 2012