Commits August 2011

commits@gajim.org

3 participants
99 discussions

gajim: do not translate unused string
by Fomin Denis 30 Aug '11

30 Aug '11

changeset 4cd4c8a80d49 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4cd4c8a80d49 description: do not translate unused string diffstat: plugins/plugin_installer/config_dialog.ui | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diffs (39 lines): diff -r 0baf415e9f18 -r 4cd4c8a80d49 plugins/plugin_installer/config_dialog.ui --- a/plugins/plugin_installer/config_dialog.ui Tue Aug 30 15:23:16 2011 +0300 +++ b/plugins/plugin_installer/config_dialog.ui Tue Aug 30 16:22:03 2011 +0300 @@ -3,7 +3,7 @@ <requires lib="gtk+" version="2.16"/>  <object class="GtkTextBuffer" id="textbuffer1"> - <property name="text" translatable="yes">Plug-in decription should be displayed here. This text will be erased during PluginsWindow initialization.</property> + <property name="text">Plug-in decription should be displayed here. This text will be erased during PluginsWindow initialization.</property> </object> <object class="GtkWindow" id="window1"> <child> @@ -44,7 +44,7 @@ <object class="GtkLabel" id="plugin_name_label1"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes"><empty></property> + <property name="label"><empty></property> <property name="selectable">True</property> <property name="ellipsize">end</property> </object> @@ -72,7 +72,7 @@ <property name="visible">True</property> <property name="xalign">0</property> <property name="xpad">6</property> - <property name="label" translatable="yes"><empty></property> + <property name="label"><empty></property> <property name="selectable">True</property> <property name="ellipsize">end</property> </object> @@ -101,7 +101,7 @@ </child> <child> <object class="GtkLinkButton" id="plugin_homepage_linkbutton1"> - <property name="label" translatable="yes">button</property> + <property name="label">button</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property>

1 0

gajim: terminate e2e sessions (from chat and private chat) when ...
by Yann Leboulanger 30 Aug '11

30 Aug '11

changeset b7999dc0b37b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b7999dc0b37b description: terminate e2e sessions (from chat and private chat) when we get an offline presence. Fixes #6956 diffstat: src/common/connection_handlers.py | 20 +++++++++++++++++++- src/common/stanza_session.py | 4 +++- 2 files changed, 22 insertions(+), 2 deletions(-) diffs (69 lines): diff -r 0baf415e9f18 -r b7999dc0b37b src/common/connection_handlers.py --- a/src/common/connection_handlers.py Tue Aug 30 15:23:16 2011 +0300 +++ b/src/common/connection_handlers.py Tue Aug 30 14:52:59 2011 +0200 @@ -770,6 +770,8 @@ self._nec_iq_error_received) gajim.ged.register_event_handler('presence-received', ged.CORE, self._nec_presence_received) + gajim.ged.register_event_handler('gc-presence-received', ged.CORE, + self._nec_gc_presence_received) gajim.ged.register_event_handler('message-received', ged.CORE, self._nec_message_received) gajim.ged.register_event_handler('decrypted-message-received', ged.CORE, @@ -780,6 +782,8 @@ self._nec_iq_error_received) gajim.ged.remove_event_handler('presence-received', ged.CORE, self._nec_presence_received) + gajim.ged.remove_event_handler('gc-presence-received', ged.CORE, + self._nec_gc_presence_received) gajim.ged.remove_event_handler('message-received', ged.CORE, self._nec_message_received) gajim.ged.remove_event_handler('decrypted-message-received', ged.CORE, @@ -921,10 +925,15 @@ # there won't be any sessions here if the contact terminated # their sessions before going offline (which we do) for sess in self.get_sessions(jid): - if obj.fjid != str(sess.jid): + sess_fjid = str(sess.jid) + if sess.resource: + sess_fjid += '/' + sess.resource + if obj.fjid != sess_fjid: continue if sess.control: sess.control.no_autonegotiation = False + if sess.enable_encryption: + sess.terminate_e2e() if gajim.config.get('log_contact_status_changes') and \ gajim.config.should_log(self.name, obj.jid): @@ -940,6 +949,15 @@ self.dispatch('DB_ERROR', (pritext, sectext)) our_jid = gajim.get_jid_from_account(self.name) + def _nec_gc_presence_received(self, obj): + if obj.conn.name != self.name: + return + for sess in self.get_sessions(obj.fjid): + if obj.fjid != sess.jid: + continue + if sess.enable_encryption: + sess.terminate_e2e() + def _nec_message_received(self, obj): if obj.conn.name != self.name: return diff -r 0baf415e9f18 -r b7999dc0b37b src/common/stanza_session.py --- a/src/common/stanza_session.py Tue Aug 30 15:23:16 2011 +0300 +++ b/src/common/stanza_session.py Tue Aug 30 14:52:59 2011 +0200 @@ -1148,8 +1148,10 @@ return xmpp.DataField(name=name, typ='hidden', value=dhs) def terminate_e2e(self): + self.enable_encryption = False + if self.control: + self.control.print_session_details() self.terminate() - self.enable_encryption = False def acknowledge_termination(self): StanzaSession.acknowledge_termination(self)

1 0

gajim: imported patch 2011-08-27_00-06-54_r13163+.diff
by Fomin Denis 30 Aug '11

30 Aug '11

changeset 0baf415e9f18 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0baf415e9f18 description: imported patch 2011-08-27_00-06-54_r13163+.diff diffstat: plugins/acronyms_expander/acronyms_expander.py | 4 +- plugins/plugin_installer/plugin_installer.py | 5 +-- src/plugins/gui.py | 3 +- src/plugins/pluginmanager.py | 4 ++ src/plugins/plugins_i18n.py | 39 ++++++++++++++++++++++++++ 5 files changed, 49 insertions(+), 6 deletions(-) diffs (127 lines): diff -r b5ed365da181 -r 0baf415e9f18 plugins/acronyms_expander/acronyms_expander.py --- a/plugins/acronyms_expander/acronyms_expander.py Mon Aug 29 15:08:04 2011 +0200 +++ b/plugins/acronyms_expander/acronyms_expander.py Tue Aug 30 15:23:16 2011 +0300 @@ -44,7 +44,7 @@ } self.config_default_values = { - 'INVOKER': (' ', _('')), + 'INVOKER': (' ', ''), 'ACRONYMS': ({'RTFM': 'Read The Friendly Manual', '/slap': '/me slaps', 'PS-': 'plug-in system', @@ -53,7 +53,7 @@ 'GW-': 'http://trac.gajim.org/', 'GTS-': 'http://trac.gajim.org/report', }, - _('')), + ''), } @log_calls('AcronymsExpanderPlugin') diff -r b5ed365da181 -r 0baf415e9f18 plugins/plugin_installer/plugin_installer.py --- a/plugins/plugin_installer/plugin_installer.py Mon Aug 29 15:08:04 2011 +0200 +++ b/plugins/plugin_installer/plugin_installer.py Tue Aug 30 15:23:16 2011 +0300 @@ -35,7 +35,6 @@ from plugins.helpers import log_calls, log from dialogs import WarningDialog, HigDialog from plugins.gui import GajimPluginConfigDialog -from common import i18n class PluginInstaller(GajimPlugin): @@ -74,7 +73,7 @@ self.window.connect('destroy', self.on_win_destroy) self.GTK_BUILDER_FILE_PATH = self.local_file_path('config_dialog.ui') self.xml = gtk.Builder() - self.xml.set_translation_domain(i18n.APP) + self.xml.set_translation_domain('gajim_plugins') self.xml.add_objects_from_file(self.GTK_BUILDER_FILE_PATH, ['hpaned2']) hpaned = self.xml.get_object('hpaned2') self.page_num = self.notebook.append_page(hpaned, @@ -228,7 +227,7 @@ label.set_ellipsize(pango.ELLIPSIZE_END) self.plugin_homepage_linkbutton1.set_property('sensitive', True) desc_textbuffer = self.plugin_description_textview1.get_buffer() - desc_textbuffer.set_text(model.get_value(iter, 5)) + desc_textbuffer.set_text(_(model.get_value(iter, 5))) self.plugin_description_textview1.set_property('sensitive', True) else: self._clear_available_plugin_info() diff -r b5ed365da181 -r 0baf415e9f18 src/plugins/gui.py --- a/src/plugins/gui.py Mon Aug 29 15:08:04 2011 +0200 +++ b/src/plugins/gui.py Tue Aug 30 15:23:16 2011 +0300 @@ -113,7 +113,8 @@ self.plugin_homepage_linkbutton.set_property('sensitive', True) desc_textbuffer = self.plugin_description_textview.get_buffer() - desc_textbuffer.set_text(plugin.description) + from plugins.plugins_i18n import _ + desc_textbuffer.set_text(_(plugin.description)) self.plugin_description_textview.set_property('sensitive', True) self.uninstall_plugin_button.set_property('sensitive', gajim.PLUGINS_DIRS[1] in plugin.__path__) diff -r b5ed365da181 -r 0baf415e9f18 src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Mon Aug 29 15:08:04 2011 +0200 +++ b/src/plugins/pluginmanager.py Tue Aug 30 15:23:16 2011 +0300 @@ -393,6 +393,7 @@ :todo: add scanning packages :todo: add scanning zipped modules ''' + from plugins.plugins_i18n import _ plugins_found = [] conf = ConfigParser.ConfigParser() fields = ('name', 'short_name', 'version', 'description', 'authors', @@ -460,6 +461,9 @@ conf.remove_section('info') plugins_found.append(module_attr) + # set plugin localization + plugin_module = dir(module)[-1] + getattr(module, plugin_module)._ = _ except TypeError, type_error: pass diff -r b5ed365da181 -r 0baf415e9f18 src/plugins/plugins_i18n.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/plugins/plugins_i18n.py Tue Aug 30 15:23:16 2011 +0300 @@ -0,0 +1,39 @@ +# -*- coding: utf-8 -*- +# +## src/plugins/plugin_installer/plugins_i18n.py +## +## Copyright (C) 2010-2011 Denis Fomin <fominde AT gmail.com> +## +## 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/>. +## +import locale +import gettext +from os import path as os_path +import os +from common import gajim + +APP = 'gajim_plugins' +plugins_locale_dir = os_path.join(gajim.PLUGINS_DIRS[1], 'locale') + +locale.setlocale(locale.LC_ALL, '') +locale.bindtextdomain(APP, plugins_locale_dir) +gettext.bindtextdomain(APP, plugins_locale_dir) +gettext.textdomain(APP) +try: + t = gettext.translation(APP, plugins_locale_dir) + _ = t.gettext +except IOError, msg: + from common import i18n + _ = gettext.gettext

1 0

gajim: prevent traceback
by Yann Leboulanger 29 Aug '11

29 Aug '11

changeset b5ed365da181 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b5ed365da181 description: prevent traceback diffstat: src/common/connection.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r dca4901d811a -r b5ed365da181 src/common/connection.py --- a/src/common/connection.py Sun Aug 28 10:08:38 2011 +0200 +++ b/src/common/connection.py Mon Aug 29 15:08:04 2011 +0200 @@ -1636,6 +1636,8 @@ self._stun_servers = self._hosts = [i for i in result_array] def _request_privacy(self): + if not gajim.account_is_connected(self.name): + return iq = common.xmpp.Iq('get', common.xmpp.NS_PRIVACY, xmlns = '') id_ = self.connection.getAnID() iq.setID(id_)

1 0

gajim: run plugin_downbloaded callback in the main thread instea...
by Yann Leboulanger 28 Aug '11

28 Aug '11

changeset dca4901d811a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=dca4901d811a description: run plugin_downbloaded callback in the main thread instead of in Ftp Thread. Fixes freeze under windows when plugin is downloaded diffstat: plugins/plugin_installer/plugin_installer.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 3af94fa9868e -r dca4901d811a plugins/plugin_installer/plugin_installer.py --- a/plugins/plugin_installer/plugin_installer.py Sat Aug 27 22:41:55 2011 +0200 +++ b/plugins/plugin_installer/plugin_installer.py Sun Aug 28 10:08:38 2011 +0200 @@ -432,7 +432,8 @@ print 'ERROR: cannot read file "%s"' % filename os.unlink(filename) self.ftp.quit() - self.window.emit('plugin_downloaded', self.remote_dirs) + gobject.idle_add(self.window.emit, 'plugin_downloaded', + self.remote_dirs) gobject.source_remove(self.pulse)

1 0

gajim: cean chatstate code: remove XEP-0022 support and use caps...
by Yann Leboulanger 27 Aug '11

27 Aug '11

changeset 3af94fa9868e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3af94fa9868e description: cean chatstate code: remove XEP-0022 support and use caps to know if a contact supports it diffstat: plugins/banner_tweaks/plugin.py | 20 +----- src/chat_control.py | 87 ++++++---------------------- src/common/connection.py | 89 ++++++++++++----------------- src/common/connection_handlers.py | 3 +- src/common/connection_handlers_events.py | 17 +----- src/common/contacts.py | 68 ++++++++++------------ src/common/zeroconf/connection_zeroconf.py | 17 ++--- src/gui_interface.py | 5 - src/remote_control.py | 3 +- src/session.py | 4 +- test/unit/test_contacts.py | 8 +- 11 files changed, 109 insertions(+), 212 deletions(-) diffs (truncated from 714 to 300 lines): diff -r d40a3b0082d6 -r 3af94fa9868e plugins/banner_tweaks/plugin.py --- a/plugins/banner_tweaks/plugin.py Sat Aug 27 19:09:54 2011 +0200 +++ b/plugins/banner_tweaks/plugin.py Sat Aug 27 22:41:55 2011 +0200 @@ -135,27 +135,17 @@ if cs and st in ('composing_only', 'all'): if contact.show == 'offline': chatstate = '' - elif contact.composing_xep == 'XEP-0085': - if st == 'all' or cs == 'composing': - chatstate = helpers.get_uf_chatstate(cs) - else: - chatstate = '' - elif contact.composing_xep == 'XEP-0022': - if cs in ('composing', 'paused'): - # only print composing, paused - chatstate = helpers.get_uf_chatstate(cs) - else: - chatstate = '' + elif st == 'all' or cs == 'composing': + chatstate = helpers.get_uf_chatstate(cs) else: - # When does that happen ? See [7797] and [7804] - chatstate = helpers.get_uf_chatstate(cs) + chatstate = '' label_text = '%s%s %s' % \ - (font_attrs, name, font_attrs_small, acct_info, chatstate) + (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) + (font_attrs, name, font_attrs_small, acct_info) banner_name_label.set_markup(label_text) diff -r d40a3b0082d6 -r 3af94fa9868e src/chat_control.py --- a/src/chat_control.py Sat Aug 27 19:09:54 2011 +0200 +++ b/src/chat_control.py Sat Aug 27 22:41:55 2011 +0200 @@ -54,6 +54,7 @@ from common.xmpp.protocol import NS_XHTML, NS_XHTML_IM, NS_FILE, NS_MUC from common.xmpp.protocol import NS_RECEIPTS, NS_ESESSION from common.xmpp.protocol import NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO, NS_JINGLE_ICE_UDP +from common.xmpp.protocol import NS_CHATSTATES from common.connection_handlers_events import MessageOutgoingEvent from command_system.implementation.middleware import ChatCommandProcessor @@ -850,8 +851,8 @@ return label def send_message(self, message, keyID='', type_='chat', chatstate=None, - msg_id=None, composing_xep=None, resource=None, xhtml=None, callback=None, - callback_args=[], process_commands=True): + msg_id=None, resource=None, xhtml=None, callback=None, callback_args=[], + process_commands=True): """ Send the given message to the active tab. Doesn't return None if error """ @@ -866,9 +867,9 @@ gajim.nec.push_outgoing_event(MessageOutgoingEvent(None, account=self.account, jid=self.contact.jid, message=message, keyID=keyID, type_=type_, chatstate=chatstate, msg_id=msg_id, - composing_xep=composing_xep, resource=resource, - user_nick=self.user_nick, xhtml=xhtml, label=label, - callback=callback, callback_args=callback_args, control=self)) + resource=resource, user_nick=self.user_nick, xhtml=xhtml, + label=label, callback=callback, callback_args=callback_args, + control=self)) # Record the history of sent messages self.save_message(message, 'sent') @@ -2037,24 +2038,13 @@ if cs and st in ('composing_only', 'all'): if contact.show == 'offline': chatstate = '' - elif contact.composing_xep == 'XEP-0085': - if st == 'all' or cs == 'composing': - chatstate = helpers.get_uf_chatstate(cs) - else: - chatstate = '' - elif contact.composing_xep == 'XEP-0022': - if cs in ('composing', 'paused'): - # only print composing, paused - chatstate = helpers.get_uf_chatstate(cs) - else: - chatstate = '' + elif st == 'all' or cs == 'composing': + chatstate = helpers.get_uf_chatstate(cs) else: - # When does that happen ? See [7797] and [7804] - chatstate = helpers.get_uf_chatstate(cs) + chatstate = '' label_text = '%s%s %s' \ - % (font_attrs, name, font_attrs_small, - acct_info, chatstate) + % (font_attrs, name, font_attrs_small, acct_info, chatstate) if acct_info: acct_info = ' ' + acct_info label_tooltip = '%s%s %s' % (name, acct_info, chatstate) @@ -2210,7 +2200,7 @@ dialogs.ESessionInfoWindow(self.session) def send_message(self, message, keyID='', chatstate=None, xhtml=None, - process_commands=True): + process_commands=True): """ Send a message to contact """ @@ -2234,25 +2224,9 @@ chatstates_on = gajim.config.get('outgoing_chat_state_notifications') != \ 'disabled' - composing_xep = contact.composing_xep chatstate_to_send = None if chatstates_on and contact is not None: - if composing_xep is None: - # no info about peer - # send active to discover chat state capabilities - # this is here (and not in send_chatstate) - # because we want it sent with REAL message - # (not standlone) eg. one that has body - - if contact.our_chatstate: - # We already asked for xep 85, don't ask it twice - composing_xep = 'asked_once' - - chatstate_to_send = 'active' - contact.our_chatstate = 'ask' # pseudo state - # if peer supports jep85 and we are not 'ask', send 'active' - # NOTE: first active and 'ask' is set in gajim.py - elif composing_xep is not False: + if contact.supports(NS_CHATSTATES): # send active chatstate on every message (as XEP says) chatstate_to_send = 'active' contact.our_chatstate = 'active' @@ -2275,10 +2249,9 @@ xep0184_id=xep0184_id, xhtml=xhtml, displaymarking=displaymarking) ChatControlBase.send_message(self, message, keyID, type_='chat', - chatstate=chatstate_to_send, composing_xep=composing_xep, - xhtml=xhtml, callback=_on_sent, - callback_args=[contact, message, encrypted, xhtml, self.get_seclabel()], - process_commands=process_commands) + chatstate=chatstate_to_send, xhtml=xhtml, callback=_on_sent, + callback_args=[contact, message, encrypted, xhtml, + self.get_seclabel()], process_commands=process_commands) def on_message_sent(self, account_and_message): @@ -2598,7 +2571,7 @@ if contact.show == 'offline': return - if contact.composing_xep is False: # jid cannot do xep85 nor xep22 + if not contact.supports(NS_CHATSTATES): return # if the new state we wanna send (state) equals @@ -2606,28 +2579,7 @@ if contact.our_chatstate == state: return - if contact.composing_xep is None: - # we don't know anything about jid, so return - # NOTE: - # send 'active', set current state to 'ask' and return is done - # in self.send_message() because we need REAL message (with <body>) - # for that procedure so return to make sure we send only once - # 'active' until we know peer supports jep85 - return - - if contact.our_chatstate == 'ask': - return - - # in JEP22, when we already sent stop composing - # notification on paused, don't resend it - if contact.composing_xep == 'XEP-0022' and \ - contact.our_chatstate in ('paused', 'active', 'inactive') and \ - state is not 'composing': # not composing == in (active, inactive, gone) - contact.our_chatstate = 'active' - self.reset_kbd_mouse_timeout_vars() - return - - # if we're inactive prevent composing (JEP violation) + # if wel're inactive prevent composing (XEP violation) if contact.our_chatstate == 'inactive' and state == 'composing': # go active before gajim.nec.push_outgoing_event(MessageOutgoingEvent(None, @@ -2638,11 +2590,10 @@ gajim.nec.push_outgoing_event(MessageOutgoingEvent(None, account=self.account, jid=self.contact.jid, chatstate=state, - msg_id=contact.msg_id, composing_xep=contact.composing_xep, - control=self)) + msg_id=contact.msg_id, control=self)) contact.our_chatstate = state - if contact.our_chatstate == 'active': + if state == 'active': self.reset_kbd_mouse_timeout_vars() def shutdown(self): diff -r d40a3b0082d6 -r 3af94fa9868e src/common/connection.py --- a/src/common/connection.py Sat Aug 27 19:09:54 2011 +0200 +++ b/src/common/connection.py Sat Aug 27 22:41:55 2011 +0200 @@ -248,9 +248,9 @@ raise NotImplementedError def _prepare_message(self, jid, msg, keyID, type_='chat', subject='', - chatstate=None, msg_id=None, composing_xep=None, resource=None, - user_nick=None, xhtml=None, session=None, forward_from=None, form_node=None, - label=None, original_message=None, delayed=None, callback=None): + chatstate=None, msg_id=None, resource=None, user_nick=None, xhtml=None, + session=None, forward_from=None, form_node=None, label=None, + original_message=None, delayed=None, callback=None): if not self.connection or self.connected < 2: return 1 try: @@ -299,35 +299,34 @@ self._message_encrypted_cb(output, type_, msg, msgtxt, original_message, fjid, resource, jid, xhtml, subject, chatstate, msg_id, - composing_xep, label, forward_from, delayed, - session, form_node, user_nick, keyID, - callback) + label, forward_from, delayed, session, + form_node, user_nick, keyID, callback) gajim.nec.push_incoming_event(GPGTrustKeyEvent(None, conn=self, callback=_on_always_trust)) else: self._message_encrypted_cb(output, type_, msg, msgtxt, original_message, fjid, resource, jid, xhtml, - subject, chatstate, msg_id, composing_xep, label, - forward_from, delayed, session, form_node, - user_nick, keyID, callback) + subject, chatstate, msg_id, label, forward_from, + delayed, session, form_node, user_nick, keyID, + callback) gajim.thread_interface(encrypt_thread, [msg, keyID, False], - _on_encrypted, []) + _on_encrypted, []) return self._message_encrypted_cb(('', error), type_, msg, msgtxt, original_message, fjid, resource, jid, xhtml, subject, - chatstate, msg_id, composing_xep, label, forward_from, delayed, - session, form_node, user_nick, keyID, callback) + chatstate, msg_id, label, forward_from, delayed, session, + form_node, user_nick, keyID, callback) self._on_continue_message(type_, msg, msgtxt, original_message, fjid, resource, jid, xhtml, subject, msgenc, keyID, chatstate, msg_id, - composing_xep, label, forward_from, delayed, session, form_node, - user_nick, callback) + label, forward_from, delayed, session, form_node, user_nick, + callback) def _message_encrypted_cb(self, output, type_, msg, msgtxt, original_message, fjid, resource, jid, xhtml, subject, chatstate, msg_id, - composing_xep, label, forward_from, delayed, session, form_node, user_nick, - keyID, callback): + label, forward_from, delayed, session, form_node, user_nick, keyID, + callback): msgenc, error = output if msgenc and not error: @@ -339,8 +338,8 @@ ' (' + msgtxt + ')' self._on_continue_message(type_, msg, msgtxt, original_message, fjid, resource, jid, xhtml, subject, msgenc, keyID, - chatstate, msg_id, composing_xep, label, forward_from, delayed, - session, form_node, user_nick, callback) + chatstate, msg_id, label, forward_from, delayed, session, + form_node, user_nick, callback) return # Encryption failed, do not send message tim = localtime() @@ -349,8 +348,7 @@ def _on_continue_message(self, type_, msg, msgtxt, original_message, fjid, resource, jid, xhtml, subject, msgenc, keyID, chatstate, msg_id, - composing_xep, label, forward_from, delayed, session, form_node, user_nick, - callback): + label, forward_from, delayed, session, form_node, user_nick, callback): if type_ == 'chat': msg_iq = common.xmpp.Message(to=fjid, body=msgtxt, typ=type_, xhtml=xhtml) @@ -386,27 +384,17 @@ contact = gajim.contacts.get_contact_with_highest_priority(self.name, jid) - # chatstates - if peer supports xep85 or xep22, send chatstates - # please note that the only valid tag inside a message containing a <body> - # tag is the active event - if chatstate is not None and contact: - if ((composing_xep == 'XEP-0085' or not composing_xep) \ - and composing_xep != 'asked_once') or \ - contact.supports(common.xmpp.NS_CHATSTATES): - # XEP-0085

1 0

gajim: Added tag gajim-0.15-alpha1 for changeset db4ecb0d1f18
by Yann Leboulanger 27 Aug '11

27 Aug '11

changeset d40a3b0082d6 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d40a3b0082d6 description: Added tag gajim-0.15-alpha1 for changeset db4ecb0d1f18 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r db4ecb0d1f18 -r d40a3b0082d6 .hgtags --- a/.hgtags Sat Aug 27 13:49:11 2011 +0200 +++ b/.hgtags Sat Aug 27 19:09:54 2011 +0200 @@ -4,3 +4,4 @@ 7752eadd1f8c31a3dc282c15d87767a7ba1bd217 gajim-0.12-alpha1 a0ec82dc6b7c10708e23f5ec30bab75d596b6fc6 gajim-0.12-beta1 91ceabbf74309d7bbd79b43552b89768842b4e8a gajim-0.14.1 +db4ecb0d1f187578732ceb2fa9beab0591125341 gajim-0.15-alpha1

1 0

gajim-website: fix syntax
by Yann Leboulanger 27 Aug '11

27 Aug '11

changeset 28421f2242ce in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=28421f2242ce description: fix syntax diffstat: index.php | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (27 lines): diff -r e646c11ae263 -r 28421f2242ce index.php --- a/index.php Sat Aug 27 18:53:23 2011 +0200 +++ b/index.php Sat Aug 27 18:58:04 2011 +0200 @@ -49,12 +49,12 @@ $tpl->set_var("NEWS_MAIN", _("NEWS")); $array_news_title = array( - 0 => sprintf(_("Alpha-release of Gajim %s"), "0.15")); + 0 => sprintf(_("Alpha-release of Gajim %s"), "0.15"), 1 => sprintf(_("Gajim %s is here!"), "0.14.4"), 2 => sprintf(_("Gajim %s is here!"), "0.14.3"), 3 => sprintf(_("Gajim %s is here!"), "0.14.2"), 4 => sprintf(_("Gajim %s is here!"), "0.14.1"), - 5 => sprintf(_("Gajim %s is here!"), "0.14"), + 5 => sprintf(_("Gajim %s is here!"), "0.14")); // 5 => sprintf(_("Release candidate 5 of Gajim %s"), "0.13"), // 6 => sprintf(_("Beta-release of Gajim %s"), "0.12"), // 7 => sprintf(_("Alpha-release of Gajim %s"), "0.12")); @@ -68,7 +68,7 @@ 5 => _("02 September 2010")); $array_news_desc = array( - 0 => sprintf(_("Version %s will arrive soon."), "0.15")); + 0 => sprintf(_("Version %s will arrive soon."), "0.15"), 1 => sprintf(_("Version %s of Gajim has been released."), "0.14.4"), 2 => sprintf(_("Version %s of Gajim has been released."), "0.14.3"), 3 => sprintf(_("Version %s of Gajim has been released."), "0.14.2"),

1 0

gajim-website: announce 0.15-alpha1
by Yann Leboulanger 27 Aug '11

27 Aug '11

changeset e646c11ae263 in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=e646c11ae263 description: announce 0.15-alpha1 diffstat: downloads.php | 16 +++++++----- index.php | 75 ++++++++++++++++++++++++++++++---------------------------- 2 files changed, 48 insertions(+), 43 deletions(-) diffs (175 lines): diff -r 7ce8255753f0 -r e646c11ae263 downloads.php --- a/downloads.php Fri Jul 22 13:18:58 2011 +0200 +++ b/downloads.php Sat Aug 27 18:53:23 2011 +0200 @@ -8,7 +8,7 @@ $last_version = "0.14.4"; print (" \n"); print _(" Latest version of Gajim is")." ".$last_version." \n"; -#printf(_(" A %s version is in test"), "0.13-rc5"); +printf(_(" A %s version is in test"), "0.15-alpha1"); print (" \n"); print _("If your distribution doesn't have the latest version "); print _("you are advised to use the ")."<a href=\"#autopackage\">autopackage</a> "._("or the ")."<a href=\"#tarball\">"._("source tarball")."</a>\n"; @@ -20,6 +20,8 @@ print ("</a>\n"); print _(" If you use Debian unstable do")." apt-get install gajim\n"; print (" \n"); +printf(_(" The Debian package of %s is "), "0.15-alpha1"); +print "<a href=\"downloads/0.15/gajim_0.15~alpha1-1_all.deb\">"._("here")."</a>. \n"; print _(" A daily package from mercurial is also built. To use it, remove gajim")." (apt-get remove gajim), "._("add this line to your")." /etc/apt/source.list:\n"; print (" \n"); print (" deb ftp://ftp.gajim.org/debian unstable main\n"); @@ -146,10 +148,10 @@ print _(" There is a ")." <a href=\"downloads/".$download_folder."/gajim-".$last_version."-1.exe\">"._("Gajim installer")."</a>.\n"; #print _("The installer doesn't contain translations because of a") . " <a href=\"https://bugzilla.gnome.org/show_bug.cgi?id=574520\">" . _("GTK bug") . "</a>.\n"; print (" \n"); -#print _(" Here is a")." <a href=\"downloads/0.13/gajim-0.13-rc5.exe\">"._("Gajim installer")."</a> "; -#printf(_("for %s version "), "0.13-rc5"); -#print (".\n"); -#print (" \n"); +print _(" Here is a")." <a href=\"downloads/0.15/gajim-0.15-alpha1-1.exe\">"._("Gajim installer")."</a> "; +printf(_("for %s version "), "0.15-alpha1"); +print (".\n"); +print (" \n"); print (" \n"); print ("<a name=\"tarball\">\n"); @@ -158,8 +160,8 @@ print (" </h2>\n"); print ("</a>\n"); print _(" The tarball version of Gajim is ")."<a href=\"downloads/".$download_folder."/gajim-".$last_version.".tar.bz2\">"._("here")."</a>. "._("For information on how to build Gajim,")." <a href=\"http://hg.gajim.org/gajim/raw-file/tip/README.html\">see the <tt>README</tt></a> ("._("in English")."). \n"; -#printf(_(" The tarball version of %s is "), "0.13-rc5"); -#print "<a href=\"downloads/0.13/gajim-0.13.tar.gz\">"._("here")."</a>. \n"; +printf(_(" The tarball version of %s is "), "0.15-alpha1"); +print "<a href=\"downloads/0.15/gajim-0.15-alpha1.tar.gz\">"._("here")."</a>. \n"; print _("If you want to use the last unstable development version, then you should checkout the mercurial repository.\n"); diff -r 7ce8255753f0 -r e646c11ae263 index.php --- a/index.php Fri Jul 22 13:18:58 2011 +0200 +++ b/index.php Sat Aug 27 18:53:23 2011 +0200 @@ -49,70 +49,81 @@ $tpl->set_var("NEWS_MAIN", _("NEWS")); $array_news_title = array( - 0 => sprintf(_("Gajim %s is here!"), "0.14.4"), - 1 => sprintf(_("Gajim %s is here!"), "0.14.3"), - 2 => sprintf(_("Gajim %s is here!"), "0.14.2"), - 3 => sprintf(_("Gajim %s is here!"), "0.14.1"), - 4 => sprintf(_("Gajim %s is here!"), "0.14"), - 5 => sprintf(_("Gajim %s is here!"), "0.13.4")); + 0 => sprintf(_("Alpha-release of Gajim %s"), "0.15")); + 1 => sprintf(_("Gajim %s is here!"), "0.14.4"), + 2 => sprintf(_("Gajim %s is here!"), "0.14.3"), + 3 => sprintf(_("Gajim %s is here!"), "0.14.2"), + 4 => sprintf(_("Gajim %s is here!"), "0.14.1"), + 5 => sprintf(_("Gajim %s is here!"), "0.14"), // 5 => sprintf(_("Release candidate 5 of Gajim %s"), "0.13"), // 6 => sprintf(_("Beta-release of Gajim %s"), "0.12"), // 7 => sprintf(_("Alpha-release of Gajim %s"), "0.12")); // 3 => sprintf(_("New windows installer")), $array_news_date = array( - 0 => _("22 July 2011"), - 1 => _("19 June 2011"), - 2 => _("07 June 2011"), - 3 => _("26 October 2010"), - 4 => _("02 September 2010"), - 5 => _("02 April 2010")); + 0 => _("27 August 2011"), + 1 => _("22 July 2011"), + 2 => _("19 June 2011"), + 3 => _("07 June 2011"), + 4 => _("26 October 2010"), + 5 => _("02 September 2010")); $array_news_desc = array( - 0 => sprintf(_("Version %s of Gajim has been released."), "0.14.4"), - 1 => sprintf(_("Version %s of Gajim has been released."), "0.14.3"), - 2 => sprintf(_("Version %s of Gajim has been released."), "0.14.2"), - 3 => sprintf(_("Version %s of Gajim has been released."), "0.14.1"), - 4 => sprintf(_("Version %s of Gajim has been released."), "0.14"), - 5 => sprintf(_("Version %s of Gajim has been released."), "0.13.4")); + 0 => sprintf(_("Version %s will arrive soon."), "0.15")); + 1 => sprintf(_("Version %s of Gajim has been released."), "0.14.4"), + 2 => sprintf(_("Version %s of Gajim has been released."), "0.14.3"), + 3 => sprintf(_("Version %s of Gajim has been released."), "0.14.2"), + 4 => sprintf(_("Version %s of Gajim has been released."), "0.14.1"), + 5 => sprintf(_("Version %s of Gajim has been released."), "0.14")); // 6 => sprintf(_("Version %s will arrive very soon."), "0.12"), // 7 => sprintf(_("Version %s will arrive soon."), "0.12")); // 3 => sprintf(_("New Windows Installer with GTK+ included.")), $array_news_whats_new = array( - 0 => sprintf(_("What's new since %s:"), "0.14.3"), - 1 => sprintf(_("What's new since %s:"), "0.14.2"), - 2 => sprintf(_("What's new since %s:"), "0.14.1"), - 3 => sprintf(_("What's new since %s:"), "0.14"), - 4 => sprintf(_("What's new since %s:"), "0.13.4"), - 5 => sprintf(_("What's new since %s:"), "0.13.3")); + 0 => sprintf(_("What's new since %s:"), "0.14.4"), + 1 => sprintf(_("What's new since %s:"), "0.14.3"), + 2 => sprintf(_("What's new since %s:"), "0.14.2"), + 3 => sprintf(_("What's new since %s:"), "0.14.1"), + 4 => sprintf(_("What's new since %s:"), "0.14"), + 5 => sprintf(_("What's new since %s:"), "0.13.4")); // 3 => sprintf(_("What's new in it:")), $array_news_items[0] = array( + 0 => _("Plugin system"), + 1 => _("Whiteboard (via a plugin)"), + 2 => _("Message archiving"), + 3 => _("Stream managment"), + 4 => _("Nested roster group"), + 5 => _("Roster filtrering"), + 6 => _("Full changelog, see") . " <a href = \"http://hg.gajim.org/gajim/file/db4ecb0d1f18/ChangeLog\">"._("Full ChangeLog")."</a> ", + 7 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.15\">"._("List of fixed bugs")."</a>", + ); + +$array_news_items[1] = array( 0 => _("Fix translation issue"), 1 => _("Full changelog, see") . " <a href = \"http://hg.gajim.org/gajim/file/9476e66272c3/ChangeLog\">"._("Full ChangeLog")."</a> ", 2 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.14.4\">"._("List of fixed bugs")."</a>", ); -$array_news_items[1] = array( +$array_news_items[2] = array( 0 => _("Fix history viewer"), 1 => _("Fix closing roster window"), 2 => _("Full changelog, see") . " <a href = \"http://hg.gajim.org/gajim/file/7798a90157c7/ChangeLog\">"._("Full ChangeLog")."</a> ", 3 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.14.3\">"._("List of fixed bugs")."</a>", ); -$array_news_items[2] = array( +$array_news_items[3] = array( 0 => _("Fix CPU usage when testing file transfer proxies"), 1 => _("Fix invalid XML char regex"), 2 => _("Various minor bugfixes, see") . " <a href = \"http://hg.gajim.org/gajim/file/baf4786b33fe/ChangeLog\">"._("Full ChangeLog")."</a> ", 3 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.14.2\">"._("List of fixed bugs")."</a>", ); -$array_news_items[3] = array( +$array_news_items[4] = array( 0 => _("Various minor bugfixes, see") . " <a href = \"http://hg.gajim.org/gajim/file/d56f061aca8d/ChangeLog\">"._("Full ChangeLog")."</a> ", 1 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.14.1\">"._("List of fixed bugs")."</a>", ); -$array_news_items[4] = array( +$array_news_items[5] = array( 0 => _("Jingle audio / video chat"), 1 => _("Improve startup time"), 2 => _("Groupchat auto-rejoin"), @@ -123,14 +134,6 @@ 7 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.14\">"._("List of fixed bugs")."</a>", ); -$array_news_items[5] = array( - 0 => _("Fix some TLS connection"), - 1 => _("Don't raise a lot of \"DB Error\" dialog"), - 2 => _("Fix contact synchronisation"), - 3 => _("Add japanese translation"), - 4 => _("Minor fixes"), - ); - $tpl->set_block("page", "NEWS_LIST", "item"); // define intern block $tpl->set_block("page", "NEWS", "news"); // define extern block for ($i=0; $i<sizeof($array_news_title); $i++) {

1 0

gajim: prepare windows installer for 0.15-alpha1
by Yann Leboulanger 27 Aug '11

27 Aug '11

changeset db4ecb0d1f18 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=db4ecb0d1f18 description: prepare windows installer for 0.15-alpha1 diffstat: gajim.nsi | 22 +++++++++++++++++++++- setup_win32.py | 2 +- 2 files changed, 22 insertions(+), 2 deletions(-) diffs (72 lines): diff -r 8ec78f5747ec -r db4ecb0d1f18 gajim.nsi --- a/gajim.nsi Sat Aug 27 12:21:09 2011 +0200 +++ b/gajim.nsi Sat Aug 27 13:49:11 2011 +0200 @@ -146,6 +146,7 @@ File "THANKS.artists" SetOutPath "$INSTDIR\bin" + File "bin\_bsddb.pyd" File "bin\_ctypes.pyd" File "bin\_hashlib.pyd" File "bin\_socket.pyd" @@ -234,6 +235,16 @@ File /r "bin\gtk\share\xml" SectionEnd +Section "Plugins" SecPlugins + SetOutPath "$INSTDIR\plugins" + File /r "plugins\acronyms_expander" + File /r "plugins\banner_tweaks" + File /r "plugins\length_notifier" + File /r "plugins\plugin_installer" + File /r "plugins\triggers" + File /r "plugins\whiteboard" +SectionEnd + SectionGroup $(NAME_Emoticons) Section "animated" SecEmoticonsAnimated @@ -641,6 +652,7 @@ RMDir /r "$INSTDIR\bin\gtk\share\xml" RMDir "$INSTDIR\bin\gtk\share" RMDir "$INSTDIR\bin\gtk" + Delete "$INSTDIR\bin\_bsddb.pyd" Delete "$INSTDIR\bin\_ctypes.pyd" Delete "$INSTDIR\bin\_hashlib.pyd" Delete "$INSTDIR\bin\_socket.pyd" @@ -677,7 +689,8 @@ Delete "$INSTDIR\bin\win32file.pyd" Delete "$INSTDIR\bin\win32pipe.pyd" Delete "$INSTDIR\bin\winsound.pyd" - RMDir "$INSTDIR\bin" + Delete "$INSTDIR\bin\msvcr90.dll" + RMDir /r "$INSTDIR\bin" RMDir /r "$INSTDIR\data\gui" RMDir /r "$INSTDIR\data\moods" RMDir /r "$INSTDIR\data\activities" @@ -698,6 +711,13 @@ RMDir /r "$INSTDIR\data\iconsets\transports" RMDir "$INSTDIR\data\iconsets" RMDir "$INSTDIR\data" + RMDir /r "$INSTDIR\plugins\acronyms_expander" + RMDir /r "$INSTDIR\plugins\banner_tweaks" + RMDir /r "$INSTDIR\plugins\length_notifier" + RMDir /r "$INSTDIR\plugins\plugin_installer" + RMDir /r "$INSTDIR\plugins\triggers" + RMDir /r "$INSTDIR\plugins\whiteboard" + RMDir "$INSTDIR\plugins" RMDir /r "$INSTDIR\icons\hicolor" RMDir "$INSTDIR\icons" RMDir /r "$INSTDIR\po\be" diff -r 8ec78f5747ec -r db4ecb0d1f18 setup_win32.py --- a/setup_win32.py Sat Aug 27 12:21:09 2011 +0200 +++ b/setup_win32.py Sat Aug 27 13:49:11 2011 +0200 @@ -31,7 +31,7 @@ options = { 'build_exe': { - 'includes': ['gtk.keysyms'], + 'includes': ['gtk.keysyms', 'dumbdbm', 'dbhash', 'bsddb', 'new'], 'base': 'Win32GUI', 'bin_excludes': [ 'iconv.dll', 'intl.dll', 'libatk-1.0-0.dll',

1 0

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

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits August 2011