gajim: Added tag gajim-0.14 for changeset 605ca10afd21

[Yann Leboulanger]

changeset e1edaf27dd11 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=e1edaf27dd11
description: Added tag gajim-0.14 for changeset 605ca10afd21

diffstat:

 .hgtags |  1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diffs (8 lines):

diff -r 605ca10afd21 -r e1edaf27dd11 .hgtags
--- a/.hgtags   Thu Sep 02 18:26:05 2010 +0200
+++ b/.hgtags   Fri Sep 03 10:49:19 2010 +0200
@@ -3,3 +3,4 @@
 604c5de0dfe72dfa76b3014c410a50daae381cbe gajim-0.12
 7752eadd1f8c31a3dc282c15d87767a7ba1bd217 gajim-0.12-alpha1
 a0ec82dc6b7c10708e23f5ec30bab75d596b6fc6 gajim-0.12-beta1
+605ca10afd21958f027673d2799332e39d53a75d gajim-0.14
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback

[Yann Leboulanger]

changeset ac3e8cb0ae50 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=ac3e8cb0ae50
description: prevent traceback

diffstat:

 src/dialogs.py |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff -r 478972e92130 -r ac3e8cb0ae50 src/dialogs.py
--- a/src/dialogs.pyWed Sep 01 20:18:24 2010 +0200
+++ b/src/dialogs.pyFri Sep 03 08:01:37 2010 +0200
@@ -1471,7 +1471,7 @@
 HigDialog.__init__( self, None,
 gtk.MESSAGE_WARNING, 
gtk.BUTTONS_OK, pritext, sectext)
 self.set_modal(False)
-if hasattr(gajim.interface, 'roster'):
+if hasattr(gajim.interface, 'roster') and gajim.interface.roster:
 self.set_transient_for(gajim.interface.roster.window)
 self.popup()
 
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: check server features in correct stanza

[Yann Leboulanger]

changeset f05a7672c50e in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=f05a7672c50e
description: check server features in correct stanza

diffstat:

 src/common/connection_handlers.py |  51 +++---
 1 files changed, 26 insertions(+), 25 deletions(-)

diffs (68 lines):

diff -r 124586586d6d -r f05a7672c50e src/common/connection_handlers.py
--- a/src/common/connection_handlers.py Fri Sep 03 11:28:48 2010 +0200
+++ b/src/common/connection_handlers.py Fri Sep 03 11:29:15 2010 +0200
@@ -359,32 +359,33 @@
 'pep':
 self.pep_supported = True
 break
-if features.__contains__(common.xmpp.NS_VCARD):
-self.vcard_supported = True
-if features.__contains__(common.xmpp.NS_PUBSUB):
-self.pubsub_supported = True
-if 
features.__contains__(common.xmpp.NS_PUBSUB_PUBLISH_OPTIONS):
-self.pubsub_publish_options_supported = True
-else:
-# Remove stored bookmarks accessible to everyone.
-our_jid = gajim.get_jid_from_account(self.name)
-self.send_pb_purge(our_jid, 'storage:bookmarks')
-self.send_pb_delete(our_jid, 'storage:bookmarks')
-if features.__contains__(common.xmpp.NS_ARCHIVE):
-self.archiving_supported = True
-if features.__contains__(common.xmpp.NS_ARCHIVE_AUTO):
-self.archive_auto_supported = True
-if features.__contains__(common.xmpp.NS_ARCHIVE_MANAGE):
-self.archive_manage_supported = True
-if features.__contains__(common.xmpp.NS_ARCHIVE_MANUAL):
-self.archive_manual_supported = True
-if features.__contains__(common.xmpp.NS_ARCHIVE_PREF):
-self.archive_pref_supported = True
+if features.__contains__(common.xmpp.NS_VCARD):
+self.vcard_supported = True
+if features.__contains__(common.xmpp.NS_PUBSUB):
+self.pubsub_supported = True
+if features.__contains__(
+common.xmpp.NS_PUBSUB_PUBLISH_OPTIONS):
+self.pubsub_publish_options_supported = True
+else:
+# Remove stored bookmarks accessible to everyone.
+our_jid = gajim.get_jid_from_account(self.name)
+self.send_pb_purge(our_jid, 'storage:bookmarks')
+self.send_pb_delete(our_jid, 'storage:bookmarks')
+if features.__contains__(common.xmpp.NS_ARCHIVE):
+self.archiving_supported = True
+if features.__contains__(common.xmpp.NS_ARCHIVE_AUTO):
+self.archive_auto_supported = True
+if features.__contains__(common.xmpp.NS_ARCHIVE_MANAGE):
+self.archive_manage_supported = True
+if features.__contains__(common.xmpp.NS_ARCHIVE_MANUAL):
+self.archive_manual_supported = True
+if features.__contains__(common.xmpp.NS_ARCHIVE_PREF):
+self.archive_pref_supported = True
 if features.__contains__(common.xmpp.NS_BYTESTREAM):
-our_jid = 
helpers.parse_jid(gajim.get_jid_from_account(self.name) +\
-'/' + self.server_resource)
+our_jid = helpers.parse_jid(gajim.get_jid_from_account(
+self.name) + '/' + self.server_resource)
 gajim.proxy65_manager.resolve(jid, self.connection, our_jid,
-self.name)
+self.name)
 if features.__contains__(common.xmpp.NS_MUC) and is_muc:
 type_ = transport_type or 'jabber'
 self.muc_jid[type_] = jid
@@ -2350,4 +2351,4 @@
 con.RegisterHandler('iq', self._ResultCB, 'result')
 con.RegisterHandler('presence', self._StanzaArrivedCB)
 con.RegisterHandler('message', self._StanzaArrivedCB)
-con.RegisterHandler('unknown', self._StreamCB, 
'urn:ietf:params:xml:ns:xmpp-streams', xmlns='http://etherx.jabber.org/streams')
\ No newline at end of file
+con.RegisterHandler('unknown', self._StreamCB, 
'urn:ietf:params:xml:ns:xmpp-streams', xmlns='http://etherx.jabber.org/streams')
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits