Commits January 2011

commits@gajim.org

2 participants
27 discussions

gajim: fix invalid XML char regex. Fixes #5427
by Yann Leboulanger 06 Jan '11

06 Jan '11

changeset f78ccd449879 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f78ccd449879 description: fix invalid XML char regex. Fixes #5427 diffstat: src/gui_interface.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r faa02aa4a17b -r f78ccd449879 src/gui_interface.py --- a/src/gui_interface.py Thu Jan 06 17:06:02 2011 +0100 +++ b/src/gui_interface.py Thu Jan 06 21:01:43 2011 +0100 @@ -1779,7 +1779,7 @@ self.sth_at_sth_dot_sth = r'\S+(a)\S+\.\S*[^\s)?]' # Invalid XML chars - self.invalid_XML_chars = u'[\x00-\x08]|[\x0b-\x0c]|[\x0e-\x19]|'\ + self.invalid_XML_chars = u'[\x00-\x08]|[\x0b-\x0c]|[\x0e-\x1f]|'\ u'[\ud800-\udfff]|[\ufffe-\uffff]' def popup_emoticons_under_button(self, button, parent_win):

1 0

gajim: prevent traceback. Fixes #5978
by Yann Leboulanger 06 Jan '11

06 Jan '11

changeset faa02aa4a17b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=faa02aa4a17b description: prevent traceback. Fixes #5978 diffstat: plugins/snarl_notifications/plugin.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r d1ac2e526ed0 -r faa02aa4a17b plugins/snarl_notifications/plugin.py --- a/plugins/snarl_notifications/plugin.py Thu Jan 06 16:50:38 2011 +0100 +++ b/plugins/snarl_notifications/plugin.py Thu Jan 06 17:06:02 2011 +0100 @@ -68,6 +68,8 @@ nickname = gajim.get_contact_name_from_jid(account, jid_without_resource) elif msg_type in ('pm', 'groupchat'): nickname = gajim.get_resource_from_jid(jid) + else: + nickname = jid print "Event '%s' occured. Arguments: %s\n\n===\n"%(event_name, pformat(args)) print "Event '%s' occured. Arguments: \naccount = %s\njid = %s\nmsg = %s\nnickname = %s"%(

1 0

gajim: correctly cleanup ged handlers when removing an account
by Yann Leboulanger 06 Jan '11

06 Jan '11

changeset d1ac2e526ed0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d1ac2e526ed0 description: correctly cleanup ged handlers when removing an account diffstat: src/common/connection.py | 5 +++- src/common/connection_handlers.py | 52 +++++++++++++++++++++++++++++++++++++++ src/common/message_archiving.py | 5 +++ src/common/protocol/bytestream.py | 4 +++ src/common/protocol/caps.py | 6 ++++ src/common/pubsub.py | 6 +++- src/config.py | 1 + 7 files changed, 77 insertions(+), 2 deletions(-) diffs (165 lines): diff -r 4ff5c5e0e319 -r d1ac2e526ed0 src/common/connection.py --- a/src/common/connection.py Thu Jan 06 14:53:34 2011 +0100 +++ b/src/common/connection.py Thu Jan 06 16:50:38 2011 +0100 @@ -719,11 +719,14 @@ self._nec_agent_info_received) # END __init__ - def __del__(self): + def cleanup(self): + ConnectionHandlers.cleanup(self) gajim.ged.remove_event_handler('privacy-list-received', ged.CORE, self._nec_privacy_list_received) gajim.ged.remove_event_handler('agent-info-error-received', ged.CORE, self._nec_agent_info_error_received) + gajim.ged.remove_event_handler('agent-info-received', ged.CORE, + self._nec_agent_info_received) def get_config_values_or_default(self): if gajim.config.get_per('accounts', self.name, 'keep_alives_enabled'): diff -r 4ff5c5e0e319 -r d1ac2e526ed0 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Thu Jan 06 14:53:34 2011 +0100 +++ b/src/common/connection_handlers.py Thu Jan 06 16:50:38 2011 +0100 @@ -766,6 +766,16 @@ gajim.ged.register_event_handler('decrypted-message-received', ged.CORE, self._nec_decrypted_message_received) + def cleanup(self): + gajim.ged.remove_event_handler('iq-error-received', ged.CORE, + self._nec_iq_error_received) + gajim.ged.remove_event_handler('presence-received', ged.CORE, + self._nec_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, + self._nec_decrypted_message_received) + def _nec_iq_error_received(self, obj): if obj.conn.name != self.name: return @@ -1265,6 +1275,48 @@ gajim.ged.register_event_handler('agent-removed', ged.CORE, self._nec_agent_removed) + def cleanup(self): + ConnectionHandlersBase.cleanup(self) + ConnectionCaps.cleanup(self) + ConnectionArchive.cleanup(self) + ConnectionPubSub.cleanup(self) + gajim.ged.remove_event_handler('http-auth-received', ged.CORE, + self._nec_http_auth_received) + gajim.ged.remove_event_handler('version-request-received', ged.CORE, + self._nec_version_request_received) + gajim.ged.remove_event_handler('last-request-received', ged.CORE, + self._nec_last_request_received) + gajim.ged.remove_event_handler('time-request-received', ged.CORE, + self._nec_time_request_received) + gajim.ged.remove_event_handler('time-revised-request-received', + ged.CORE, self._nec_time_revised_request_received) + gajim.ged.remove_event_handler('roster-set-received', + ged.CORE, self._nec_roster_set_received) + gajim.ged.remove_event_handler('private-storage-bookmarks-received', + ged.CORE, self._nec_private_storate_bookmarks_received) + gajim.ged.remove_event_handler('private-storage-rosternotes-received', + ged.CORE, self._nec_private_storate_rosternotes_received) + gajim.ged.remove_event_handler('roster-received', ged.CORE, + self._nec_roster_received) + gajim.ged.remove_event_handler('iq-error-received', ged.CORE, + self._nec_iq_error_received) + gajim.ged.remove_event_handler('gmail-new-mail-received', ged.CORE, + self._nec_gmail_new_mail_received) + gajim.ged.remove_event_handler('ping-received', ged.CORE, + self._nec_ping_received) + gajim.ged.remove_event_handler('subscribe-presence-received', + ged.CORE, self._nec_subscribe_presence_received) + gajim.ged.remove_event_handler('subscribed-presence-received', + ged.CORE, self._nec_subscribed_presence_received) + gajim.ged.remove_event_handler('subscribed-presence-received', + ged.POSTGUI, self._nec_subscribed_presence_received_end) + gajim.ged.remove_event_handler('unsubscribed-presence-received', + ged.CORE, self._nec_unsubscribed_presence_received) + gajim.ged.remove_event_handler('unsubscribed-presence-received', + ged.POSTGUI, self._nec_unsubscribed_presence_received_end) + gajim.ged.remove_event_handler('agent-removed', ged.CORE, + self._nec_agent_removed) + def build_http_auth_answer(self, iq_obj, answer): if not self.connection or self.connected < 2: return diff -r 4ff5c5e0e319 -r d1ac2e526ed0 src/common/message_archiving.py --- a/src/common/message_archiving.py Thu Jan 06 14:53:34 2011 +0100 +++ b/src/common/message_archiving.py Thu Jan 06 16:50:38 2011 +0100 @@ -46,6 +46,11 @@ 'archiving-preferences-changed-received', ged.CORE, self._nec_archiving_changed_received) + def cleanup(self): + gajim.ged.remove_event_handler( + 'archiving-preferences-changed-received', ged.CORE, + self._nec_archiving_changed_received) + def request_message_archiving_preferences(self): iq_ = common.xmpp.Iq('get') iq_.setTag('pref', namespace=common.xmpp.NS_ARCHIVE) diff -r 4ff5c5e0e319 -r d1ac2e526ed0 src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Thu Jan 06 14:53:34 2011 +0100 +++ b/src/common/protocol/bytestream.py Thu Jan 06 16:50:38 2011 +0100 @@ -85,6 +85,10 @@ gajim.ged.register_event_handler('file-request-received', ged.GUI1, self._nec_file_request_received) + def cleanup(self): + gajim.ged.remove_event_handler('file-request-received', ged.GUI1, + self._nec_file_request_received) + def _ft_get_our_jid(self): our_jid = gajim.get_jid_from_account(self.name) resource = self.server_resource diff -r 4ff5c5e0e319 -r d1ac2e526ed0 src/common/protocol/caps.py --- a/src/common/protocol/caps.py Thu Jan 06 14:53:34 2011 +0100 +++ b/src/common/protocol/caps.py Thu Jan 06 16:50:38 2011 +0100 @@ -46,6 +46,12 @@ gajim.ged.register_event_handler('agent-info-received', ged.GUI1, self._nec_agent_info_received_caps) + def cleanup(self): + gajim.ged.remove_event_handler('caps-presence-received', ged.GUI1, + self._nec_caps_presence_received) + gajim.ged.remove_event_handler('agent-info-received', ged.GUI1, + self._nec_agent_info_received_caps) + def caps_change_account_name(self, new_name): self._account = new_name diff -r 4ff5c5e0e319 -r d1ac2e526ed0 src/common/pubsub.py --- a/src/common/pubsub.py Thu Jan 06 14:53:34 2011 +0100 +++ b/src/common/pubsub.py Thu Jan 06 16:50:38 2011 +0100 @@ -37,6 +37,10 @@ gajim.ged.register_event_handler('pubsub-bookmarks-received', ged.CORE, self._nec_pubsub_bookmarks_received) + def cleanup(self): + gajim.ged.remove_event_handler('pubsub-bookmarks-received', + ged.CORE, self._nec_pubsub_bookmarks_received) + def send_pb_subscription_query(self, jid, cb, *args, **kwargs): if not self.connection or self.connected < 2: return @@ -212,4 +216,4 @@ id_ = self.connection.getAnID() query.setID(id_) self.awaiting_answers[id_] = (connection_handlers.PEP_CONFIG,) - self.connection.send(query) \ No newline at end of file + self.connection.send(query) diff -r 4ff5c5e0e319 -r d1ac2e526ed0 src/config.py --- a/src/config.py Thu Jan 06 14:53:34 2011 +0100 +++ b/src/config.py Thu Jan 06 16:50:38 2011 +0100 @@ -3005,6 +3005,7 @@ gajim.interface.roster.close_all(self.account, force=True) if self.account in gajim.connections: gajim.connections[self.account].disconnect(on_purpose=True) + gajim.connections[self.account].cleanup() del gajim.connections[self.account] gajim.logger.remove_roster(gajim.get_jid_from_account(self.account)) gajim.config.del_per('accounts', self.account)

1 0

gajim: add ability for chatstate to fo from inactive to pause wh...
by Yann Leboulanger 06 Jan '11

06 Jan '11

changeset 4ff5c5e0e319 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4ff5c5e0e319 description: add ability for chatstate to fo from inactive to pause when we re-select a tab where we already typed something. Fixes #4380 diffstat: src/chat_control.py | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diffs (48 lines): diff -r a00fb2c888b1 -r 4ff5c5e0e319 src/chat_control.py --- a/src/chat_control.py Thu Jan 06 09:08:47 2011 +0100 +++ b/src/chat_control.py Thu Jan 06 14:53:34 2011 +0100 @@ -2248,8 +2248,8 @@ if self.kbd_activity_in_last_5_secs and message_buffer.get_char_count(): # Only composing if the keyboard activity was in text entry self.send_chatstate('composing') - elif self.mouse_over_in_last_5_secs and\ - jid == self.parent_win.get_active_jid(): + elif self.mouse_over_in_last_5_secs and current_state == 'inactive' and\ + jid == self.parent_win.get_active_jid(): self.send_chatstate('active') else: if current_state == 'composing': @@ -2563,15 +2563,8 @@ self.reset_kbd_mouse_timeout_vars() return - # prevent going paused if we we were not composing (JEP violation) - if state == 'paused' and not contact.our_chatstate == 'composing': - # go active before - MessageControl.send_message(self, None, chatstate = 'active') - contact.our_chatstate = 'active' - self.reset_kbd_mouse_timeout_vars() - # if we're inactive prevent composing (JEP violation) - elif contact.our_chatstate == 'inactive' and state == 'composing': + if contact.our_chatstate == 'inactive' and state == 'composing': # go active before MessageControl.send_message(self, None, chatstate = 'active') contact.our_chatstate = 'active' @@ -2687,7 +2680,15 @@ # send chatstate inactive to the one we're leaving # and active to the one we visit if state: - self.send_chatstate('active', self.contact) + message_buffer = self.msg_textview.get_buffer() + if message_buffer.get_char_count(): + self.send_chatstate('paused', self.contact) + else: + self.send_chatstate('active', self.contact) + self.reset_kbd_mouse_timeout_vars() + gobject.source_remove(self.possible_paused_timeout_id) + gobject.source_remove(self.possible_inactive_timeout_id) + self._schedule_activity_timers() else: self.send_chatstate('inactive', self.contact) # Hide bigger avatar window

1 0

gajim: Add keyboard shortbut to manage bookmarks window. Fixes #...
by Yann Leboulanger 06 Jan '11

06 Jan '11

changeset a00fb2c888b1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a00fb2c888b1 description: Add keyboard shortbut to manage bookmarks window. Fixes #4700 diffstat: data/gui/manage_bookmarks_window.ui | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diffs (81 lines): diff -r a22653d7a1e4 -r a00fb2c888b1 data/gui/manage_bookmarks_window.ui --- a/data/gui/manage_bookmarks_window.ui Wed Jan 05 20:59:10 2011 +0100 +++ b/data/gui/manage_bookmarks_window.ui Thu Jan 06 09:08:47 2011 +0100 @@ -105,7 +105,8 @@ <object class="GtkLabel" id="label318"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Password:</property> + <property name="label" translatable="yes">_Password:</property> + <property name="use_underline">True</property> </object> <packing> <property name="top_attach">4</property> @@ -147,7 +148,8 @@ <object class="GtkLabel" id="label317"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Server:</property> + <property name="label" translatable="yes">_Server:</property> + <property name="use_underline">True</property> </object> <packing> <property name="top_attach">3</property> @@ -160,7 +162,8 @@ <object class="GtkLabel" id="label316"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Room:</property> + <property name="label" translatable="yes">Roo_m:</property> + <property name="use_underline">True</property> </object> <packing> <property name="top_attach">2</property> @@ -201,7 +204,8 @@ <object class="GtkLabel" id="label315"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Nickname:</property> + <property name="label" translatable="yes">_Nickname:</property> + <property name="use_underline">True</property> </object> <packing> <property name="top_attach">1</property> @@ -214,7 +218,8 @@ <object class="GtkLabel" id="label325"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Title:</property> + <property name="label" translatable="yes">_Title:</property> + <property name="use_underline">True</property> </object> <packing> <property name="x_options">GTK_FILL</property> @@ -237,7 +242,8 @@ <object class="GtkLabel" id="label326"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Print status:</property> + <property name="label" translatable="yes">Pr_int status:</property> + <property name="use_underline">True</property> </object> <packing> <property name="top_attach">6</property> @@ -274,7 +280,7 @@ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <child> <object class="GtkCheckButton" id="autojoin_checkbutton"> - <property name="label" translatable="yes">Auto join</property> + <property name="label" translatable="yes">A_uto join</property> <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property> @@ -290,7 +296,7 @@ </child> <child> <object class="GtkCheckButton" id="minimize_checkbutton"> - <property name="label" translatable="yes">Minimize on Auto Join</property> + <property name="label" translatable="yes">Minimi_ze on Auto Join</property> <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property>

1 0

gajim: correctly unregister from server when another stanza is s...
by Yann Leboulanger 05 Jan '11

05 Jan '11

changeset a22653d7a1e4 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a22653d7a1e4 description: correctly unregister from server when another stanza is sent in the same time diffstat: src/common/connection.py | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diffs (41 lines): diff -r ad8c0e13d938 -r a22653d7a1e4 src/common/connection.py --- a/src/common/connection.py Tue Jan 04 15:52:37 2011 +0100 +++ b/src/common/connection.py Wed Jan 05 20:59:10 2011 +0100 @@ -1581,9 +1581,10 @@ self.request_message_archiving_preferences() + self.privacy_rules_requested = False self.discoverInfo(gajim.config.get_per('accounts', self.name, 'hostname'), id_prefix='Gajim_') - self.privacy_rules_requested = False + # Discover Stun server(s) gajim.resolver.resolve('_stun._udp.' + helpers.idn_to_ascii( self.connected_hostname), self._on_stun_resolved) @@ -2456,16 +2457,20 @@ if gajim.account_is_connected(self.name): hostname = gajim.config.get_per('accounts', self.name, 'hostname') iq = common.xmpp.Iq(typ = 'set', to = hostname) + id_ = self.connection.getAnID() + iq.setID(id_) iq.setTag(common.xmpp.NS_REGISTER + ' query').setTag('remove') - def _on_answer(result): - if result.getType() == 'result': + def _on_answer(con, result): + if result.getID() == id_: on_remove_success(True) return self.dispatch('ERROR', (_('Unregister failed'), - _('Unregistration with server %(server)s failed: %(error)s') \ - % {'server': hostname, 'error': result.getErrorMsg()})) + _('Unregistration with server %(server)s failed: ' + '%(error)s') % {'server': hostname, + 'error': result.getErrorMsg()})) on_remove_success(False) - con.SendAndCallForResponse(iq, _on_answer) + con.RegisterHandler('iq', _on_answer, 'result', system=True) + con.SendAndWaitForResponse(iq) return on_remove_success(False) if self.connected == 0:

1 0

gajim-website: improve english on website. Fixes #5350
by Yann Leboulanger 04 Jan '11

04 Jan '11

changeset 8e35622d8492 in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=8e35622d8492 description: improve english on website. Fixes #5350 diffstat: index.php | 22 ++++++------ locale/bg_BG/LC_MESSAGES/msg.po | 36 +++++++------------ locale/de_DE/LC_MESSAGES/msg.po | 36 +++++++------------ locale/eo/LC_MESSAGES/msg.po | 36 +++++++------------ locale/es_ES/LC_MESSAGES/msg.po | 36 +++++++------------ locale/fr_FR/LC_MESSAGES/msg.po | 42 +++++++++++------------ locale/hu_HU/LC_MESSAGES/msg.po | 73 +++++++++++++++++++++------------------- locale/it_IT/LC_MESSAGES/msg.po | 36 +++++++------------ locale/pl_PL/LC_MESSAGES/msg.po | 36 +++++++------------ locale/pt_BR/LC_MESSAGES/msg.po | 36 +++++++------------ locale/ru_RU/LC_MESSAGES/msg.po | 36 +++++++------------ msg.pot | 36 +++++++------------ 12 files changed, 196 insertions(+), 265 deletions(-) diffs (truncated from 1381 to 300 lines): diff -r 6b394f90ab92 -r 8e35622d8492 index.php --- a/index.php Mon Dec 06 23:35:33 2010 +0100 +++ b/index.php Tue Jan 04 16:30:23 2011 +0100 @@ -22,20 +22,20 @@ $tpl->set_var("FEATURES_TITLE", _("FEATURES:")); $array_features = array( 0 => _("Tabbed chat window and single window modes"), - 1 => _("Group chat support (with MUC protocol), invitation, chat to groupchat transformation, minimize groupchat to roster"), - 2 => _("Emoticons, Avatars, PEP (user activity, mood and tune)"), - 3 => _("Audio / Video conferences"), - 4 => _("File transfer, Room Bookmarks"), - 5 => _("Metacontacts Support"), - 6 => _("Trayicon, Speller, extented chat history functionalities"), + 1 => _("Group chat support (with MUC protocol), invitation, chat to group chat transformation, minimize group chat to roster"), + 2 => _("Emoticons, avatars, PEP (user activity, mood and tune)"), + 3 => _("Audio / video conferences"), + 4 => _("File transfer, room rookmarks"), + 5 => _("Metacontacts support"), + 6 => _("Trayicon, speller, extented chat history functionalities"), 7 => _("TLS, GPG and End-To-End encryption support (with SSL legacy support)"), - 8 => _("Transport Registration support"), - 9 => _("Service Discovery including Nodes, user search"), + 8 => _("Transport registration support"), + 9 => _("Service discovery including nodes, user search"), 10 => _("Wikipedia, dictionary and search engine lookup"), 11 => _("Multiple accounts support"), - 12 => _("DBus Capabilities. Read")." <a href=\"http://trac.gajim.org/wiki/GajimDBus\">"._("more information")."</a>", - 13 => _("XML Console"), - 14 => _("link local (bonjour / zeroconf), BOSH"), + 12 => _("DBus capabilities. Read")." <a href=\"http://trac.gajim.org/wiki/GajimDBus\">"._("more information")."</a>", + 13 => _("XML console"), + 14 => _("Link local (bonjour / zeroconf), BOSH"), 15 => _("Gajim is available in 25 languages: Basque, Belarusian, Brasilian, British, Bulgarian, Chinese (simplified), Croatian, Czech, Danish, English, Esperanto, French, Galician, German, Italian, Japanese, Lithuanian, Norwegian (Bokmål), Polish, Russian, Serbian, Spanish, Slovak, Swedish and Ukrainian"), ); diff -r 6b394f90ab92 -r 8e35622d8492 locale/bg_BG/LC_MESSAGES/msg.po --- a/locale/bg_BG/LC_MESSAGES/msg.po Mon Dec 06 23:35:33 2010 +0100 +++ b/locale/bg_BG/LC_MESSAGES/msg.po Tue Jan 04 16:30:23 2011 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gajim website\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-26 19:53+0200\n" +"POT-Creation-Date: 2011-01-04 16:04+0100\n" "PO-Revision-Date: 2007-03-14 17:52+0200\n" "Last-Translator: Yavor Doganov <yavor(a)gnu.org>\n" "Language-Team: Bulgarian <dict(a)fsa-bg.org>\n" @@ -135,7 +135,7 @@ msgid " Language:" msgstr " Език:" -#: Design.php:192 +#: Design.php:193 msgid "" " Site optimized for W3C Standards and realized with vim editor under GNU/" "Linux by Asterix (Jabber ID: asterix(a)jabber.lagaule.org)\n" @@ -477,14 +477,6 @@ msgid "Gajim installer" msgstr "Инсталатор за „Уиндоус“" -#: downloads.php:147 -msgid "GTK bug" -msgstr "" - -#: downloads.php:147 -msgid "The installer doesn't contain translations because of a" -msgstr "" - #: downloads.php:157 msgid " Source\n" msgstr " Изходен код\n" @@ -665,29 +657,29 @@ #: index.php:25 msgid "" -"Group chat support (with MUC protocol), invitation, chat to groupchat " -"transformation, minimize groupchat to roster" +"Group chat support (with MUC protocol), invitation, chat to group chat " +"transformation, minimize group chat to roster" msgstr "" #: index.php:26 -msgid "Emoticons, Avatars, PEP (user activity, mood and tune)" +msgid "Emoticons, avatars, PEP (user activity, mood and tune)" msgstr "" #: index.php:27 -msgid "Audio / Video conferences" +msgid "Audio / video conferences" msgstr "" #: index.php:28 #, fuzzy -msgid "File transfer, Room Bookmarks" +msgid "File transfer, room rookmarks" msgstr "Емотикони, аватари, файлов трансфер, отметки за стаи" #: index.php:29 -msgid "Metacontacts Support" +msgid "Metacontacts support" msgstr "Поддръжка на мета-контакти" #: index.php:30 -msgid "Trayicon, Speller, extented chat history functionalities" +msgid "Trayicon, speller, extented chat history functionalities" msgstr "" "Икона в областта за уведомяване, проверка на правописа, разширени " "възможности за история на разговорите" @@ -698,12 +690,12 @@ msgstr "Поддръжка на TLS и GPG (с поддръжка на SSL)" #: index.php:32 -msgid "Transport Registration support" +msgid "Transport registration support" msgstr "Регистрация на транспорти" #: index.php:33 #, fuzzy -msgid "Service Discovery including Nodes, user search" +msgid "Service discovery including nodes, user search" msgstr "Откриване на услуги, включително възли" #: index.php:34 @@ -715,7 +707,7 @@ msgstr "Поддръжка на много акаунти" #: index.php:36 -msgid "DBus Capabilities. Read" +msgid "DBus capabilities. Read" msgstr "Възможности за D-Bus. Прочетете" #: index.php:36 @@ -723,11 +715,11 @@ msgstr "повече информация" #: index.php:37 -msgid "XML Console" +msgid "XML console" msgstr "XML конзола" #: index.php:38 -msgid "link local (bonjour / zeroconf), BOSH" +msgid "Link local (bonjour / zeroconf), BOSH" msgstr "" #: index.php:39 diff -r 6b394f90ab92 -r 8e35622d8492 locale/de_DE/LC_MESSAGES/msg.po --- a/locale/de_DE/LC_MESSAGES/msg.po Mon Dec 06 23:35:33 2010 +0100 +++ b/locale/de_DE/LC_MESSAGES/msg.po Tue Jan 04 16:30:23 2011 +0100 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: msg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-26 19:53+0200\n" +"POT-Creation-Date: 2011-01-04 16:04+0100\n" "PO-Revision-Date: 2008-12-22 22:59+0100\n" "Last-Translator: \n" "Language-Team: German <kde-i18n-de(a)lists.kde.org>\n" @@ -137,7 +137,7 @@ msgid " Language:" msgstr " Sprache:" -#: Design.php:192 +#: Design.php:193 msgid "" " Site optimized for W3C Standards and realized with vim editor under GNU/" "Linux by Asterix (Jabber ID: asterix(a)jabber.lagaule.org)\n" @@ -492,14 +492,6 @@ msgid "Gajim installer" msgstr "Gajim-Installationsdatei" -#: downloads.php:147 -msgid "GTK bug" -msgstr "" - -#: downloads.php:147 -msgid "The installer doesn't contain translations because of a" -msgstr "" - #: downloads.php:157 msgid " Source\n" msgstr " Quellcode\n" @@ -690,30 +682,30 @@ #: index.php:25 msgid "" -"Group chat support (with MUC protocol), invitation, chat to groupchat " -"transformation, minimize groupchat to roster" +"Group chat support (with MUC protocol), invitation, chat to group chat " +"transformation, minimize group chat to roster" msgstr "" "Gruppenchat-Unterstützung (per MUC-Protokoll), Einladungen, Chat-zu-" "Gruppenchat-Transformation, minimieren des Gruppenchats in die Kontaktliste" #: index.php:26 -msgid "Emoticons, Avatars, PEP (user activity, mood and tune)" +msgid "Emoticons, avatars, PEP (user activity, mood and tune)" msgstr "Emoticons, Avatre, PEP (Benutzeraktivität, Stimmung und Musik)" #: index.php:27 -msgid "Audio / Video conferences" +msgid "Audio / video conferences" msgstr "" #: index.php:28 -msgid "File transfer, Room Bookmarks" +msgid "File transfer, room rookmarks" msgstr "Datenübertragung, Chatraum-Lesezeichen" #: index.php:29 -msgid "Metacontacts Support" +msgid "Metacontacts support" msgstr "Unterstützung von Meta-Kontakten" #: index.php:30 -msgid "Trayicon, Speller, extented chat history functionalities" +msgid "Trayicon, speller, extented chat history functionalities" msgstr "Tray-Icon, Rechtschreibprüfung, erweiterte Verlauf-Funktionen" #: index.php:31 @@ -723,11 +715,11 @@ "Unterstützung für altes SSL)" #: index.php:32 -msgid "Transport Registration support" +msgid "Transport registration support" msgstr "Unterstützung für Transporte (ICQ, AIM, MSN, usw.)" #: index.php:33 -msgid "Service Discovery including Nodes, user search" +msgid "Service discovery including nodes, user search" msgstr "Dienste durchsuchen (inkl. Jabber-Nodes), Benutzer-Suche" #: index.php:34 @@ -740,7 +732,7 @@ msgstr "Unterstützung für mehrere Accounts" #: index.php:36 -msgid "DBus Capabilities. Read" +msgid "DBus capabilities. Read" msgstr "DBus-Unterstützung. Lesen Sie hier" #: index.php:36 @@ -748,12 +740,12 @@ msgstr "genauere Informationen" #: index.php:37 -msgid "XML Console" +msgid "XML console" msgstr "XML-Konsole" #: index.php:38 #, fuzzy -msgid "link local (bonjour / zeroconf), BOSH" +msgid "Link local (bonjour / zeroconf), BOSH" msgstr "Chats im lokalen Netzwerk (per zeroconf / bonjour)" #: index.php:39 diff -r 6b394f90ab92 -r 8e35622d8492 locale/eo/LC_MESSAGES/msg.po --- a/locale/eo/LC_MESSAGES/msg.po Mon Dec 06 23:35:33 2010 +0100 +++ b/locale/eo/LC_MESSAGES/msg.po Tue Jan 04 16:30:23 2011 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gajim-website 20061103\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-26 19:53+0200\n" +"POT-Creation-Date: 2011-01-04 16:04+0100\n" "PO-Revision-Date: 2007-02-19 20:40+0400\n" "Last-Translator: Sergio Ĥlutĉin <Sergey.Khlutchin(a)gmail.com>\n" "Language-Team: Esperanto <translation-team-eo(a)lists.sourceforge.net>\n" @@ -135,7 +135,7 @@ msgid " Language:" msgstr " Lingvo:" -#: Design.php:192 +#: Design.php:193 msgid "" " Site optimized for W3C Standards and realized with vim editor under GNU/" "Linux by Asterix (Jabber ID: asterix(a)jabber.lagaule.org)\n" @@ -471,14 +471,6 @@ msgid "Gajim installer" msgstr "Vindoza instalilo" -#: downloads.php:147 -msgid "GTK bug" -msgstr "" - -#: downloads.php:147 -msgid "The installer doesn't contain translations because of a" -msgstr "" - #: downloads.php:157 msgid " Source\n" msgstr " Fonto\n" @@ -654,29 +646,29 @@ #: index.php:25 msgid "" -"Group chat support (with MUC protocol), invitation, chat to groupchat " -"transformation, minimize groupchat to roster"

1 0

gajim: fallback to disco if clients don't support caps. Fixes #4071
by Yann Leboulanger 04 Jan '11

04 Jan '11

changeset ad8c0e13d938 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ad8c0e13d938 description: fallback to disco if clients don't support caps. Fixes #4071 diffstat: src/common/caps_cache.py | 42 ++++++++++++++++++++++++++--- src/common/connection_handlers_events.py | 45 +++++++++++++++++-------------- src/common/protocol/caps.py | 11 +++++-- 3 files changed, 70 insertions(+), 28 deletions(-) diffs (206 lines): diff -r 90cea0d90347 -r ad8c0e13d938 src/common/caps_cache.py --- a/src/common/caps_cache.py Tue Jan 04 11:08:26 2011 +0100 +++ b/src/common/caps_cache.py Tue Jan 04 15:52:37 2011 +0100 @@ -75,14 +75,17 @@ else: return False -def create_suitable_client_caps(node, caps_hash, hash_method): +def create_suitable_client_caps(node, caps_hash, hash_method, fjid=None): """ Create and return a suitable ClientCaps object for the given node, caps_hash, hash_method combination. """ if not node or not caps_hash: - # improper caps, ignore client capabilities. - client_caps = NullClientCaps() + if fjid: + client_caps = NoClientCaps(fjid) + else: + # improper caps, ignore client capabilities. + client_caps = NullClientCaps() elif not hash_method: client_caps = OldClientCaps(caps_hash, node) else: @@ -172,6 +175,7 @@ def __init__(self, caps_hash, node): self._hash = caps_hash self._node = node + self._hash_method = None def get_discover_strategy(self): return self._discover @@ -228,6 +232,7 @@ """ def __init__(self, caps_hash, node): AbstractClientCaps.__init__(self, caps_hash, node) + self._hash_method = 'old' def _lookup_in_cache(self, caps_cache): return caps_cache[('old', self._node + '#' + self._hash)] @@ -238,6 +243,22 @@ def _is_hash_valid(self, identities, features, dataforms): return True +class NoClientCaps(AbstractClientCaps): + """ + For clients that don't support XEP-0115 + """ + def __init__(self, fjid): + AbstractClientCaps.__init__(self, fjid, fjid) + self._hash_method = 'no' + + def _lookup_in_cache(self, caps_cache): + return caps_cache[('no', self._node)] + + def _discover(self, connection, jid): + connection.discoverInfo(jid) + + def _is_hash_valid(self, identities, features, dataforms): + return True class NullClientCaps(AbstractClientCaps): """ @@ -258,6 +279,7 @@ def __init__(self): AbstractClientCaps.__init__(self, None, None) + self._hash_method = 'dummy' def _lookup_in_cache(self, caps_cache): # lookup something which does not exist to get a new CacheItem created @@ -341,14 +363,17 @@ def set_and_store(self, identities, features): self.identities = identities self.features = features - self._logger.add_caps_entry(self.hash_method, self.hash, + if self.hash_method != 'no': + self._logger.add_caps_entry(self.hash_method, self.hash, identities, features) self.status = CACHED def update_last_seen(self): if not self._recently_seen: self._recently_seen = True - self._logger.update_caps_time(self.hash_method, self.hash) + if self.hash_method != 'no': + self._logger.update_caps_time(self.hash_method, + self.hash) def is_valid(self): """ @@ -401,3 +426,10 @@ discover(connection, jid) else: q.update_last_seen() + + def forget_caps(self, client_caps): + hash_method = client_caps._hash_method + hash = client_caps._hash + key = (hash_method, hash) + if key in self.__cache: + del self.__cache[key] diff -r 90cea0d90347 -r ad8c0e13d938 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Tue Jan 04 11:08:26 2011 +0100 +++ b/src/common/connection_handlers_events.py Tue Jan 04 15:52:37 2011 +0100 @@ -660,7 +660,27 @@ self.conn = self.base_event.conn return True -class PresenceReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): +class PresenceHelperEvent: + def _generate_show(self): + self.show = self.stanza.getShow() + if self.show not in ('chat', 'away', 'xa', 'dnd'): + self.show = '' # We ignore unknown show + if not self.ptype and not self.show: + self.show = 'online' + elif self.ptype == 'unavailable': + self.show = 'offline' + + def _generate_ptype(self): + self.ptype = self.stanza.getType() + if self.ptype == 'available': + self.ptype = None + rfc_types = ('unavailable', 'error', 'subscribe', 'subscribed', + 'unsubscribe', 'unsubscribed') + if self.ptype and not self.ptype in rfc_types: + self.ptype = None + +class PresenceReceivedEvent(nec.NetworkIncomingEvent, HelperEvent, +PresenceHelperEvent): name = 'presence-received' base_network_events = ['raw-pres-received'] @@ -674,15 +694,6 @@ self.keyID = helpers.prepare_and_validate_gpg_keyID(self.conn.name, self.jid, self.keyID) - def _generate_show(self): - self.show = self.stanza.getShow() - if self.show not in ('chat', 'away', 'xa', 'dnd'): - self.show = '' # We ignore unknown show - if not self.ptype and not self.show: - self.show = 'online' - elif self.ptype == 'unavailable': - self.show = 'offline' - def _generate_prio(self): self.prio = self.stanza.getPriority() try: @@ -690,15 +701,6 @@ except Exception: self.prio = 0 - def _generate_ptype(self): - self.ptype = self.stanza.getType() - if self.ptype == 'available': - self.ptype = None - rfc_types = ('unavailable', 'error', 'subscribe', 'subscribed', - 'unsubscribe', 'unsubscribed') - if self.ptype and not self.ptype in rfc_types: - self.ptype = None - def generate(self): self.conn = self.base_event.conn self.stanza = self.base_event.stanza @@ -1489,7 +1491,8 @@ name = 'ping-error' base_network_events = [] -class CapsPresenceReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): +class CapsPresenceReceivedEvent(nec.NetworkIncomingEvent, HelperEvent, +PresenceHelperEvent): name = 'caps-presence-received' base_network_events = ['raw-pres-received'] @@ -1509,6 +1512,8 @@ self.get_jid_resource() except Exception: return + self._generate_ptype() + self._generate_show() self._extract_caps_from_presence() return True diff -r 90cea0d90347 -r ad8c0e13d938 src/common/protocol/caps.py --- a/src/common/protocol/caps.py Tue Jan 04 11:08:26 2011 +0100 +++ b/src/common/protocol/caps.py Tue Jan 04 15:52:37 2011 +0100 @@ -53,9 +53,14 @@ if obj.conn.name != self._account: return obj.client_caps = self._create_suitable_client_caps(obj.node, - obj.caps_hash, obj.hash_method) - self._capscache.query_client_of_jid_if_unknown(self, obj.fjid, - obj.client_caps) + obj.caps_hash, obj.hash_method, obj.fjid) + if obj.show == 'offline' and obj.client_caps._hash_method == 'no': + self._capscache.forget_caps(obj.client_caps) + obj.client_caps = self._create_suitable_client_caps(obj.node, + obj.caps_hash, obj.hash_method) + else: + self._capscache.query_client_of_jid_if_unknown(self, obj.fjid, + obj.client_caps) self._update_client_caps_of_contact(obj) def _update_client_caps_of_contact(self, obj):

1 0

gajim: don't depend on python-dev or (py)gtk-dev as it's not nee...
by Yann Leboulanger 04 Jan '11

04 Jan '11

changeset 90cea0d90347 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=90cea0d90347 description: don't depend on python-dev or (py)gtk-dev as it's not needed at compilation time, only at run time. Update README accordingly diffstat: README.html | 13 ++----------- configure.ac | 20 +------------------- 2 files changed, 3 insertions(+), 30 deletions(-) diffs (87 lines): diff -r 917820a81525 -r 90cea0d90347 README.html --- a/README.html Tue Jan 04 00:30:42 2011 +0300 +++ b/README.html Tue Jan 04 11:08:26 2011 +0100 @@ -19,8 +19,6 @@ <li>pysqlite2 (if you have python 2.5, you already have this)</li> </ul> -<p><strong>Note to packagers</strong> Gajim is a GTK+ app that loves GNOME. You can do 'make' so you don't require gnomepythonextras (aka gnome-python-desktop) which is gnome dep, but you will miss gnomekeyring integration.</p> - <h2>Optional Runtime Requirements</h2> <ul> <li><a href="http://pyopenssl.sourceforge.net/">PyOpenSSL</a> (python-pyopenssl package in Debian) (>=0.9) for <em>secure</em> SSL/TLS. Python's default SSL is insecure, so this package is highly recommended!</li> @@ -40,8 +38,6 @@ <h2>Compile-time Requirements</h2> <ul> -<li>python-dev</li> -<li>python-gtk2-dev</li> <li>intltool (>= 0.40.1)</li> </ul> @@ -52,15 +48,10 @@ <li>tar jxvf gajim-version.tar.bz2</li> <li>cd gajim</li> <li>./configure</li> -<li>make (builds all modules)</li> +<li>make (builds translations)</li> <li>su -c make install</li> </ol> -<p>To specify what modules to build do:</p> -<pre> - make help -</pre> - <p>To specify where to install do:</p> <pre> ./configure --prefix=custom_path @@ -120,7 +111,7 @@ <br/> <br/> <br/> -(C) 2003-2010<br/> +(C) 2003-2011<br/> The Gajim Team<br/> http://gajim.org<br/> <br/> diff -r 917820a81525 -r 90cea0d90347 configure.ac --- a/configure.ac Tue Jan 04 00:30:42 2011 +0300 +++ b/configure.ac Tue Jan 04 11:08:26 2011 +0100 @@ -9,9 +9,6 @@ AM_INIT_AUTOMAKE([1.8]) AM_MAINTAINER_MODE -dnl Make Objective-C work with automake -AM_CONDITIONAL([am__fastdepOBJC], false) - IT_PROG_INTLTOOL([0.35.0]) PKG_PROG_PKG_CONFIG([0.19]) @@ -36,25 +33,10 @@ AM_NLS -dnl **** -dnl pygtk and gtk+ -dnl **** -PKG_CHECK_MODULES([PYGTK], [gtk+-2.0 >= 2.16.0 pygtk-2.0 >= 2.16.0]) -AC_SUBST(PYGTK_CFLAGS) -AC_SUBST(PYGTK_LIBS) -PYGTK_DEFS=`$PKG_CONFIG --variable=defsdir pygtk-2.0` -AC_SUBST(PYGTK_DEFS) - -AM_PATH_PYTHON([2.5]) -if test "x$PYTHON" = "x:"; then - AC_MSG_ERROR([Python not found]) -fi - ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" AC_SUBST(ACLOCAL_AMFLAGS) -AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)]) -AC_SUBST([PYTHON_INCLUDES]) +AM_PATH_PYTHON([2.5]) dnl **** dnl enable installation in python-2.x/site-packages/gajim

1 0

gajim: use standard format for plugin_system logger output
by Denis Fomin 03 Jan '11

03 Jan '11

changeset 917820a81525 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=917820a81525 description: use standard format for plugin_system logger output diffstat: src/plugins/helpers.py | 13 ++----------- 1 files changed, 2 insertions(+), 11 deletions(-) diffs (30 lines): diff -r 568b42cf03cf -r 917820a81525 src/plugins/helpers.py --- a/src/plugins/helpers.py Tue Jan 04 00:12:07 2011 +0300 +++ b/src/plugins/helpers.py Tue Jan 04 00:30:42 2011 +0300 @@ -27,6 +27,8 @@ __all__ = ['log', 'log_calls', 'Singleton'] import logging +import functools + log = logging.getLogger('gajim.plugin_system') ''' Logger for code related to plug-in system. @@ -34,17 +36,6 @@ :type: logging.Logger ''' -consoleloghandler = logging.StreamHandler() -#consoleloghandler.setLevel(1) -consoleloghandler.setFormatter( - logging.Formatter('%(levelname)s: %(message)s')) - #logging.Formatter('%(asctime)s %(name)s: %(levelname)s: %(message)s')) -#log.setLevel(logging.DEBUG) -log.addHandler(consoleloghandler) -log.propagate = False - -import functools - class GajimPluginActivateException(Exception): ''' Raised when activation failed

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits January 2011