Commits January 2011

commits@gajim.org

2 participants
27 discussions

gajim: remove unused pass
by Denis Fomin 03 Jan '11

03 Jan '11

changeset 568b42cf03cf in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=568b42cf03cf description: remove unused pass diffstat: src/plugins/pluginmanager.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diffs (11 lines): diff -r 57d3157428d5 -r 568b42cf03cf src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Tue Jan 04 00:04:11 2011 +0300 +++ b/src/plugins/pluginmanager.py Tue Jan 04 00:12:07 2011 +0300 @@ -467,7 +467,6 @@ # all fields are required log.debug('%s : %s' % (module_attr_name, 'wrong manifest file. all fields are required!')) - pass return plugins_found

1 0

gajim: use logger if plugin manifest file is wrong formated
by Denis Fomin 03 Jan '11

03 Jan '11

changeset 57d3157428d5 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=57d3157428d5 description: use logger if plugin manifest file is wrong formated diffstat: src/plugins/pluginmanager.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r e9b3d957cf0f -r 57d3157428d5 src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Mon Jan 03 23:08:13 2011 +0300 +++ b/src/plugins/pluginmanager.py Tue Jan 04 00:04:11 2011 +0300 @@ -465,6 +465,8 @@ pass except ConfigParser.NoOptionError, type_error: # all fields are required + log.debug('%s : %s' % (module_attr_name, + 'wrong manifest file. all fields are required!')) pass return plugins_found

1 0

gajim: coding style
by Denis Fomin 03 Jan '11

03 Jan '11

changeset e9b3d957cf0f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e9b3d957cf0f description: coding style diffstat: src/common/helpers.py | 21 +- src/common/xmpp/protocol.py | 353 ++++++++++++++++++++++--------------------- 2 files changed, 194 insertions(+), 180 deletions(-) diffs (truncated from 568 to 300 lines): diff -r 37ce8ab42841 -r e9b3d957cf0f src/common/helpers.py --- a/src/common/helpers.py Mon Jan 03 21:04:01 2011 +0100 +++ b/src/common/helpers.py Mon Jan 03 23:08:13 2011 +0300 @@ -981,7 +981,8 @@ path_to_file.endswith('arch-release'): # file doesn't have version text = distro_name - elif path_to_file.endswith('lfs-release'): # file just has version + elif path_to_file.endswith('lfs-release'): + # file just has version text = distro_name + ' ' + text os_info = text.replace('\n', '') gajim.os_info = os_info @@ -1131,16 +1132,14 @@ if total_non_messages > 0: if total_non_messages > max_ungrouped_events: text = ngettext( - '%d event pending', - '%d events pending', - total_non_messages, total_non_messages, total_non_messages) + '%d event pending', + '%d events pending', + total_non_messages, total_non_messages,total_non_messages) account['event_lines'].append(text) else: for jid in non_messages.keys(): - text = ngettext( - '%d event pending', - '%d events pending', - non_messages[jid], non_messages[jid], non_messages[jid]) + text = ngettext('%d event pending', '%d events pending', + non_messages[jid], non_messages[jid], non_messages[jid]) text += _(' from user %s') % (jid) account[account]['event_lines'].append(text) @@ -1273,9 +1272,11 @@ if keyID in public_keys: for u in gajim.contacts.get_contacts(account, jid): u.keyID = keyID - keys_str = gajim.config.get_per('accounts', account, 'attached_gpg_keys') + keys_str = gajim.config.get_per('accounts', account, + 'attached_gpg_keys') keys_str += jid + ' ' + keyID + ' ' - gajim.config.set_per('accounts', account, 'attached_gpg_keys', keys_str) + gajim.config.set_per('accounts', account, 'attached_gpg_keys', + keys_str) elif keyID is None: keyID = 'UNKNOWN' return keyID diff -r 37ce8ab42841 -r e9b3d957cf0f src/common/xmpp/protocol.py --- a/src/common/xmpp/protocol.py Mon Jan 03 21:04:01 2011 +0100 +++ b/src/common/xmpp/protocol.py Mon Jan 03 23:08:13 2011 +0300 @@ -23,126 +23,126 @@ from simplexml import Node, NodeBuilder import time -NS_ACTIVITY ='http://jabber.org/protocol/activity' # XEP-0108 -NS_ADDRESS ='http://jabber.org/protocol/address' # XEP-0033 -NS_AGENTS ='jabber:iq:agents' -NS_AMP ='http://jabber.org/protocol/amp' -NS_AMP_ERRORS =NS_AMP+'#errors' -NS_ARCHIVE ='urn:xmpp:archive' #XEP-0136 -NS_ARCHIVE_AUTO =NS_ARCHIVE+':auto' #XEP-0136 -NS_ARCHIVE_MANAGE =NS_ARCHIVE+':manage' #XEP-0136 -NS_ARCHIVE_MANUAL =NS_ARCHIVE+':manual' #XEP-0136 -NS_ARCHIVE_PREF =NS_ARCHIVE+':pref' -NS_ATOM ='http://www.w3.org/2005/Atom' -NS_AUTH ='jabber:iq:auth' -NS_AVATAR ='http://www.xmpp.org/extensions/xep-0084.html#ns-metadata' -NS_BIND ='urn:ietf:params:xml:ns:xmpp-bind' -NS_BOB ='urn:xmpp:bob' #XEP-0231 -NS_BOOKMARKS ='storage:bookmarks' #XEP-0048 -NS_BROWSE ='jabber:iq:browse' -NS_BROWSING ='http://jabber.org/protocol/browsing' # XEP-0195 -NS_BYTESTREAM ='http://jabber.org/protocol/bytestreams' # JEP-0065 -NS_CAPS ='http://jabber.org/protocol/caps' # JEP-0115 -NS_CAPTCHA ='urn:xmpp:captcha' # XEP-0158 -NS_CHATSTATES ='http://jabber.org/protocol/chatstates' # JEP-0085 -NS_CHATTING ='http://jabber.org/protocol/chatting' # XEP-0194 -NS_CLIENT ='jabber:client' -NS_COMMANDS ='http://jabber.org/protocol/commands' -NS_COMPONENT_ACCEPT='jabber:component:accept' -NS_COMPONENT_1 ='http://jabberd.jabberstudio.org/ns/component/1.0' -NS_COMPRESS ='http://jabber.org/protocol/compress' # XEP-0138 -NS_CONFERENCE ='jabber:x:conference' -NS_DATA ='jabber:x:data' # XEP-0004 -NS_DATA_MEDIA ='urn:xmpp:media-element' # XEP-0221 -NS_DELAY ='jabber:x:delay' -NS_DELAY2 ='urn:xmpp:delay' -NS_DIALBACK ='jabber:server:dialback' -NS_DISCO ='http://jabber.org/protocol/disco' -NS_DISCO_INFO =NS_DISCO+'#info' -NS_DISCO_ITEMS =NS_DISCO+'#items' -NS_ENCRYPTED ='jabber:x:encrypted' # XEP-0027 -NS_ESESSION ='http://www.xmpp.org/extensions/xep-0116.html#ns' -NS_ESESSION_INIT='http://www.xmpp.org/extensions/xep-0116.html#ns-init' # XEP-0116 -NS_EVENT ='jabber:x:event' # XEP-0022 -NS_FEATURE ='http://jabber.org/protocol/feature-neg' -NS_FILE ='http://jabber.org/protocol/si/profile/file-transfer' # JEP-0096 -NS_GAMING ='http://jabber.org/protocol/gaming' # XEP-0196 -NS_GATEWAY ='jabber:iq:gateway' # XEP-0100 -NS_GEOLOC ='http://jabber.org/protocol/geoloc' # JEP-0080 -NS_GROUPCHAT ='gc-1.0' -NS_HTTP_AUTH ='http://jabber.org/protocol/http-auth' # XEP-0070 -NS_HTTP_BIND ='http://jabber.org/protocol/httpbind' # XEP-0124 -NS_IBB ='http://jabber.org/protocol/ibb' -NS_INVISIBLE ='presence-invisible' # Jabberd2 -NS_IQ ='iq' # Jabberd2 -NS_JINGLE ='urn:xmpp:jingle:1' # XEP-0166 -NS_JINGLE_ERRORS='urn:xmpp:jingle:errors:1' # XEP-0166 -NS_JINGLE_RTP ='urn:xmpp:jingle:apps:rtp:1' # XEP-0167 -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_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_LAST ='jabber:iq:last' -NS_LOCATION ='http://jabber.org/protocol/geoloc' # XEP-0080 -NS_MESSAGE ='message' # Jabberd2 -NS_MOOD ='http://jabber.org/protocol/mood' # XEP-0107 -NS_MUC ='http://jabber.org/protocol/muc' -NS_MUC_USER =NS_MUC+'#user' -NS_MUC_ADMIN =NS_MUC+'#admin' -NS_MUC_OWNER =NS_MUC+'#owner' -NS_MUC_UNIQUE =NS_MUC+'#unique' -NS_MUC_CONFIG =NS_MUC+'#roomconfig' -NS_NICK ='http://jabber.org/protocol/nick' # XEP-0172 -NS_OFFLINE ='http://www.jabber.org/jeps/jep-0030.html' # XEP-0013 -NS_PHYSLOC ='http://jabber.org/protocol/physloc' # XEP-0112 -NS_PING ='urn:xmpp:ping' # SEP-0199 -NS_PRESENCE ='presence' # Jabberd2 -NS_PRIVACY ='jabber:iq:privacy' -NS_PRIVATE ='jabber:iq:private' -NS_PROFILE ='http://jabber.org/protocol/profile' # XEP-0154 -NS_PUBSUB ='http://jabber.org/protocol/pubsub' # XEP-0060 -NS_PUBSUB_EVENT = 'http://jabber.org/protocol/pubsub#event' -NS_PUBSUB_PUBLISH_OPTIONS = NS_PUBSUB + '#publish-options' # XEP-0060 -NS_PUBSUB_OWNER ='http://jabber.org/protocol/pubsub#owner' # JEP-0060 -NS_REGISTER ='jabber:iq:register' -NS_ROSTER ='jabber:iq:roster' -NS_ROSTERNOTES ='storage:rosternotes' -NS_ROSTERX ='http://jabber.org/protocol/rosterx' # XEP-0144 -NS_ROSTER_VER ='urn:xmpp:features:rosterver' # XEP-0273 -NS_RPC ='jabber:iq:rpc' # XEP-0009 -NS_RSM ='http://jabber.org/protocol/rsm' -NS_SASL ='urn:ietf:params:xml:ns:xmpp-sasl' -NS_SECLABEL ='urn:xmpp:sec-label:0' -NS_SECLABEL_CATALOG ='urn:xmpp:sec-label:catalog:0' -NS_SEARCH ='jabber:iq:search' -NS_SERVER ='jabber:server' -NS_SESSION ='urn:ietf:params:xml:ns:xmpp-session' -NS_SI ='http://jabber.org/protocol/si' # XEP-0096 -NS_SI_PUB ='http://jabber.org/protocol/sipub' # XEP-0137 -NS_SIGNED ='jabber:x:signed' # XEP-0027 -NS_SSN ='urn:xmpp:ssn' # XEP-0155 -NS_STANZA_CRYPTO='http://www.xmpp.org/extensions/xep-0200.html#ns' # XEP-0200 -NS_STANZAS ='urn:ietf:params:xml:ns:xmpp-stanzas' -NS_STREAM ='http://affinix.com/jabber/stream' -NS_STREAMS ='http://etherx.jabber.org/streams' -NS_TIME ='jabber:iq:time' # XEP-0900 -NS_TIME_REVISED ='urn:xmpp:time' # XEP-0202 -NS_TLS ='urn:ietf:params:xml:ns:xmpp-tls' -NS_TUNE ='http://jabber.org/protocol/tune' # XEP-0118 -NS_VACATION ='http://jabber.org/protocol/vacation' -NS_VCARD ='vcard-temp' -NS_GMAILNOTIFY ='google:mail:notify' -NS_GTALKSETTING ='google:setting' -NS_VCARD_UPDATE =NS_VCARD+':x:update' -NS_VERSION ='jabber:iq:version' -NS_VIEWING ='http://jabber.org/protocol/viewing' # XEP--197 -NS_WAITINGLIST ='http://jabber.org/protocol/waitinglist' # XEP-0130 -NS_XHTML_IM ='http://jabber.org/protocol/xhtml-im' # XEP-0071 -NS_XHTML = 'http://www.w3.org/1999/xhtml' # " -NS_DATA_LAYOUT ='http://jabber.org/protocol/xdata-layout' # XEP-0141 -NS_DATA_VALIDATE='http://jabber.org/protocol/xdata-validate' # XEP-0122 -NS_XMPP_STREAMS ='urn:ietf:params:xml:ns:xmpp-streams' -NS_RECEIPTS ='urn:xmpp:receipts' +NS_ACTIVITY = 'http://jabber.org/protocol/activity' # XEP-0108 +NS_ADDRESS = 'http://jabber.org/protocol/address' # XEP-0033 +NS_AGENTS = 'jabber:iq:agents' +NS_AMP = 'http://jabber.org/protocol/amp' +NS_AMP_ERRORS = NS_AMP + '#errors' +NS_ARCHIVE = 'urn:xmpp:archive' # XEP-0136 +NS_ARCHIVE_AUTO = NS_ARCHIVE + ':auto' # XEP-0136 +NS_ARCHIVE_MANAGE = NS_ARCHIVE + ':manage' # XEP-0136 +NS_ARCHIVE_MANUAL = NS_ARCHIVE + ':manual' # XEP-0136 +NS_ARCHIVE_PREF = NS_ARCHIVE + ':pref' +NS_ATOM = 'http://www.w3.org/2005/Atom' +NS_AUTH = 'jabber:iq:auth' +NS_AVATAR = 'http://www.xmpp.org/extensions/xep-0084.html#ns-metadata' +NS_BIND = 'urn:ietf:params:xml:ns:xmpp-bind' +NS_BOB = 'urn:xmpp:bob' # XEP-0231 +NS_BOOKMARKS = 'storage:bookmarks' # XEP-0048 +NS_BROWSE = 'jabber:iq:browse' +NS_BROWSING = 'http://jabber.org/protocol/browsing' # XEP-0195 +NS_BYTESTREAM = 'http://jabber.org/protocol/bytestreams' # JEP-0065 +NS_CAPS = 'http://jabber.org/protocol/caps' # JEP-0115 +NS_CAPTCHA = 'urn:xmpp:captcha' # XEP-0158 +NS_CHATSTATES = 'http://jabber.org/protocol/chatstates' # JEP-0085 +NS_CHATTING = 'http://jabber.org/protocol/chatting' # XEP-0194 +NS_CLIENT = 'jabber:client' +NS_COMMANDS = 'http://jabber.org/protocol/commands' +NS_COMPONENT_ACCEPT = 'jabber:component:accept' +NS_COMPONENT_1 = 'http://jabberd.jabberstudio.org/ns/component/1.0' +NS_COMPRESS = 'http://jabber.org/protocol/compress' # XEP-0138 +NS_CONFERENCE = 'jabber:x:conference' +NS_DATA = 'jabber:x:data' # XEP-0004 +NS_DATA_MEDIA = 'urn:xmpp:media-element' # XEP-0221 +NS_DELAY = 'jabber:x:delay' +NS_DELAY2 = 'urn:xmpp:delay' +NS_DIALBACK = 'jabber:server:dialback' +NS_DISCO = 'http://jabber.org/protocol/disco' +NS_DISCO_INFO = NS_DISCO + '#info' +NS_DISCO_ITEMS = NS_DISCO + '#items' +NS_ENCRYPTED = 'jabber:x:encrypted' # XEP-0027 +NS_ESESSION = 'http://www.xmpp.org/extensions/xep-0116.html#ns' +NS_ESESSION_INIT = 'http://www.xmpp.org/extensions/xep-0116.html#ns-init' # XEP-0116 +NS_EVENT = 'jabber:x:event' # XEP-0022 +NS_FEATURE = 'http://jabber.org/protocol/feature-neg' +NS_FILE = 'http://jabber.org/protocol/si/profile/file-transfer' # JEP-0096 +NS_GAMING = 'http://jabber.org/protocol/gaming' # XEP-0196 +NS_GATEWAY = 'jabber:iq:gateway' # XEP-0100 +NS_GEOLOC = 'http://jabber.org/protocol/geoloc' # XEP-0080 +NS_GROUPCHAT = 'gc-1.0' +NS_HTTP_AUTH = 'http://jabber.org/protocol/http-auth' # XEP-0070 +NS_HTTP_BIND = 'http://jabber.org/protocol/httpbind' # XEP-0124 +NS_IBB = 'http://jabber.org/protocol/ibb' +NS_INVISIBLE = 'presence-invisible' # Jabberd2 +NS_IQ = 'iq' # Jabberd2 +NS_JINGLE ='urn:xmpp:jingle:1' # XEP-0166 +NS_JINGLE_ERRORS = 'urn:xmpp:jingle:errors:1' # XEP-0166 +NS_JINGLE_RTP = 'urn:xmpp:jingle:apps:rtp:1' # XEP-0167 +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_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_LAST = 'jabber:iq:last' +NS_LOCATION = 'http://jabber.org/protocol/geoloc' # XEP-0080 +NS_MESSAGE = 'message' # Jabberd2 +NS_MOOD = 'http://jabber.org/protocol/mood' # XEP-0107 +NS_MUC = 'http://jabber.org/protocol/muc' +NS_MUC_USER = NS_MUC + '#user' +NS_MUC_ADMIN = NS_MUC + '#admin' +NS_MUC_OWNER = NS_MUC + '#owner' +NS_MUC_UNIQUE = NS_MUC + '#unique' +NS_MUC_CONFIG = NS_MUC + '#roomconfig' +NS_NICK = 'http://jabber.org/protocol/nick' # XEP-0172 +NS_OFFLINE = 'http://www.jabber.org/jeps/jep-0030.html' # XEP-0013 +NS_PHYSLOC = 'http://jabber.org/protocol/physloc' # XEP-0112 +NS_PING = 'urn:xmpp:ping' # SEP-0199 +NS_PRESENCE = 'presence' # Jabberd2 +NS_PRIVACY = 'jabber:iq:privacy' +NS_PRIVATE = 'jabber:iq:private' +NS_PROFILE = 'http://jabber.org/protocol/profile' # XEP-0154 +NS_PUBSUB = 'http://jabber.org/protocol/pubsub' # XEP-0060 +NS_PUBSUB_EVENT = 'http://jabber.org/protocol/pubsub#event' +NS_PUBSUB_PUBLISH_OPTIONS = NS_PUBSUB + '#publish-options' # XEP-0060 +NS_PUBSUB_OWNER = 'http://jabber.org/protocol/pubsub#owner' # JEP-0060 +NS_REGISTER = 'jabber:iq:register' +NS_ROSTER = 'jabber:iq:roster' +NS_ROSTERNOTES = 'storage:rosternotes' +NS_ROSTERX = 'http://jabber.org/protocol/rosterx' # XEP-0144 +NS_ROSTER_VER = 'urn:xmpp:features:rosterver' # XEP-0273 +NS_RPC = 'jabber:iq:rpc' # XEP-0009 +NS_RSM = 'http://jabber.org/protocol/rsm' +NS_SASL = 'urn:ietf:params:xml:ns:xmpp-sasl' +NS_SECLABEL = 'urn:xmpp:sec-label:0' +NS_SECLABEL_CATALOG = 'urn:xmpp:sec-label:catalog:0' +NS_SEARCH = 'jabber:iq:search' +NS_SERVER = 'jabber:server' +NS_SESSION = 'urn:ietf:params:xml:ns:xmpp-session' +NS_SI = 'http://jabber.org/protocol/si' # XEP-0096 +NS_SI_PUB = 'http://jabber.org/protocol/sipub' # XEP-0137 +NS_SIGNED = 'jabber:x:signed' # XEP-0027 +NS_SSN = 'urn:xmpp:ssn' # XEP-0155 +NS_STANZA_CRYPTO = 'http://www.xmpp.org/extensions/xep-0200.html#ns' # XEP-0200 +NS_STANZAS = 'urn:ietf:params:xml:ns:xmpp-stanzas' +NS_STREAM = 'http://affinix.com/jabber/stream' +NS_STREAMS = 'http://etherx.jabber.org/streams' +NS_TIME = 'jabber:iq:time' # XEP-0900 +NS_TIME_REVISED = 'urn:xmpp:time' # XEP-0202 +NS_TLS = 'urn:ietf:params:xml:ns:xmpp-tls' +NS_TUNE = 'http://jabber.org/protocol/tune' # XEP-0118 +NS_VACATION = 'http://jabber.org/protocol/vacation' +NS_VCARD = 'vcard-temp' +NS_GMAILNOTIFY = 'google:mail:notify' +NS_GTALKSETTING = 'google:setting' +NS_VCARD_UPDATE = NS_VCARD + ':x:update' +NS_VERSION = 'jabber:iq:version' +NS_VIEWING = 'http://jabber.org/protocol/viewing' # XEP--197 +NS_WAITINGLIST = 'http://jabber.org/protocol/waitinglist' # XEP-0130 +NS_XHTML_IM = 'http://jabber.org/protocol/xhtml-im' # XEP-0071 +NS_XHTML = 'http://www.w3.org/1999/xhtml' # " +NS_DATA_LAYOUT = 'http://jabber.org/protocol/xdata-layout' # XEP-0141 +NS_DATA_VALIDATE = 'http://jabber.org/protocol/xdata-validate' # XEP-0122 +NS_XMPP_STREAMS = 'urn:ietf:params:xml:ns:xmpp-streams' +NS_RECEIPTS = 'urn:xmpp:receipts' xmpp_stream_error_conditions = ''' bad-format -- -- -- The entity has sent XML that cannot be processed. @@ -204,9 +204,9 @@

1 0

gajim: improving parsing pubsub nodes
by Yann Leboulanger 03 Jan '11

03 Jan '11

changeset 37ce8ab42841 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=37ce8ab42841 description: improving parsing pubsub nodes diffstat: src/common/connection_handlers_events.py | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diffs (25 lines): diff -r 96e4d1d0d16e -r 37ce8ab42841 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Mon Jan 03 20:56:10 2011 +0100 +++ b/src/common/connection_handlers_events.py Mon Jan 03 21:04:01 2011 +0100 @@ -557,6 +557,10 @@ self.item_node = self.items_node.getTag('item') if not self.item_node: return + children = self.item_node.getChildren() + if not children: + return + self.node = children[0] return True class PubsubBookmarksReceivedEvent(nec.NetworkIncomingEvent, BookmarksHelper): @@ -565,9 +569,7 @@ def generate(self): self.conn = self.base_event.conn - self.storage_node = self.base_event.item_node.getTag('storage') - if not self.storage_node: - return + self.storage_node = self.base_event.node ns = self.storage_node.getNamespace() if ns != xmpp.NS_BOOKMARKS: return

1 0

gajim: fix bookmarks receiving from pubsub. see #6744
by Yann Leboulanger 03 Jan '11

03 Jan '11

changeset 96e4d1d0d16e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=96e4d1d0d16e description: fix bookmarks receiving from pubsub. see #6744 diffstat: src/common/connection_handlers_events.py | 21 ++++++++------------- src/common/xmpp/protocol.py | 3 ++- 2 files changed, 10 insertions(+), 14 deletions(-) diffs (73 lines): diff -r e6fed240777a -r 96e4d1d0d16e src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Mon Jan 03 21:41:17 2011 +0300 +++ b/src/common/connection_handlers_events.py Mon Jan 03 20:56:10 2011 +0100 @@ -461,13 +461,7 @@ class BookmarksHelper: def parse_bookmarks(self): self.bookmarks = [] - try: - storage = self.base_event.item_node.getTag('storage', - namespace=xmpp.NS_BOOKMARKS) - except AttributeError: - storage = self.base_event.storage_node - confs = storage.getTags('conference') - + confs = self.storage_node.getTags('conference') for conf in confs: autojoin_val = conf.getAttr('autojoin') if autojoin_val is None: # not there (it's optional) @@ -503,7 +497,8 @@ def generate(self): self.conn = self.base_event.conn - if self.base_event.namespace != 'storage:bookmarks': + self.storage_node = self.base_event.storage_node + if self.base_event.namespace != xmpp.NS_BOOKMARKS: return self.parse_bookmarks() return True @@ -524,7 +519,7 @@ def generate(self): self.conn = self.base_event.conn - if self.base_event.namespace != 'storage:rosternotes': + if self.base_event.namespace != xmpp.NS_ROSTERNOTES: return notes = self.base_event.storage_node.getTags('note') self.annotations = {} @@ -570,11 +565,11 @@ def generate(self): self.conn = self.base_event.conn - storage = self.base_event.item_node.getTag('storage') - if not storage: + self.storage_node = self.base_event.item_node.getTag('storage') + if not self.storage_node: return - ns = storage.getNamespace() - if ns != 'storage:bookmarks': + ns = self.storage_node.getNamespace() + if ns != xmpp.NS_BOOKMARKS: return self.parse_bookmarks() return True diff -r e6fed240777a -r 96e4d1d0d16e src/common/xmpp/protocol.py --- a/src/common/xmpp/protocol.py Mon Jan 03 21:41:17 2011 +0300 +++ b/src/common/xmpp/protocol.py Mon Jan 03 20:56:10 2011 +0100 @@ -38,7 +38,7 @@ NS_AVATAR ='http://www.xmpp.org/extensions/xep-0084.html#ns-metadata' NS_BIND ='urn:ietf:params:xml:ns:xmpp-bind' NS_BOB ='urn:xmpp:bob' #XEP-0231 -NS_BOOKMARKS ='storage:bookmarks' #XEP-0048 +NS_BOOKMARKS ='storage:bookmarks' #XEP-0048 NS_BROWSE ='jabber:iq:browse' NS_BROWSING ='http://jabber.org/protocol/browsing' # XEP-0195 NS_BYTESTREAM ='http://jabber.org/protocol/bytestreams' # JEP-0065 @@ -106,6 +106,7 @@ NS_PUBSUB_OWNER ='http://jabber.org/protocol/pubsub#owner' # JEP-0060 NS_REGISTER ='jabber:iq:register' NS_ROSTER ='jabber:iq:roster' +NS_ROSTERNOTES ='storage:rosternotes' NS_ROSTERX ='http://jabber.org/protocol/rosterx' # XEP-0144 NS_ROSTER_VER ='urn:xmpp:features:rosterver' # XEP-0273 NS_RPC ='jabber:iq:rpc' # XEP-0009

1 0

gajim: [Link Mauve] fix for bookmarks(XEP-0048)
by Denis Fomin 03 Jan '11

03 Jan '11

changeset e6fed240777a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e6fed240777a description: [Link Mauve] fix for bookmarks(XEP-0048) diffstat: src/common/connection_handlers_events.py | 8 +++++++- src/common/xmpp/protocol.py | 1 + 2 files changed, 8 insertions(+), 1 deletions(-) diffs (29 lines): diff -r 88c4b46d3e6a -r e6fed240777a src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sun Jan 02 18:23:56 2011 +0300 +++ b/src/common/connection_handlers_events.py Mon Jan 03 21:41:17 2011 +0300 @@ -461,7 +461,13 @@ class BookmarksHelper: def parse_bookmarks(self): self.bookmarks = [] - confs = self.base_event.storage_node.getTags('conference') + try: + storage = self.base_event.item_node.getTag('storage', + namespace=xmpp.NS_BOOKMARKS) + except AttributeError: + storage = self.base_event.storage_node + confs = storage.getTags('conference') + for conf in confs: autojoin_val = conf.getAttr('autojoin') if autojoin_val is None: # not there (it's optional) diff -r 88c4b46d3e6a -r e6fed240777a src/common/xmpp/protocol.py --- a/src/common/xmpp/protocol.py Sun Jan 02 18:23:56 2011 +0300 +++ b/src/common/xmpp/protocol.py Mon Jan 03 21:41:17 2011 +0300 @@ -38,6 +38,7 @@ NS_AVATAR ='http://www.xmpp.org/extensions/xep-0084.html#ns-metadata' NS_BIND ='urn:ietf:params:xml:ns:xmpp-bind' NS_BOB ='urn:xmpp:bob' #XEP-0231 +NS_BOOKMARKS ='storage:bookmarks' #XEP-0048 NS_BROWSE ='jabber:iq:browse' NS_BROWSING ='http://jabber.org/protocol/browsing' # XEP-0195 NS_BYTESTREAM ='http://jabber.org/protocol/bytestreams' # JEP-0065

1 0

gajim: fix demndimport with htmltextview
by Denis Fomin 02 Jan '11

02 Jan '11

changeset 88c4b46d3e6a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=88c4b46d3e6a description: fix demndimport with htmltextview diffstat: src/gajim.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r af490f29e053 -r 88c4b46d3e6a src/gajim.py --- a/src/gajim.py Fri Dec 31 16:37:14 2010 +0300 +++ b/src/gajim.py Sun Jan 02 18:23:56 2011 +0300 @@ -40,7 +40,7 @@ demandimport.ignore += ['gobject._gobject', 'libasyncns', 'i18n', 'logging.NullHandler', 'dbus.glib', 'dbus.service', 'command_system.implementation.standard', 'OpenSSL.SSL', 'OpenSSL.crypto', - 'common.sleepy', 'DLFCN', 'dl'] + 'common.sleepy', 'DLFCN', 'dl', 'xml.sax', 'xml.sax.handler'] import os import sys

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