Commits July 2010

commits@gajim.org

7 participants
83 discussions

gajim: correctly set join muc dialog when we select one in brows...
by Yann Leboulanger 22 Jul '10

22 Jul '10

changeset 3c932e59075b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3c932e59075b description: correctly set join muc dialog when we select one in browse muc dilog. diffstat: src/disco.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r 04225bffbd4a -r 3c932e59075b src/disco.py --- a/src/disco.py Thu Jul 22 20:56:50 2010 +0200 +++ b/src/disco.py Thu Jul 22 22:09:11 2010 +0200 @@ -1843,6 +1843,8 @@ except GajimGeneralException: pass else: + gajim.interface.instances[self.account]['join_gc']._set_room_jid( + service) gajim.interface.instances[self.account]['join_gc'].window.present() self.window.destroy(chain = True)

1 0

gajim: improve connection time. Fixes #5764
by Yann Leboulanger 22 Jul '10

22 Jul '10

changeset 04225bffbd4a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=04225bffbd4a description: improve connection time. Fixes #5764 diffstat: src/common/logger.py | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diffs (39 lines): diff -r b6cc6e1b3ae5 -r 04225bffbd4a src/common/logger.py --- a/src/common/logger.py Thu Jul 22 17:55:52 2010 +0200 +++ b/src/common/logger.py Thu Jul 22 20:56:50 2010 +0200 @@ -941,12 +941,13 @@ for jid in roster: self.add_or_update_contact(account_jid, jid, roster[jid]['name'], roster[jid]['subscription'], roster[jid]['ask'], - roster[jid]['groups']) + roster[jid]['groups'], commit=False) + self.con.commit() # At this point, we are sure the replacement works properly so we can # set the new roster_version value. gajim.config.set_per('accounts', account_name, 'roster_version', - roster_version) + roster_version) def del_contact(self, account_jid, jid): """ @@ -965,7 +966,8 @@ (account_jid_id, jid_id)) self.con.commit() - def add_or_update_contact(self, account_jid, jid, name, sub, ask, groups): + def add_or_update_contact(self, account_jid, jid, name, sub, ask, groups, + commit=True): """ Add or update a contact from account_jid roster """ @@ -996,7 +998,8 @@ (account_jid_id, jid_id, name, self.convert_human_subscription_values_to_db_api_values(sub), bool(ask))) - self.con.commit() + if commit: + self.con.commit() def get_roster(self, account_jid): """

1 0

gajim: use setattr insted of __dict__
by Yann Leboulanger 22 Jul '10

22 Jul '10

changeset b6cc6e1b3ae5 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b6cc6e1b3ae5 description: use setattr insted of __dict__ diffstat: src/adhoc_commands.py | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diffs (23 lines): diff -r d7f4d6f11d3a -r b6cc6e1b3ae5 src/adhoc_commands.py --- a/src/adhoc_commands.py Thu Jul 22 17:42:35 2010 +0200 +++ b/src/adhoc_commands.py Thu Jul 22 17:55:52 2010 +0200 @@ -64,13 +64,12 @@ self.window.connect('delete-event', self.on_adhoc_commands_window_delete_event) for name in ('restart_button', 'back_button', 'forward_button', - 'execute_button', 'finish_button', 'close_button', - 'stages_notebook', 'retrieving_commands_stage_vbox', - 'command_list_stage_vbox', 'command_list_vbox', - 'sending_form_stage_vbox', 'sending_form_progressbar', - 'notes_label', 'no_commands_stage_vbox', 'error_stage_vbox', - 'error_description_label'): - self.__dict__[name] = self.xml.get_object(name) + 'execute_button', 'finish_button', 'close_button', 'stages_notebook', + 'retrieving_commands_stage_vbox', 'command_list_stage_vbox', + 'command_list_vbox', 'sending_form_stage_vbox', + 'sending_form_progressbar', 'notes_label', 'no_commands_stage_vbox', + 'error_stage_vbox', 'error_description_label'): + setattr(self, name, self.xml.get_object(name)) self.initiate()

1 0

gajim: missing commit of adhoc commnds ui file
by Yann Leboulanger 22 Jul '10

22 Jul '10

changeset d7f4d6f11d3a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d7f4d6f11d3a description: missing commit of adhoc commnds ui file diffstat: data/gui/adhoc_commands_window.ui | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diffs (34 lines): diff -r a7da929a5b65 -r d7f4d6f11d3a data/gui/adhoc_commands_window.ui --- a/data/gui/adhoc_commands_window.ui Wed Jul 21 20:15:47 2010 +0200 +++ b/data/gui/adhoc_commands_window.ui Thu Jul 22 17:42:35 2010 +0200 @@ -423,6 +423,21 @@ </packing> </child> <child> + <object class="GtkButton" id="finish_button"> + <property name="label" translatable="yes">F_inish</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="on_finish_button_clicked"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">4</property> + </packing> + </child> + <child> <object class="GtkButton" id="close_button"> <property name="label">gtk-close</property> <property name="visible">True</property> @@ -435,7 +450,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">4</property> + <property name="position">5</property> </packing> </child> </object>

1 0

gajim: if peer does not include a security element in content no...
by fantasticsid＠lagaule.org 22 Jul '10

22 Jul '10

changeset 0236f8351a82 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0236f8351a82 description: if peer does not include a security element in content node, set use_security to false diffstat: src/common/jingle_ft.py | 11 +++++++++++ src/common/protocol/bytestream.py | 2 -- 2 files changed, 11 insertions(+), 2 deletions(-) diffs (40 lines): diff -r b2905309c9de -r 0236f8351a82 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Thu Jul 22 15:05:06 2010 +0800 +++ b/src/common/jingle_ft.py Thu Jul 22 16:20:14 2010 +0800 @@ -92,6 +92,12 @@ file_props['session-type'] = 'jingle' + security = content.getTag('security') + if not security: + self.use_security = False + else: + self.use_security = True + file_tag = content.getTag('description').getTag('offer').getTag('file') for attribute in file_tag.getAttrs(): if attribute in ('name', 'size', 'hash', 'date'): @@ -130,6 +136,11 @@ def __on_session_accept(self, stanza, content, error, action): log.info("__on_session_accept") + + security = content.getTag('security') + if not security: # responder can not verify our fingerprint + self.use_security = False + def __on_session_terminate(self, stanza, content, error, action): log.info("__on_session_terminate") diff -r b2905309c9de -r 0236f8351a82 src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Thu Jul 22 15:05:06 2010 +0800 +++ b/src/common/protocol/bytestream.py Thu Jul 22 16:20:14 2010 +0800 @@ -135,8 +135,6 @@ session = self.get_jingle_session(file_props['sender'], file_props['sid']) if not session: return - jid = gajim.get_jid_without_resource(file_props['sender']) - resource = gajim.get_resource_from_jid(file_props['sender']) sid = file_props['sid'] gajim.socks5queue.add_file_props(self.name, file_props)

1 0

gajim: if the peer supports jingle XTLS, send session-initiate w...
by fantasticsid＠lagaule.org 22 Jul '10

22 Jul '10

changeset b2905309c9de in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b2905309c9de description: if the peer supports jingle XTLS, send session-initiate with security element diffstat: src/common/jingle.py | 17 +++++++++++++++-- src/common/jingle_ft.py | 13 ++++++++++++- 2 files changed, 27 insertions(+), 3 deletions(-) diffs (77 lines): diff -r 9e412f39e787 -r b2905309c9de src/common/jingle.py --- a/src/common/jingle.py Mon Jul 19 14:21:01 2010 +0800 +++ b/src/common/jingle.py Thu Jul 22 15:05:06 2010 +0800 @@ -36,6 +36,7 @@ from jingle_session import JingleSession, JingleStates from jingle_rtp import JingleAudio, JingleVideo from jingle_ft import JingleFileTransfer +import gajim import logging logger = logging.getLogger('gajim.c.jingle') @@ -140,14 +141,26 @@ def start_file_transfer(self, jid, file_props): logger.info("start file transfer with file: %s" % file_props) jingle = self.get_jingle_session(jid, media='file') + contact = gajim.contacts.get_contact_with_highest_priority(self.name, + gajim.get_jid_without_resource(jid)) + if contact is None: + return + if contact.supports(xmpp.NS_JINGLE_XTLS): + use_security = True + else: + use_security = False if jingle: file_props['sid'] = jingle.sid - jingle.add_content('file', JingleFileTransfer(jingle, file_props)) + jingle.add_content('file', + JingleFileTransfer(jingle, file_props = file_props, use_security=use_security) + ) else: jingle = JingleSession(self, weinitiate=True, jid=jid) self.__sessions[jingle.sid] = jingle file_props['sid'] = jingle.sid - jingle.add_content('file', JingleFileTransfer(jingle, file_props=file_props)) + jingle.add_content('file', + JingleFileTransfer(jingle, file_props=file_props, use_security=use_security) + ) jingle.start_session() return jingle.sid diff -r 9e412f39e787 -r b2905309c9de src/common/jingle_ft.py --- a/src/common/jingle_ft.py Mon Jul 19 14:21:01 2010 +0800 +++ b/src/common/jingle_ft.py Thu Jul 22 15:05:06 2010 +0800 @@ -37,7 +37,7 @@ STATE_PROXY_ACTIVATED = 4 class JingleFileTransfer(JingleContent): - def __init__(self, session, transport=None, file_props=None): + def __init__(self, session, transport=None, file_props=None, use_security=False): JingleContent.__init__(self, session, transport) log.info("transport value: %s" % transport) @@ -54,6 +54,8 @@ self.state = STATE_NOT_STARTED + self.use_security = use_security + self.file_props = file_props if file_props is None: self.weinitiate = False @@ -246,6 +248,15 @@ desc.setData(self.file_props['desc']) description_node.addChild(node=sioffer) + + if self.use_security: + security = xmpp.simplexml.Node(tag=xmpp.NS_JINGLE_XTLS + ' security') + # TODO: add fingerprint element + for m in ('x509', ): # supported authentication methods + method = xmpp.simplexml.Node(tag='method') + method.setAttr('name', m) + security.addChild(node=method) + content.addChild(node=security) content.addChild(node=description_node)

1 0

gajim: use nec / ged to dispatch gmail event
by Yann Leboulanger 21 Jul '10

21 Jul '10

changeset 38416f2caa59 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=38416f2caa59 description: use nec / ged to dispatch gmail event diffstat: src/common/connection_handlers.py | 111 ++++++++++++++++++++++--------------- src/gui_interface.py | 69 +++++++++++------------ src/remote_control.py | 6 ++ 3 files changed, 106 insertions(+), 80 deletions(-) diffs (246 lines): diff -r 15842e7b3a0c -r 38416f2caa59 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Tue Jul 20 16:53:07 2010 +0200 +++ b/src/common/connection_handlers.py Wed Jul 21 23:14:50 2010 +0200 @@ -1263,54 +1263,15 @@ self.connection.send(iq) raise common.xmpp.NodeProcessed - def _gMailQueryCB(self, con, gm): + def _gMailQueryCB(self, con, iq_obj): """ Called when we receive results from Querying the server for mail messages in gmail account """ - if not gm.getTag('mailbox'): - return - self.gmail_url = gm.getTag('mailbox').getAttr('url') - if gm.getTag('mailbox').getNamespace() == common.xmpp.NS_GMAILNOTIFY: - newmsgs = gm.getTag('mailbox').getAttr('total-matched') - if newmsgs != '0': - # there are new messages - gmail_messages_list = [] - if gm.getTag('mailbox').getTag('mail-thread-info'): - gmail_messages = gm.getTag('mailbox').getTags('mail-thread-info') - for gmessage in gmail_messages: - unread_senders = [] - for sender in gmessage.getTag('senders').getTags('sender'): - if sender.getAttr('unread') != '1': - continue - if sender.getAttr('name'): - unread_senders.append(sender.getAttr('name') + '< ' + \ - sender.getAttr('address') + '>') - else: - unread_senders.append(sender.getAttr('address')) - - if not unread_senders: - continue - gmail_subject = gmessage.getTag('subject').getData() - gmail_snippet = gmessage.getTag('snippet').getData() - tid = int(gmessage.getAttr('tid')) - if not self.gmail_last_tid or tid > self.gmail_last_tid: - self.gmail_last_tid = tid - gmail_messages_list.append({ \ - 'From': unread_senders, \ - 'Subject': gmail_subject, \ - 'Snippet': gmail_snippet, \ - 'url': gmessage.getAttr('url'), \ - 'participation': gmessage.getAttr('participation'), \ - 'messages': gmessage.getAttr('messages'), \ - 'date': gmessage.getAttr('date')}) - self.gmail_last_time = int(gm.getTag('mailbox').getAttr( - 'result-time')) - - jid = gajim.get_jid_from_account(self.name) - log.debug(('You have %s new gmail e-mails on %s.') % (newmsgs, jid)) - self.dispatch('GMAIL_NOTIFY', (jid, newmsgs, gmail_messages_list)) - raise common.xmpp.NodeProcessed + log.debug('gMailQueryCB') + gajim.nec.push_incoming_event(GMailQueryReceivedEvent(None, + conn=self, iq_obj=iq_obj)) + raise common.xmpp.NodeProcessed def _rosterItemExchangeCB(self, con, msg): """ @@ -2537,3 +2498,65 @@ return return True + +class GMailQueryReceivedEvent(nec.NetworkIncomingEvent): + name = 'gmail-notify' + base_network_events = [] + + def generate(self): + if not self.conn: + self.conn = self.base_event.conn + if not self.iq_obj: + self.iq_obj = self.base_event.xmpp_iq + + if not self.iq_obj.getTag('mailbox'): + return + mb = self.iq_obj.getTag('mailbox') + if not mb.getAttr('url'): + return + self.conn.gmail_url = mb.getAttr('url') + if mb.getNamespace() != common.xmpp.NS_GMAILNOTIFY: + return + self.newmsgs = mb.getAttr('total-matched') + if not self.newmsgs: + return + if self.newmsgs == '0': + return + # there are new messages + self.gmail_messages_list = [] + if mb.getTag('mail-thread-info'): + gmail_messages = mb.getTags('mail-thread-info') + for gmessage in gmail_messages: + unread_senders = [] + for sender in gmessage.getTag('senders').getTags( + 'sender'): + if sender.getAttr('unread') != '1': + continue + if sender.getAttr('name'): + unread_senders.append(sender.getAttr('name') + \ + '< ' + sender.getAttr('address') + '>') + else: + unread_senders.append(sender.getAttr('address')) + + if not unread_senders: + continue + gmail_subject = gmessage.getTag('subject').getData() + gmail_snippet = gmessage.getTag('snippet').getData() + tid = int(gmessage.getAttr('tid')) + if not self.conn.gmail_last_tid or \ + tid > self.conn.gmail_last_tid: + self.conn.gmail_last_tid = tid + self.gmail_messages_list.append({ + 'From': unread_senders, + 'Subject': gmail_subject, + 'Snippet': gmail_snippet, + 'url': gmessage.getAttr('url'), + 'participation': gmessage.getAttr('participation'), + 'messages': gmessage.getAttr('messages'), + 'date': gmessage.getAttr('date')}) + self.conn.gmail_last_time = int(mb.getAttr('result-time')) + + self.jid = gajim.get_jid_from_account(self.name) + log.debug(('You have %s new gmail e-mails on %s.') % (self.newmsgs, + self.jid)) + return True \ No newline at end of file diff -r 15842e7b3a0c -r 38416f2caa59 src/gui_interface.py --- a/src/gui_interface.py Tue Jul 20 16:53:07 2010 +0200 +++ b/src/gui_interface.py Wed Jul 21 23:14:50 2010 +0200 @@ -1288,41 +1288,38 @@ notify.popup(event_type, jid, account, 'file-send-error', path, event_type, file_props['name']) - def handle_event_gmail_notify(self, account, array): - jid = array[0] - gmail_new_messages = int(array[1]) - gmail_messages_list = array[2] - if gajim.config.get('notify_on_new_gmail_email'): - path = gtkgui_helpers.get_icon_path('gajim-new_email_recv', 48) - title = _('New mail on %(gmail_mail_address)s') % \ - {'gmail_mail_address': jid} - text = i18n.ngettext('You have %d new mail conversation', - 'You have %d new mail conversations', gmail_new_messages, - gmail_new_messages, gmail_new_messages) - - if gajim.config.get('notify_on_new_gmail_email_extra'): - cnt = 0 - for gmessage in gmail_messages_list: - # FIXME: emulate Gtalk client popups. find out what they - # parse and how they decide what to show each message has a - # 'From', 'Subject' and 'Snippet' field - if cnt >= 5: - break - senders = ',\n '.join(reversed(gmessage['From'])) - text += _('\n\nFrom: %(from_address)s\nSubject: ' - '%(subject)s\n%(snippet)s') % \ - {'from_address': senders, - 'subject': gmessage['Subject'], - 'snippet': gmessage['Snippet']} - cnt += 1 - - if gajim.config.get_per('soundevents', 'gmail_received', 'enabled'): - helpers.play_sound('gmail_received') - notify.popup(_('New E-mail'), jid, account, 'gmail', - path_to_image=path, title=title, text=text) - - if self.remote_ctrl: - self.remote_ctrl.raise_signal('NewGmail', (account, array)) + def handle_event_gmail_notify(self, obj): + jid = obj.jid + gmail_new_messages = int(obj.newmsgs) + gmail_messages_list = obj.gmail_messages_list + if not gajim.config.get('notify_on_new_gmail_email'): + return + path = gtkgui_helpers.get_icon_path('gajim-new_email_recv', 48) + title = _('New mail on %(gmail_mail_address)s') % \ + {'gmail_mail_address': jid} + text = i18n.ngettext('You have %d new mail conversation', + 'You have %d new mail conversations', gmail_new_messages, + gmail_new_messages, gmail_new_messages) + + if gajim.config.get('notify_on_new_gmail_email_extra'): + cnt = 0 + for gmessage in gmail_messages_list: + # FIXME: emulate Gtalk client popups. find out what they + # parse and how they decide what to show each message has a + # 'From', 'Subject' and 'Snippet' field + if cnt >= 5: + break + senders = ',\n '.join(reversed(gmessage['From'])) + text += _('\n\nFrom: %(from_address)s\nSubject: ' + '%(subject)s\n%(snippet)s') % {'from_address': senders, + 'subject': gmessage['Subject'], + 'snippet': gmessage['Snippet']} + cnt += 1 + + if gajim.config.get_per('soundevents', 'gmail_received', 'enabled'): + helpers.play_sound('gmail_received') + notify.popup(_('New E-mail'), jid, obj.conn.name, 'gmail', + path_to_image=path, title=title, text=text) def handle_event_file_request_error(self, account, array): # ('FILE_REQUEST_ERROR', account, (jid, file_props, error_msg)) @@ -2100,7 +2097,6 @@ 'CON_TYPE': [self.handle_event_con_type], 'CONNECTION_LOST': [self.handle_event_connection_lost], 'FILE_REQUEST': [self.handle_event_file_request], - 'GMAIL_NOTIFY': [self.handle_event_gmail_notify], 'FILE_REQUEST_ERROR': [self.handle_event_file_request_error], 'FILE_SEND_ERROR': [self.handle_event_file_send_error], 'STANZA_ARRIVED': [self.handle_event_stanza_arrived], @@ -2146,6 +2142,7 @@ 'JINGLE_ERROR': [self.handle_event_jingle_error], 'PEP_RECEIVED': [self.handle_event_pep_received], 'CAPS_RECEIVED': [self.handle_event_caps_received], + 'gmail-notify': [self.handle_event_gmail_notify], 'http-auth-received': [self.handle_event_http_auth], 'last-result-received': [self.handle_event_last_status_time], } diff -r 15842e7b3a0c -r 38416f2caa59 src/remote_control.py --- a/src/remote_control.py Tue Jul 20 16:53:07 2010 +0200 +++ b/src/remote_control.py Wed Jul 21 23:14:50 2010 +0200 @@ -111,6 +111,8 @@ self.on_os_info) gajim.ged.register_event_handler('time-result-received', ged.POSTGUI, self.on_time) + gajim.ged.register_event_handler('gmail-nofify', ged.POSTGUI, + self.on_gmail_notify) def on_last_status_time(self, obj): self.raise_signal('LastStatusTime', (obj.conn.name, [ @@ -124,6 +126,10 @@ self.raise_signal('EntityTime', (obj.conn.name, [obj.jid, obj.resource, obj.time_info])) + def on_gmail_notify(self, obj): + self.raise_signal('NewGmail', (obj.conn.name, [obj.jid, obj.newmsgs, + obj.gmail_messages_list])) + def raise_signal(self, signal, arg): if self.signal_object: try:

1 0

gajim: Add finish button in ad hoc window. Fixes #5811
by Yann Leboulanger 21 Jul '10

21 Jul '10

changeset a7da929a5b65 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a7da929a5b65 description: Add finish button in ad hoc window. Fixes #5811 diffstat: src/adhoc_commands.py | 29 +++++++++++++++++++++++------ 1 files changed, 23 insertions(+), 6 deletions(-) diffs (121 lines): diff -r 8b2f1eaa32a9 -r a7da929a5b65 src/adhoc_commands.py --- a/src/adhoc_commands.py Tue Jul 20 20:15:44 2010 +0300 +++ b/src/adhoc_commands.py Wed Jul 21 20:15:47 2010 +0200 @@ -64,12 +64,12 @@ self.window.connect('delete-event', self.on_adhoc_commands_window_delete_event) for name in ('restart_button', 'back_button', 'forward_button', - 'execute_button', 'close_button', 'stages_notebook', - 'retrieving_commands_stage_vbox', - 'command_list_stage_vbox', 'command_list_vbox', - 'sending_form_stage_vbox', 'sending_form_progressbar', - 'notes_label', 'no_commands_stage_vbox', 'error_stage_vbox', - 'error_description_label'): + 'execute_button', 'finish_button', 'close_button', + 'stages_notebook', 'retrieving_commands_stage_vbox', + 'command_list_stage_vbox', 'command_list_vbox', + 'sending_form_stage_vbox', 'sending_form_progressbar', + 'notes_label', 'no_commands_stage_vbox', 'error_stage_vbox', + 'error_description_label'): self.__dict__[name] = self.xml.get_object(name) self.initiate() @@ -137,6 +137,9 @@ def on_execute_button_clicked(self, *anything): return self.stage_execute_button_clicked(*anything) + def on_finish_button_clicked(self, *anything): + return self.stage_finish_button_clicked(*anything) + def on_close_button_clicked(self, *anything): return self.stage_close_button_clicked(*anything) @@ -169,6 +172,7 @@ self.back_button.set_sensitive(False) self.forward_button.set_sensitive(False) self.execute_button.set_sensitive(False) + self.finish_button.set_sensitive(False) # request command list self.request_command_list() @@ -214,6 +218,7 @@ self.back_button.set_sensitive(False) self.forward_button.set_sensitive(True) self.execute_button.set_sensitive(False) + self.finish_button.set_sensitive(False) # build the commands list radiobuttons first_radio = None @@ -270,6 +275,7 @@ self.back_button.set_sensitive(False) self.forward_button.set_sensitive(False) self.execute_button.set_sensitive(False) + self.finish_button.set_sensitive(False) self.stage3_submit_form() @@ -277,6 +283,7 @@ self.stage_back_button_clicked = self.stage3_back_button_clicked self.stage_forward_button_clicked = self.stage3_forward_button_clicked self.stage_execute_button_clicked = self.stage3_execute_button_clicked + self.stage_finish_button_clicked = self.stage3_finish_button_clicked self.stage_close_button_clicked = self.stage3_close_button_clicked self.stage_adhoc_commands_window_delete_event = \ self.stage3_close_button_clicked @@ -320,6 +327,9 @@ def stage3_execute_button_clicked(self, widget): self.stage3_submit_form('execute') + def stage3_finish_button_clicked(self, widget): + self.stage3_submit_form('complete') + def stage3_submit_form(self, action='execute'): self.data_form_widget.set_sensitive(False) if self.data_form_widget.get_data_form(): @@ -331,6 +341,7 @@ self.back_button.set_sensitive(False) self.forward_button.set_sensitive(False) self.execute_button.set_sensitive(False) + self.finish_button.set_sensitive(False) self.sending_form_progressbar.show() self.setup_pulsing(self.sending_form_progressbar) @@ -379,11 +390,14 @@ self.forward_button.set_sensitive( actions.getTag('next') is not None) self.execute_button.set_sensitive(True) + self.finish_button.set_sensitive(actions.getTag('complete') is not \ + None) else: self.close_button.set_sensitive(True) self.back_button.set_sensitive(False) self.forward_button.set_sensitive(False) self.execute_button.set_sensitive(True) + self.finish_button.set_sensitive(False) if self.form_status == 'completed': self.close_button.set_sensitive(True) @@ -391,6 +405,7 @@ self.back_button.hide() self.forward_button.hide() self.execute_button.hide() + self.finish_button.hide() self.close_button.show() self.stage_adhoc_commands_window_delete_event = \ self.stage3_close_button_clicked @@ -423,6 +438,7 @@ self.back_button.set_sensitive(False) self.forward_button.set_sensitive(False) self.execute_button.set_sensitive(False) + self.finish_button.set_sensitive(False) self.stage_finish = self.do_nothing self.stage_close_button_clicked = self.stage4_close_button_clicked @@ -468,6 +484,7 @@ self.back_button.hide() self.forward_button.hide() self.execute_button.hide() + self.finish_button.hide() self.error_description_label.set_text(error)

1 0

gajim: add namespace for XTLS
by fantasticsid＠lagaule.org 21 Jul '10

21 Jul '10

changeset 9e412f39e787 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9e412f39e787 description: add namespace for XTLS diffstat: src/common/connection_handlers.py | 3 ++- src/common/helpers.py | 1 + src/common/xmpp/protocol.py | 1 + 3 files changed, 4 insertions(+), 1 deletions(-) diffs (35 lines): diff -r 919d1c16d62a -r 9e412f39e787 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Thu Jul 15 14:32:34 2010 +0800 +++ b/src/common/connection_handlers.py Mon Jul 19 14:21:01 2010 +0800 @@ -182,7 +182,8 @@ query = iq.setTag('query') query.setAttr('node', 'http://gajim.org#' + gajim.version.split('-', 1)[0]) for f in (common.xmpp.NS_BYTESTREAM, common.xmpp.NS_SI, - common.xmpp.NS_FILE, common.xmpp.NS_COMMANDS, common.xmpp.NS_JINGLE_FILE_TRANSFER): + common.xmpp.NS_FILE, common.xmpp.NS_COMMANDS, + common.xmpp.NS_JINGLE_FILE_TRANSFER, common.xmpp.NS_JINGLE_XTLS): feature = common.xmpp.Node('feature') feature.setAttr('var', f) query.addChild(node=feature) diff -r 919d1c16d62a -r 9e412f39e787 src/common/helpers.py --- a/src/common/helpers.py Thu Jul 15 14:32:34 2010 +0800 +++ b/src/common/helpers.py Mon Jul 19 14:21:01 2010 +0800 @@ -1317,6 +1317,7 @@ gajim.gajim_optional_features[a].append(xmpp.NS_JINGLE_RTP_VIDEO) gajim.gajim_optional_features[a].append(xmpp.NS_JINGLE_ICE_UDP) gajim.gajim_optional_features[a].append(xmpp.NS_JINGLE_FILE_TRANSFER) + gajim.gajim_optional_features[a].append(xmpp.NS_JINGLE_XTLS) gajim.caps_hash[a] = caps_cache.compute_caps_hash([gajim.gajim_identity], gajim.gajim_common_features + gajim.gajim_optional_features[a]) # re-send presence with new hash diff -r 919d1c16d62a -r 9e412f39e787 src/common/xmpp/protocol.py --- a/src/common/xmpp/protocol.py Thu Jul 15 14:32:34 2010 +0800 +++ b/src/common/xmpp/protocol.py Mon Jul 19 14:21:01 2010 +0800 @@ -70,6 +70,7 @@ NS_JINGLE_RTP_AUDIO='urn:xmpp:jingle:apps:rtp:audio' # XEP-0167 NS_JINGLE_RTP_VIDEO='urn:xmpp:jingle:apps:rtp:video' # XEP-0167 NS_JINGLE_FILE_TRANSFER='urn:xmpp:jingle:apps:file-transfer:1' # XEP-0234 +NS_JINGLE_XTLS='urn:xmpp:jingle:security:xtls:0' # XTLS: EXPERIMENTAL security layer of jingle NS_JINGLE_RAW_UDP='urn:xmpp:jingle:transports:raw-udp:1' # XEP-0177 NS_JINGLE_ICE_UDP='urn:xmpp:jingle:transports:ice-udp:1' # XEP-0176 NS_JINGLE_BYTESTREAM ='urn:xmpp:jingle:transports:s5b:1' # XEP-0260

1 0

gajim-website: [mjjzf] update slackware link to search result.
by Yann Leboulanger 21 Jul '10

21 Jul '10

changeset af780975d477 in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=af780975d477 description: [mjjzf] update slackware link to search result. diffstat: downloads.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 43bd1633cb6d -r af780975d477 downloads.php --- a/downloads.php Tue Jun 29 23:00:37 2010 +0200 +++ b/downloads.php Wed Jul 21 13:36:53 2010 +0200 @@ -33,7 +33,7 @@ print (" Slackware\n"); print (" </h2>\n"); print ("</a>\n"); -print _(" You can get the Slackware package of Gajim")." <a href=\"http://slackbuilds.org/repository/13.0/network/gajim/\"> "._("here")."</a>."; +print _(" You can get the Slackware package of Gajim")." <a href=\"http://slackbuilds.org/result/?search=gajim&sv=all\"> "._("here")."</a>."; print (" <br/>\n"); print ("<a name=\"ubuntu\">\n");

1 0

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

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2010