gajim: prevent traceback when a wrong timezone arrive.

[Gajim]

changeset 738aa5082b6a in /home/hg/repos/gajim

author: Yann Leboulanger 
branches: gajim_0.16
details:http://hg.gajim.org/gajim?cmd=changeset;node=738aa5082b6a
description: prevent traceback when a wrong timezone arrive.

diffstat:

 src/common/connection_handlers_events.py |  6 +-
 1 files changed, 5 insertions(+), 1 deletions(-)

diffs (16 lines):

diff -r 1bfc811a5e43 -r 738aa5082b6a src/common/connection_handlers_events.py
--- a/src/common/connection_handlers_events.py  Sun Oct 16 10:38:09 2016 +0200
+++ b/src/common/connection_handlers_events.py  Sun Oct 16 22:40:41 2016 +0200
@@ -208,7 +208,11 @@
 tzo = qp.getTag('tzo').getData()
 if tzo.lower() == 'z':
 tzo = '0:0'
-tzoh, tzom = tzo.split(':')
+try:
+tzoh, tzom = tzo.split(':')
+except Exception, e:
+# wrong tzo
+return
 utc_time = qp.getTag('utc').getData()
 ZERO = datetime.timedelta(0)
 class UTC(datetime.tzinfo):
___
Commits mailing list
Commits@gajim.org
https://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback. Fixes #7978

[Gajim]

changeset 835e31812849 in /home/hg/repos/gajim

author: Yann Leboulanger 
branches: 
details:http://hg.gajim.org/gajim?cmd=changeset;node=835e31812849
description: prevent traceback. Fixes #7978

diffstat:

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

diffs (12 lines):

diff -r 4c8fcf026ff1 -r 835e31812849 src/common/connection.py
--- a/src/common/connection.py  Sun Apr 03 16:42:21 2016 +0200
+++ b/src/common/connection.py  Sun Apr 03 21:32:53 2016 +0200
@@ -2755,7 +2755,7 @@
 msg_iq = nbxmpp.Message(obj.jid, obj.message, typ='groupchat',
 xhtml=obj.xhtml)
 if obj.label is not None:
-msg_iq.addChild(node=label)
+msg_iq.addChild(node=obj.label)
 obj.msg_id = self.connection.send(msg_iq)
 gajim.nec.push_incoming_event(MessageSentEvent(None, conn=self,
 jid=obj.jid, message=obj.message, keyID=None, chatstate=None,
___
Commits mailing list
Commits@gajim.org
https://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback. Fixes #7978

[Gajim]

changeset 7eb2b43c233d in /home/hg/repos/gajim

author: Yann Leboulanger 
branches: gajim_0.16
details:http://hg.gajim.org/gajim?cmd=changeset;node=7eb2b43c233d
description: prevent traceback. Fixes #7978

diffstat:

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

diffs (12 lines):

diff -r 936e4ca17ba5 -r 7eb2b43c233d src/common/connection.py
--- a/src/common/connection.py  Sun Apr 03 16:42:21 2016 +0200
+++ b/src/common/connection.py  Sun Apr 03 21:32:53 2016 +0200
@@ -2735,7 +2735,7 @@
 msg_iq = nbxmpp.Message(obj.jid, obj.message, typ='groupchat',
 xhtml=obj.xhtml)
 if obj.label is not None:
-msg_iq.addChild(node=label)
+msg_iq.addChild(node=obj.label)
 obj.msg_id = self.connection.send(msg_iq)
 gajim.nec.push_incoming_event(MessageSentEvent(None, conn=self,
 jid=obj.jid, message=obj.message, keyID=None, chatstate=None,
___
Commits mailing list
Commits@gajim.org
https://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback

[Gajim]

changeset 1b7cd2956f67 in /home/hg/repos/gajim

author: Yann Leboulanger aste...@lagaule.org
branches: 
details:http://hg.gajim.org/gajim?cmd=changeset;node=1b7cd2956f67
description: prevent traceback

diffstat:

 src/common/connection.py |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (14 lines):

diff -r fc0e20d9098f -r 1b7cd2956f67 src/common/connection.py
--- a/src/common/connection.py  Mon Jul 27 22:58:47 2015 +0200
+++ b/src/common/connection.py  Tue Jul 28 20:19:19 2015 +0200
@@ -914,7 +914,9 @@
 self.sm.enabled = False
 gajim.nec.push_incoming_event(OurShowEvent(None, conn=self,
 show='error'))
-
self.connection.UnregisterDisconnectHandler(self._disconnectedReconnCB)
+if self.connection:
+self.connection.UnregisterDisconnectHandler(
+self._disconnectedReconnCB)
 self.disconnect()
 if gajim.config.get_per('accounts', self.name, 'autoreconnect'):
 self.connected = -1
___
Commits mailing list
Commits@gajim.org
https://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback

[Gajim]

changeset 2127559a62b2 in /home/hg/repos/gajim

author: Yann Leboulanger aste...@lagaule.org
branches: gajim_0.16
details:http://hg.gajim.org/gajim?cmd=changeset;node=2127559a62b2
description: prevent traceback

diffstat:

 src/common/connection.py |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (14 lines):

diff -r 7aa8b24aa913 -r 2127559a62b2 src/common/connection.py
--- a/src/common/connection.py  Mon Jul 27 22:58:47 2015 +0200
+++ b/src/common/connection.py  Tue Jul 28 20:19:19 2015 +0200
@@ -913,7 +913,9 @@
 self.sm.enabled = False
 gajim.nec.push_incoming_event(OurShowEvent(None, conn=self,
 show='error'))
-
self.connection.UnregisterDisconnectHandler(self._disconnectedReconnCB)
+if self.connection:
+self.connection.UnregisterDisconnectHandler(
+self._disconnectedReconnCB)
 self.disconnect()
 if gajim.config.get_per('accounts', self.name, 'autoreconnect'):
 self.connected = -1
___
Commits mailing list
Commits@gajim.org
https://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback. Fixes #7960

[Gajim]

changeset 4f2c3b099efe in /home/hg/repos/gajim

author: Yann Leboulanger aste...@lagaule.org
branches: 
details:http://hg.gajim.org/gajim?cmd=changeset;node=4f2c3b099efe
description: prevent traceback. Fixes #7960

diffstat:

 src/roster_window.py |  3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diffs (13 lines):

diff -r 975912558ebf -r 4f2c3b099efe src/roster_window.py
--- a/src/roster_window.py  Sat Mar 07 15:04:41 2015 +0100
+++ b/src/roster_window.py  Sat Mar 07 21:03:25 2015 +0100
@@ -990,6 +990,9 @@
 
 # FIXME: maybe move to gajim.py
 def remove_newly_added(self, jid, account):
+if account not in gajim.newly_added:
+# Account has been deleted during the timeout that called us
+return
 if jid in gajim.newly_added[account]:
 gajim.newly_added[account].remove(jid)
 self.draw_contact(jid, account)
___
Commits mailing list
Commits@gajim.org
https://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback. Fixes #7960

[Gajim]

changeset 4b6ab138eb75 in /home/hg/repos/gajim

author: Yann Leboulanger aste...@lagaule.org
branches: gajim_0.16
details:http://hg.gajim.org/gajim?cmd=changeset;node=4b6ab138eb75
description: prevent traceback. Fixes #7960

diffstat:

 src/roster_window.py |  3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diffs (13 lines):

diff -r 06f40d177c27 -r 4b6ab138eb75 src/roster_window.py
--- a/src/roster_window.py  Sat Mar 07 15:04:41 2015 +0100
+++ b/src/roster_window.py  Sat Mar 07 21:03:25 2015 +0100
@@ -976,6 +976,9 @@
 
 # FIXME: maybe move to gajim.py
 def remove_newly_added(self, jid, account):
+if account not in gajim.newly_added:
+# Account has been deleted during the timeout that called us
+return
 if jid in gajim.newly_added[account]:
 gajim.newly_added[account].remove(jid)
 self.draw_contact(jid, account)
___
Commits mailing list
Commits@gajim.org
https://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback. Fixes #7592

[Gajim]

changeset 727011dd6180 in /home/hg/repos/gajim

author: Yann Leboulanger aste...@lagaule.org
branches: 
details:http://hg.gajim.org/gajim?cmd=changeset;node=727011dd6180
description: prevent traceback. Fixes #7592

diffstat:

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

diffs (12 lines):

diff -r eac993c50375 -r 727011dd6180 src/tooltips.py
--- a/src/tooltips.py   Wed Feb 12 14:04:19 2014 +0100
+++ b/src/tooltips.py   Sat Feb 15 21:28:39 2014 +0100
@@ -776,7 +776,7 @@
 else:
 status = _('Not started')
 properties.append((_('Status: '), status))
-file_desc = file_props.desc
+file_desc = file_props.desc or ''
 properties.append((_('Description: '), GLib.markup_escape_text(
 file_desc)))
 while properties:
___
Commits mailing list
Commits@gajim.org
https://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback. Fixes #7592

[Gajim]

changeset 99b682334b2b in /home/hg/repos/gajim

author: Yann Leboulanger aste...@lagaule.org
branches: gajim_0.16
details:http://hg.gajim.org/gajim?cmd=changeset;node=99b682334b2b
description: prevent traceback. Fixes #7592

diffstat:

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

diffs (12 lines):

diff -r 908d55eea9ac -r 99b682334b2b src/tooltips.py
--- a/src/tooltips.py   Wed Feb 12 14:04:19 2014 +0100
+++ b/src/tooltips.py   Sat Feb 15 21:28:39 2014 +0100
@@ -800,7 +800,7 @@
 else:
 status = _('Not started')
 properties.append((_('Status: '), status))
-file_desc = file_props.desc
+file_desc = file_props.desc or ''
 properties.append((_('Description: '), gobject.markup_escape_text(
 file_desc)))
 while properties:
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback. Fixes #7503

[Gajim]

changeset 6a3beba4693b in /home/hg/repos/gajim

author: Yann Leboulanger aste...@lagaule.org
branches: gtk3
details:http://hg.gajim.org/gajim?cmd=changeset;node=6a3beba4693b
description: prevent traceback. Fixes #7503

diffstat:

 src/common/stanza_session.py |  10 --
 1 files changed, 8 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r 18b184cfb517 -r 6a3beba4693b src/common/stanza_session.py
--- a/src/common/stanza_session.py  Wed Nov 06 19:02:37 2013 +0100
+++ b/src/common/stanza_session.py  Wed Nov 06 21:17:15 2013 +0100
@@ -810,7 +810,10 @@
 
 # the offset of the group we chose (need it to match up with the 
dhhash)
 group_order = 0
-self.modp = int(form.getField('modp').getOptions()[group_order][1])
+modp_f = form.getField('modp')
+if not modp_f:
+return
+self.modp = int(modp_f.getOptions()[group_order][1])
 x.addChild(node=nbxmpp.DataField(name='modp', value=self.modp))
 
 g = dh.generators[self.modp]
@@ -818,7 +821,10 @@
 
 self.n_o = base64.b64decode(form['my_nonce'])
 
-dhhashes = form.getField('dhhashes').getValues()
+dhhashes_f = form.getField('dhhashes')
+if not dhhashes_f:
+return
+dhhashes = dhhashes_f.getValues()
 self.negotiated['He'] = base64.b64decode(dhhashes[group_order].encode(
 'utf8'))
 
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback. Fixes #7572

[Gajim]

changeset b2788bedd2a1 in /home/hg/repos/gajim

author: Yann Leboulanger aste...@lagaule.org
branches: gajim_0.16
details:http://hg.gajim.org/gajim?cmd=changeset;node=b2788bedd2a1
description: prevent traceback. Fixes #7572

diffstat:

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

diffs (12 lines):

diff -r 8fba80aa51ce -r b2788bedd2a1 src/gui_interface.py
--- a/src/gui_interface.py  Fri Nov 29 22:07:59 2013 +0400
+++ b/src/gui_interface.py  Sat Nov 30 09:48:18 2013 +0100
@@ -1688,6 +1688,8 @@
 event = gajim.events.get_first_event(account, fjid, type_)
 if not event:
 event = gajim.events.get_first_event(account, jid, type_)
+if not event:
+return
 
 if type_ == 'printed_pm':
 ctrl = event.parameters[2]
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback. Fixes #7503

[Gajim]

changeset c8d945a5b22f in /home/hg/repos/gajim

author: Yann Leboulanger aste...@lagaule.org
branches: gajim_0.16
details:http://hg.gajim.org/gajim?cmd=changeset;node=c8d945a5b22f
description: prevent traceback. Fixes #7503

diffstat:

 src/common/stanza_session.py |  10 --
 1 files changed, 8 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r 80b6bc2509b8 -r c8d945a5b22f src/common/stanza_session.py
--- a/src/common/stanza_session.py  Wed Nov 06 19:02:37 2013 +0100
+++ b/src/common/stanza_session.py  Wed Nov 06 21:17:15 2013 +0100
@@ -810,7 +810,10 @@
 
 # the offset of the group we chose (need it to match up with the 
dhhash)
 group_order = 0
-self.modp = int(form.getField('modp').getOptions()[group_order][1])
+modp_f = form.getField('modp')
+if not modp_f:
+return
+self.modp = int(modp_f.getOptions()[group_order][1])
 x.addChild(node=nbxmpp.DataField(name='modp', value=self.modp))
 
 g = dh.generators[self.modp]
@@ -818,7 +821,10 @@
 
 self.n_o = base64.b64decode(form['my_nonce'])
 
-dhhashes = form.getField('dhhashes').getValues()
+dhhashes_f = form.getField('dhhashes')
+if not dhhashes_f:
+return
+dhhashes = dhhashes_f.getValues()
 self.negotiated['He'] = base64.b64decode(dhhashes[group_order].encode(
 'utf8'))
 
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback

[Fomin Denis]

changeset b579b4cf66f9 in /home/hg/repos/gajim

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

diffstat:

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

diffs (12 lines):

diff -r bdef21a83e15 -r b579b4cf66f9 src/common/helpers.py
--- a/src/common/helpers.py Mon Nov 12 17:21:26 2012 +0400
+++ b/src/common/helpers.py Sun Nov 18 23:46:43 2012 +0400
@@ -1429,7 +1429,7 @@
 except Exception:
 proxy = None
 p = gajim.config.get('global_proxy')
-if p:
+if p and p in gajim.config.get_per('proxies'):
 proxy = {}
 proxyptr = gajim.config.get_per('proxies', p)
 if not proxyptr:
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback

[Yann Leboulanger]

changeset b67ec3e9a5b8 in /home/hg/repos/gajim

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

diffstat:

 src/common/xmpp/client_nb.py |  3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diffs (13 lines):

diff -r 19a769bf5e48 -r b67ec3e9a5b8 src/common/xmpp/client_nb.py
--- a/src/common/xmpp/client_nb.py  Sat Nov 24 02:19:56 2012 -0400
+++ b/src/common/xmpp/client_nb.py  Fri Dec 07 17:05:20 2012 +0100
@@ -93,7 +93,8 @@
 if 'NonBlockingNonSASL' in self.__dict__:
 self.NonBlockingNonSASL.PlugOut()
 if 'SASL' in self.__dict__:
-if self.SASL.startsasl == 'failure-in-process':
+if 'startsasl' in self.SASL.__dict__ and \
+self.SASL.startsasl == 'failure-in-process':
 sasl_failed = True
 self.SASL.startsasl = 'failure'
 self._on_start_sasl()
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback

[Yann Leboulanger]

changeset 385f8a1fad66 in /home/hg/repos/gajim

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

diffstat:

 src/common/xmpp/client_nb.py |  1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diffs (11 lines):

diff -r a4a38d790182 -r 385f8a1fad66 src/common/xmpp/client_nb.py
--- a/src/common/xmpp/client_nb.py  Wed Feb 13 16:10:05 2013 +0100
+++ b/src/common/xmpp/client_nb.py  Wed Feb 13 16:10:44 2013 +0100
@@ -94,6 +94,7 @@
 self.NonBlockingNonSASL.PlugOut()
 if 'SASL' in self.__dict__:
 if 'startsasl' in self.SASL.__dict__ and \
+'startsasl' in self.SASL.__dict__ and \
 self.SASL.startsasl == 'failure-in-process':
 sasl_failed = True
 self.SASL.startsasl = 'failure'
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback

[Yann Leboulanger]

changeset fedfe3ab9886 in /home/hg/repos/gajim

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

diffstat:

 src/config.py |  47 ++-
 1 files changed, 38 insertions(+), 9 deletions(-)

diffs (114 lines):

diff -r 755703ea1187 -r fedfe3ab9886 src/config.py
--- a/src/config.py Thu Dec 27 00:02:51 2012 +0100
+++ b/src/config.py Thu Dec 27 00:11:48 2012 +0100
@@ -1215,7 +1215,10 @@
 model.set_value(iter_, 0, new_text)
 
 def on_msg_treeview_cursor_changed(self, widget, data = None):
-(model, iter_) = self.msg_tree.get_selection().get_selected()
+sel = self.msg_tree.get_selection()
+if not sel:
+return
+(model, iter_) = sel.get_selected()
 if not iter_:
 return
 self.xml.get_object('delete_msg_button').set_sensitive(True)
@@ -1230,7 +1233,10 @@
 self.msg_tree.set_cursor(model.get_path(iter_))
 
 def on_delete_msg_button_clicked(self, widget, data = None):
-(model, iter_) = self.msg_tree.get_selection().get_selected()
+sel = self.msg_tree.get_selection()
+if not sel:
+return
+(model, iter_) = sel.get_selected()
 if not iter_:
 return
 buf = self.xml.get_object('msg_textview').get_buffer()
@@ -1239,7 +1245,10 @@
 self.xml.get_object('delete_msg_button').set_sensitive(False)
 
 def on_msg_textview_changed(self, widget, data = None):
-(model, iter_) = self.msg_tree.get_selection().get_selected()
+sel = self.msg_tree.get_selection()
+if not sel:
+return
+(model, iter_) = sel.get_selected()
 if not iter_:
 return
 buf = self.xml.get_object('msg_textview').get_buffer()
@@ -1357,7 +1366,10 @@
 self.proxies_treeview.set_cursor(model.get_path(iter_))
 
 def on_remove_proxy_button_clicked(self, widget):
-(model, iter_) = self.proxies_treeview.get_selection().get_selected()
+sel = self.proxies_treeview.get_selection()
+if not sel:
+return
+(model, iter_) = sel.get_selected()
 if not iter_:
 return
 proxy = model[iter_][0].decode('utf-8')
@@ -1412,7 +1424,11 @@
 #useauth_checkbutton.set_active(False)
 #self.on_useauth_checkbutton_toggled(useauth_checkbutton)
 
-(model, iter_) = widget.get_selection().get_selected()
+sel = widget.get_selection()
+if sel:
+(model, iter_) = sel.get_selected()
+else:
+iter_ = None
 if not iter_:
 self.xml.get_object('proxyname_entry').set_text('')
 self.xml.get_object('proxytype_combobox').set_sensitive(False)
@@ -1463,7 +1479,10 @@
 def on_proxyname_entry_changed(self, widget):
 if self.block_signal:
 return
-(model, iter_) = self.proxies_treeview.get_selection().get_selected()
+sel = self.proxies_treeview.get_selection()
+if not sel:
+return
+(model, iter_) = sel.get_selected()
 if not iter_:
 return
 old_name = model.get_value(iter_, 0).decode('utf-8')
@@ -4182,8 +4201,12 @@
 model.append((enabled, sound_ui_name, path, 
sound_event_config_name))
 
 def on_treeview_sounds_cursor_changed(self, widget, data = None):
-(model, iter_) = self.sound_tree.get_selection().get_selected()
 sounds_entry = self.xml.get_object('sounds_entry')
+sel = self.sound_tree.get_selection()
+if not sel:
+sounds_entry.set_text('')
+return
+(model, iter_) = sel.get_selected()
 if not iter_:
 sounds_entry.set_text('')
 return
@@ -4191,7 +4214,10 @@
 sounds_entry.set_text(path_to_snd_file)
 
 def on_browse_for_sounds_button_clicked(self, widget, data = None):
-(model, iter_) = self.sound_tree.get_selection().get_selected()
+sel = self.sound_tree.get_selection()
+if not sel:
+return
+(model, iter_) = sel.get_selected()
 if not iter_:
 return
 def on_ok(widget, path_to_snd_file):
@@ -4223,7 +4249,10 @@
 model[iter_][2] = path_to_snd_file # set new path to sounds_model
 
 def on_play_button_clicked(self, widget):
-model, iter_ = self.sound_tree.get_selection().get_selected()
+sel = self.sound_tree.get_selection()
+if not sel:
+return
+model, iter_ = sel.get_selected()
 if not iter_:
 return
 snd_event_config_name = model[iter_][3]
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback

[Yann Leboulanger]

changeset 74a54370f4f1 in /home/hg/repos/gajim

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

diffstat:

 src/common/xmpp/client_nb.py |  3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diffs (13 lines):

diff -r c737c0690cec -r 74a54370f4f1 src/common/xmpp/client_nb.py
--- a/src/common/xmpp/client_nb.py  Sat Nov 24 02:19:56 2012 -0400
+++ b/src/common/xmpp/client_nb.py  Fri Dec 07 17:05:20 2012 +0100
@@ -93,7 +93,8 @@
 if 'NonBlockingNonSASL' in self.__dict__:
 self.NonBlockingNonSASL.PlugOut()
 if 'SASL' in self.__dict__:
-if self.SASL.startsasl == 'failure-in-process':
+if 'startsasl' in self.SASL.__dict__ and \
+self.SASL.startsasl == 'failure-in-process':
 sasl_failed = True
 self.SASL.startsasl = 'failure'
 self._on_start_sasl()
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback

[Fomin Denis]

changeset 6c6914187d03 in /home/hg/repos/gajim

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

diffstat:

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

diffs (12 lines):

diff -r c71ab70fbd35 -r 6c6914187d03 src/common/helpers.py
--- a/src/common/helpers.py Sat Nov 17 23:30:09 2012 +0400
+++ b/src/common/helpers.py Sun Nov 18 23:46:43 2012 +0400
@@ -1433,7 +1433,7 @@
 except Exception:
 proxy = None
 p = gajim.config.get('global_proxy')
-if p:
+if p and p in gajim.config.get_per('proxies'):
 proxy = {}
 proxyptr = gajim.config.get_per('proxies', p)
 if not proxyptr:
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback when a wrong certificate is being check...

[Yann Leboulanger]

changeset 734d02e7be50 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=734d02e7be50
description: prevent traceback when a wrong certificate is being checked. Fixes 
#7242

diffstat:

 src/common/check_X509.py |  7 ++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diffs (17 lines):

diff -r 1571a300a583 -r 734d02e7be50 src/common/check_X509.py
--- a/src/common/check_X509.py  Sat Oct 06 19:07:48 2012 +0200
+++ b/src/common/check_X509.py  Mon Oct 08 11:14:47 2012 +0200
@@ -133,7 +133,12 @@
 for i in range(0, cnt):
 ext = cert.get_extension(i)
 if ext.get_short_name() == 'subjectAltName':
-r = _parse_asn1(ext.get_data())
+try:
+r = _parse_asn1(ext.get_data())
+except:
+log.error('Wrong data in certificate: subjectAltName=%s' % 
\
+ext.get_data())
+continue
 if 'otherName' in r:
 if oid_xmppaddr in r['otherName']:
 for host in r['otherName'][oid_xmppaddr]:
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback when a wrong certificate is being check...

[Yann Leboulanger]

changeset c7a32812c477 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=c7a32812c477
description: prevent traceback when a wrong certificate is being checked. Fixes 
#7242

diffstat:

 src/common/check_X509.py |  7 ++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diffs (17 lines):

diff -r ccef4ef8fe6b -r c7a32812c477 src/common/check_X509.py
--- a/src/common/check_X509.py  Sat Oct 06 19:07:48 2012 +0200
+++ b/src/common/check_X509.py  Mon Oct 08 11:14:47 2012 +0200
@@ -133,7 +133,12 @@
 for i in range(0, cnt):
 ext = cert.get_extension(i)
 if ext.get_short_name() == 'subjectAltName':
-r = _parse_asn1(ext.get_data())
+try:
+r = _parse_asn1(ext.get_data())
+except:
+log.error('Wrong data in certificate: subjectAltName=%s' % 
\
+ext.get_data())
+continue
 if 'otherName' in r:
 if oid_xmppaddr in r['otherName']:
 for host in r['otherName'][oid_xmppaddr]:
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback. Fixes #7080

[Yann Leboulanger]

changeset ff41575b0b0e in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=ff41575b0b0e
description: prevent traceback. Fixes #7080

diffstat:

 src/common/helpers.py |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (19 lines):

diff -r 47f4f35af77c -r ff41575b0b0e src/common/helpers.py
--- a/src/common/helpers.py Sat Jan 21 16:32:52 2012 +0100
+++ b/src/common/helpers.py Sun Jan 22 00:28:14 2012 +0100
@@ -1432,6 +1432,8 @@
 if p:
 proxy = {}
 proxyptr = gajim.config.get_per('proxies', p)
+if not proxyptr:
+return proxy
 for key in proxyptr.keys():
 proxy[key] = proxyptr[key][1]
 return proxy
@@ -1542,4 +1544,4 @@
 proxy = get_proxy_info(account)
 if proxy and proxy['type'] in ('http', 'socks5'):
 return _get_img_proxy(attrs, proxy)
-return _get_img_direct(attrs)
\ No newline at end of file
+return _get_img_direct(attrs)
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: Prevent traceback

[Fomin Denis]

changeset 61fa1268d4a2 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=61fa1268d4a2
description: Prevent traceback

diffstat:

 src/plugins/pluginmanager.py |  5 -
 1 files changed, 4 insertions(+), 1 deletions(-)

diffs (15 lines):

diff -r e83de0e87e88 -r 61fa1268d4a2 src/plugins/pluginmanager.py
--- a/src/plugins/pluginmanager.py  Fri Jan 06 09:45:11 2012 +0100
+++ b/src/plugins/pluginmanager.py  Sat Jan 07 12:00:04 2012 +0400
@@ -475,7 +475,10 @@
 
 except TypeError, type_error:
 # set plugin localization
-module_attr._ = _
+try:
+module_attr._ = _
+except AttributeError, type_error:
+pass
 except ConfigParser.NoOptionError, type_error:
 # all fields are required
 log.debug('%s : %s' % (module_attr_name,
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback

[Yann Leboulanger]

changeset 19ad7cbca461 in /home/hg/repos/gajim

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

diffstat:

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

diffs (18 lines):

diff -r d09221875ba8 -r 19ad7cbca461 src/roster_window.py
--- a/src/roster_window.py  Sun Dec 18 23:21:51 2011 +0100
+++ b/src/roster_window.py  Sun Dec 18 17:14:30 2011 +0100
@@ -1654,8 +1654,12 @@
 if type2 == 'self_contact':
 return 1
 if type1 == 'group':
-name1 = model[iter1][C_JID].decode('utf-8')
-name2 = model[iter2][C_JID].decode('utf-8')
+name1 = model[iter1][C_JID]
+if name1:
+name1 = name1.decode('utf-8')
+name2 = model[iter2][C_JID]
+if name2:
+name2 = name2.decode('utf-8')
 if name1 == _('Transports'):
 return 1
 if name2 == _('Transports'):
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback

[Yann Leboulanger]

changeset 311f32ef6fc6 in /home/hg/repos/gajim

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

diffstat:

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

diffs (18 lines):

diff -r c3b14abf293e -r 311f32ef6fc6 src/roster_window.py
--- a/src/roster_window.py  Sun Dec 18 18:35:23 2011 +0400
+++ b/src/roster_window.py  Sun Dec 18 17:14:30 2011 +0100
@@ -1654,8 +1654,12 @@
 if type2 == 'self_contact':
 return 1
 if type1 == 'group':
-name1 = model[iter1][C_JID].decode('utf-8')
-name2 = model[iter2][C_JID].decode('utf-8')
+name1 = model[iter1][C_JID]
+if name1:
+name1 = name1.decode('utf-8')
+name2 = model[iter2][C_JID]
+if name2:
+name2 = name2.decode('utf-8')
 if name1 == _('Transports'):
 return 1
 if name2 == _('Transports'):
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback

[Yann Leboulanger]

changeset 210676ff2c93 in /home/hg/repos/gajim

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

diffstat:

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

diffs (12 lines):

diff -r 1cf0e5dfbb96 -r 210676ff2c93 src/common/helpers.py
--- a/src/common/helpers.py Tue Dec 06 22:10:45 2011 +0300
+++ b/src/common/helpers.py Thu Dec 08 21:57:29 2011 +0100
@@ -1461,7 +1461,7 @@
 deadline = time.time() + 3
 while True:
 if time.time()  deadline:
-log.debug('Timeout loading image %s ' % attrs['src'] + str(ex))
+log.debug('Timeout loading image %s ' % attrs['src'])
 mem = ''
 alt = attrs.get('alt', '')
 if alt:
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback

[Yann Leboulanger]

changeset f3709be94774 in /home/hg/repos/gajim

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

diffstat:

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

diffs (12 lines):

diff -r 392a62088e4b -r f3709be94774 src/common/helpers.py
--- a/src/common/helpers.py Tue Dec 06 22:10:45 2011 +0300
+++ b/src/common/helpers.py Thu Dec 08 21:57:29 2011 +0100
@@ -1461,7 +1461,7 @@
 deadline = time.time() + 3
 while True:
 if time.time()  deadline:
-log.debug('Timeout loading image %s ' % attrs['src'] + str(ex))
+log.debug('Timeout loading image %s ' % attrs['src'])
 mem = ''
 alt = attrs.get('alt', '')
 if alt:
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback. Fixes #7053

[Yann Leboulanger]

changeset 13311081f390 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=13311081f390
description: prevent traceback. Fixes #7053

diffstat:

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

diffs (23 lines):

diff -r 61c7b27b0355 -r 13311081f390 src/common/connection_handlers_events.py
--- a/src/common/connection_handlers_events.py  Sat Dec 03 13:11:05 2011 +0100
+++ b/src/common/connection_handlers_events.py  Sat Dec 03 13:33:03 2011 +0100
@@ -1203,6 +1203,7 @@
 self.forwarded = self.msg_obj.forwarded
 self.sent = self.msg_obj.sent
 self.popup = False
+self.msg_id = None # id in log database
 
 self.receipt_request_tag = self.stanza.getTag('request',
 namespace=xmpp.NS_RECEIPTS)
diff -r 61c7b27b0355 -r 13311081f390 src/session.py
--- a/src/session.pySat Dec 03 13:11:05 2011 +0100
+++ b/src/session.pySat Dec 03 13:33:03 2011 +0100
@@ -74,8 +74,6 @@
 if self.control and self.control.resource:
 self.control.change_resource(self.resource)
 
-obj.msg_id = None
-
 if obj.mtype == 'chat':
 if not obj.stanza.getTag('body') and obj.chatstate is None:
 return
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback. Fixes #7054

[Yann Leboulanger]

changeset 6631de1e6633 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=6631de1e6633
description: prevent traceback. Fixes #7054

diffstat:

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

diffs (12 lines):

diff -r badbf70d447e -r 6631de1e6633 src/common/xmpp/roster_nb.py
--- a/src/common/xmpp/roster_nb.py  Tue Nov 29 17:20:25 2011 +0100
+++ b/src/common/xmpp/roster_nb.py  Sat Dec 03 12:49:01 2011 +0100
@@ -342,7 +342,7 @@
 self._owner.Dispatcher.ProcessNonBlocking(data)
 if not self._set:
 return
-if not self._owner:
+if not hasattr(self, '_owner') or not self._owner:
 # Connection has been closed by receiving a stream:error for ex,
 return
 self._owner.onreceive(None)
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback

[Fomin Denis]

changeset 56189a05a71d in /home/hg/repos/gajim

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

diffstat:

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

diffs (12 lines):

diff -r 3f78f1bc6cff -r 56189a05a71d src/plugins/plugin.py
--- a/src/plugins/plugin.py Mon Oct 10 22:06:30 2011 +0300
+++ b/src/plugins/plugin.py Tue Oct 11 22:27:41 2011 +0300
@@ -203,7 +203,7 @@
 self.FILE_PATH = os.path.join(gajim.PLUGINS_CONFIG_DIR,
 self.plugin.short_name).decode('utf-8').encode(
 locale.getpreferredencoding())
-self.data = None
+self.data = {}
 
 @log_calls('GajimPluginConfig')
 def __getitem__(self, key):
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback when going offline while a jingle sessi...

[Yann Leboulanger]

changeset 797dd9d03316 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=797dd9d03316
description: prevent traceback when going offline while a jingle session is 
active

diffstat:

 src/common/jingle_session.py |  7 ---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (17 lines):

diff -r 3f7a9d2d9d3c -r 797dd9d03316 src/common/jingle_session.py
--- a/src/common/jingle_session.py  Tue Oct 11 21:44:02 2011 +0200
+++ b/src/common/jingle_session.py  Wed Oct 12 21:07:02 2011 +0200
@@ -672,9 +672,10 @@
 
 def __content_remove(self, content, reason=None):
 assert self.state != JingleStates.ended
-stanza, jingle = self.__make_jingle('content-remove', reason=reason)
-self.__append_content(jingle, content)
-self.connection.connection.send(stanza)
+if self.connection.connection and self.connection.connected  1:
+stanza, jingle = self.__make_jingle('content-remove', 
reason=reason)
+self.__append_content(jingle, content)
+self.connection.connection.send(stanza)
 # TODO: this will fail if content is not an RTP content
 gajim.nec.push_incoming_event(JingleDisconnectedReceivedEvent(None,
 conn=self.connection, jingle_session=self, media=content.media,
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback when obj.msg_id is not set

[Yann Leboulanger]

changeset a5e5b7525fb0 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=a5e5b7525fb0
description: prevent traceback when obj.msg_id is not set

diffstat:

 src/session.py |  15 +++
 1 files changed, 7 insertions(+), 8 deletions(-)

diffs (53 lines):

diff -r 51b82872570c -r a5e5b7525fb0 src/session.py
--- a/src/session.pySat Oct 15 10:47:22 2011 +0200
+++ b/src/session.pySun Oct 16 11:14:40 2011 +0200
@@ -73,7 +73,7 @@
 if self.control and self.control.resource:
 self.control.change_resource(self.resource)
 
-msg_id = None
+obj.msg_id = None
 
 if obj.mtype == 'chat':
 if not obj.stanza.getTag('body') and obj.chatstate is None:
@@ -89,7 +89,7 @@
 msg_to_log = obj.xhtml
 else:
 msg_to_log = obj.msgtxt
-msg_id = gajim.logger.write(log_type, obj.fjid,
+obj.msg_id = gajim.logger.write(log_type, obj.fjid,
 msg_to_log, tim=obj.timestamp, subject=obj.subject)
 except exceptions.PysqliteOperationalError, e:
 self.conn.dispatch('ERROR', (_('Disk WriteError'), str(e)))
@@ -101,8 +101,6 @@
 common.logger.LOG_DB_PATH
 self.conn.dispatch('ERROR', (pritext, sectext))
 
-obj.msg_id = msg_id
-
 treat_as = gajim.config.get('treat_incoming_messages')
 if treat_as:
 obj.mtype = treat_as
@@ -134,8 +132,8 @@
 # Brand new message, incoming.
 contact.our_chatstate = obj.chatstate
 contact.chatstate = obj.chatstate
-if msg_id: # Do not overwrite an existing msg_id with None
-contact.msg_id = msg_id
+if obj.msg_id: # Do not overwrite an existing msg_id with None
+contact.msg_id = obj.msg_id
 
 # THIS MUST BE AFTER chatstates handling
 # AND BEFORE playsound (else we ear sounding on chatstates!)
@@ -168,8 +166,9 @@
 if gajim.interface.remote_ctrl:
 gajim.interface.remote_ctrl.raise_signal('NewMessage', (
 self.conn.name, [obj.fjid, obj.msgtxt, obj.timestamp,
-obj.encrypted, obj.mtype, obj.subject, obj.chatstate, msg_id,
-obj.composing_xep, obj.user_nick, obj.xhtml, obj.form_node]))
+obj.encrypted, obj.mtype, obj.subject, obj.chatstate,
+obj.msg_id, obj.composing_xep, obj.user_nick, obj.xhtml,
+obj.form_node]))
 
 def roster_message2(self, obj):
 
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback in trigger plugin.

[Yann Leboulanger]

changeset f8214ad33106 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=f8214ad33106
description: prevent traceback in trigger plugin.

diffstat:

 plugins/triggers/manifest.ini |  2 +-
 plugins/triggers/triggers.py  |  6 --
 2 files changed, 5 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 4d993fc1b8d8 -r f8214ad33106 plugins/triggers/manifest.ini
--- a/plugins/triggers/manifest.ini Tue Nov 08 20:01:51 2011 +0100
+++ b/plugins/triggers/manifest.ini Tue Nov 08 20:23:48 2011 +0100
@@ -1,7 +1,7 @@
 [info]
 name: Triggers
 short_name: triggers
-version: 0.0.2
+version: 0.0.3
 description: Configure Gajim's behaviour for each contact
 authors: Yann Leboulanger aste...@lagaule.org
 homepage: http://trac.gajim.org/wiki/
diff -r 4d993fc1b8d8 -r f8214ad33106 plugins/triggers/triggers.py
--- a/plugins/triggers/triggers.py  Tue Nov 08 20:01:51 2011 +0100
+++ b/plugins/triggers/triggers.py  Tue Nov 08 20:23:48 2011 +0100
@@ -48,8 +48,10 @@
 if rule['recipient_type'] == 'contact' and obj.jid not in \
 rule_recipients:
 return False
-contact_groups = gajim.contacts.get_first_contact_from_jid(
-obj.conn.name, obj.jid).groups
+contact = gajim.contacts.get_first_contact_from_jid(obj.conn.name, 
obj.jid)
+if not contact:  # PM?
+return False
+contact_groups = contact.groups
 group_found = False
 for group in contact_groups:
 if group in rule_recipients:
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback when check update from ftp. see https:/...

[Fomin Denis]

changeset 3a9e28745442 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=3a9e28745442
description: prevent traceback when check update from ftp. see 
https://trac.gajim.org/ticket/7023#comment:13

diffstat:

 plugins/plugin_installer/plugin_installer.py |  52 +++
 1 files changed, 28 insertions(+), 24 deletions(-)

diffs (62 lines):

diff -r 37f6069ff97a -r 3a9e28745442 
plugins/plugin_installer/plugin_installer.py
--- a/plugins/plugin_installer/plugin_installer.py  Thu Nov 10 22:26:11 
2011 +0100
+++ b/plugins/plugin_installer/plugin_installer.py  Fri Nov 11 21:55:46 
2011 +0300
@@ -81,30 +81,34 @@
 @log_calls('PluginInstallerPlugin')
 def check_update(self):
 def _run():
-to_update = []
-con = ftplib.FTP_TLS(ftp.server)
-con.login()
-con.prot_p()
-con.cwd('plugins')
-plugins_dirs = con.nlst()
-for dir_ in plugins_dirs:
-try:
-con.retrbinary('RETR %s/manifest.ini' % dir_,
-ftp.handleDownload)
-except Exception, error:
-if str(error).startswith('550'):
-continue
-ftp.config.readfp(io.BytesIO(ftp.buffer_.getvalue()))
-local_version = ftp.get_plugin_version(ftp.config.get('info',
-'name'))
-if local_version:
-local = convert_version_to_list(local_version)
-remote = convert_version_to_list(ftp.config.get('info',
-'version'))
-if remote  local:
-to_update.append(ftp.config.get('info', 'name'))
-con.quit()
-gobject.idle_add(self.warn_update, to_update)
+try:
+to_update = []
+con = ftplib.FTP_TLS(ftp.server)
+con.login()
+con.prot_p()
+con.cwd('plugins')
+plugins_dirs = con.nlst()
+for dir_ in plugins_dirs:
+try:
+con.retrbinary('RETR %s/manifest.ini' % dir_,
+ftp.handleDownload)
+except Exception, error:
+if str(error).startswith('550'):
+continue
+ftp.config.readfp(io.BytesIO(ftp.buffer_.getvalue()))
+local_version = ftp.get_plugin_version(ftp.config.get(
+'info', 'name'))
+if local_version:
+local = convert_version_to_list(local_version)
+remote = convert_version_to_list(ftp.config.get('info',
+'version'))
+if remote  local:
+to_update.append(ftp.config.get('info', 'name'))
+con.quit()
+gobject.idle_add(self.warn_update, to_update)
+except Exception, e:
+WarningDialog(_('Ftp error'), str(e),
+gajim.interface.roster.window)
 ftp = Ftp(self)
 ftp.run = _run
 ftp.start()
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback when check update from ftp. see https:/...

[Fomin Denis]

changeset 20d133dd6988 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=20d133dd6988
description: prevent traceback when check update from ftp. see 
https://trac.gajim.org/ticket/7023#comment:13

diffstat:

 plugins/plugin_installer/plugin_installer.py |  52 +++
 1 files changed, 28 insertions(+), 24 deletions(-)

diffs (62 lines):

diff -r 8a94c1a25462 -r 20d133dd6988 
plugins/plugin_installer/plugin_installer.py
--- a/plugins/plugin_installer/plugin_installer.py  Thu Nov 10 23:19:39 
2011 +0300
+++ b/plugins/plugin_installer/plugin_installer.py  Fri Nov 11 21:55:46 
2011 +0300
@@ -81,30 +81,34 @@
 @log_calls('PluginInstallerPlugin')
 def check_update(self):
 def _run():
-to_update = []
-con = ftplib.FTP_TLS(ftp.server)
-con.login()
-con.prot_p()
-con.cwd('plugins')
-plugins_dirs = con.nlst()
-for dir_ in plugins_dirs:
-try:
-con.retrbinary('RETR %s/manifest.ini' % dir_,
-ftp.handleDownload)
-except Exception, error:
-if str(error).startswith('550'):
-continue
-ftp.config.readfp(io.BytesIO(ftp.buffer_.getvalue()))
-local_version = ftp.get_plugin_version(ftp.config.get('info',
-'name'))
-if local_version:
-local = convert_version_to_list(local_version)
-remote = convert_version_to_list(ftp.config.get('info',
-'version'))
-if remote  local:
-to_update.append(ftp.config.get('info', 'name'))
-con.quit()
-gobject.idle_add(self.warn_update, to_update)
+try:
+to_update = []
+con = ftplib.FTP_TLS(ftp.server)
+con.login()
+con.prot_p()
+con.cwd('plugins')
+plugins_dirs = con.nlst()
+for dir_ in plugins_dirs:
+try:
+con.retrbinary('RETR %s/manifest.ini' % dir_,
+ftp.handleDownload)
+except Exception, error:
+if str(error).startswith('550'):
+continue
+ftp.config.readfp(io.BytesIO(ftp.buffer_.getvalue()))
+local_version = ftp.get_plugin_version(ftp.config.get(
+'info', 'name'))
+if local_version:
+local = convert_version_to_list(local_version)
+remote = convert_version_to_list(ftp.config.get('info',
+'version'))
+if remote  local:
+to_update.append(ftp.config.get('info', 'name'))
+con.quit()
+gobject.idle_add(self.warn_update, to_update)
+except Exception, e:
+WarningDialog(_('Ftp error'), str(e),
+gajim.interface.roster.window)
 ftp = Ftp(self)
 ftp.run = _run
 ftp.start()
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback in trigger plugin.

[Yann Leboulanger]

changeset 0ec525152985 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=0ec525152985
description: prevent traceback in trigger plugin.

diffstat:

 plugins/triggers/manifest.ini |  2 +-
 plugins/triggers/triggers.py  |  6 --
 2 files changed, 5 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r e873dbfdbcc5 -r 0ec525152985 plugins/triggers/manifest.ini
--- a/plugins/triggers/manifest.ini Tue Nov 08 20:01:51 2011 +0100
+++ b/plugins/triggers/manifest.ini Tue Nov 08 20:23:48 2011 +0100
@@ -1,7 +1,7 @@
 [info]
 name: Triggers
 short_name: triggers
-version: 0.0.2
+version: 0.0.3
 description: Configure Gajim's behaviour for each contact
 authors: Yann Leboulanger aste...@lagaule.org
 homepage: http://trac.gajim.org/wiki/
diff -r e873dbfdbcc5 -r 0ec525152985 plugins/triggers/triggers.py
--- a/plugins/triggers/triggers.py  Tue Nov 08 20:01:51 2011 +0100
+++ b/plugins/triggers/triggers.py  Tue Nov 08 20:23:48 2011 +0100
@@ -48,8 +48,10 @@
 if rule['recipient_type'] == 'contact' and obj.jid not in \
 rule_recipients:
 return False
-contact_groups = gajim.contacts.get_first_contact_from_jid(
-obj.conn.name, obj.jid).groups
+contact = gajim.contacts.get_first_contact_from_jid(obj.conn.name, 
obj.jid)
+if not contact:  # PM?
+return False
+contact_groups = contact.groups
 group_found = False
 for group in contact_groups:
 if group in rule_recipients:
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback when obj.msg_id is not set

[Yann Leboulanger]

changeset 1667779e44fb in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=1667779e44fb
description: prevent traceback when obj.msg_id is not set

diffstat:

 src/session.py |  14 ++
 1 files changed, 6 insertions(+), 8 deletions(-)

diffs (52 lines):

diff -r 77435d3a9d12 -r 1667779e44fb src/session.py
--- a/src/session.pySat Oct 15 10:47:22 2011 +0200
+++ b/src/session.pySun Oct 16 11:14:40 2011 +0200
@@ -73,7 +73,7 @@
 if self.control and self.control.resource:
 self.control.change_resource(self.resource)
 
-msg_id = None
+obj.msg_id = None
 
 if obj.mtype == 'chat':
 if not obj.stanza.getTag('body') and obj.chatstate is None:
@@ -89,7 +89,7 @@
 msg_to_log = obj.xhtml
 else:
 msg_to_log = obj.msgtxt
-msg_id = gajim.logger.write(log_type, obj.fjid,
+obj.msg_id = gajim.logger.write(log_type, obj.fjid,
 msg_to_log, tim=obj.timestamp, subject=obj.subject)
 except exceptions.PysqliteOperationalError, e:
 self.conn.dispatch('ERROR', (_('Disk WriteError'), str(e)))
@@ -101,8 +101,6 @@
 common.logger.LOG_DB_PATH
 self.conn.dispatch('ERROR', (pritext, sectext))
 
-obj.msg_id = msg_id
-
 treat_as = gajim.config.get('treat_incoming_messages')
 if treat_as:
 obj.mtype = treat_as
@@ -132,8 +130,8 @@
 # Brand new message, incoming.
 contact.our_chatstate = obj.chatstate
 contact.chatstate = obj.chatstate
-if msg_id: # Do not overwrite an existing msg_id with None
-contact.msg_id = msg_id
+if obj.msg_id: # Do not overwrite an existing msg_id with None
+contact.msg_id = obj.msg_id
 
 # THIS MUST BE AFTER chatstates handling
 # AND BEFORE playsound (else we ear sounding on chatstates!)
@@ -166,8 +164,8 @@
 if gajim.interface.remote_ctrl:
 gajim.interface.remote_ctrl.raise_signal('NewMessage', (
 self.conn.name, [obj.fjid, obj.msgtxt, obj.timestamp,
-obj.encrypted, obj.mtype, obj.subject, obj.chatstate, msg_id,
-obj.user_nick, obj.xhtml, obj.form_node]))
+obj.encrypted, obj.mtype, obj.subject, obj.chatstate,
+obj.msg_id, obj.user_nick, obj.xhtml, obj.form_node]))
 
 def roster_message2(self, obj):
 
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback

[Fomin Denis]

changeset 0ffd01eba616 in /home/hg/repos/gajim

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

diffstat:

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

diffs (12 lines):

diff -r a1f2afcbebef -r 0ffd01eba616 src/plugins/plugin.py
--- a/src/plugins/plugin.py Mon Oct 10 22:06:30 2011 +0300
+++ b/src/plugins/plugin.py Tue Oct 11 22:27:41 2011 +0300
@@ -203,7 +203,7 @@
 self.FILE_PATH = os.path.join(gajim.PLUGINS_CONFIG_DIR,
 self.plugin.short_name).decode('utf-8').encode(
 locale.getpreferredencoding())
-self.data = None
+self.data = {}
 
 @log_calls('GajimPluginConfig')
 def __getitem__(self, key):
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback

[Yann Leboulanger]

changeset 2005a764808d in /home/hg/repos/gajim

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

diffstat:

 src/common/connection_handlers_events.py |  1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diffs (11 lines):

diff -r e81a24725d65 -r 2005a764808d src/common/connection_handlers_events.py
--- a/src/common/connection_handlers_events.py  Thu Sep 01 21:17:43 2011 +0200
+++ b/src/common/connection_handlers_events.py  Fri Sep 02 07:06:20 2011 +0200
@@ -1135,6 +1135,7 @@
 self.session = self.msg_obj.session
 self.timestamp = self.msg_obj.timestamp
 self.encrypted = self.msg_obj.encrypted
+self.popup = False
 
 self.receipt_request_tag = self.stanza.getTag('request',
 namespace=xmpp.NS_RECEIPTS)
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback

[Yann Leboulanger]

changeset 75cb1cf6022c in /home/hg/repos/gajim

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

diffstat:

 src/common/connection_handlers_events.py |  1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diffs (11 lines):

diff -r 49a1fa5acfe0 -r 75cb1cf6022c src/common/connection_handlers_events.py
--- a/src/common/connection_handlers_events.py  Thu Sep 01 21:17:43 2011 +0200
+++ b/src/common/connection_handlers_events.py  Fri Sep 02 07:06:20 2011 +0200
@@ -1124,6 +1124,7 @@
 self.session = self.msg_obj.session
 self.timestamp = self.msg_obj.timestamp
 self.encrypted = self.msg_obj.encrypted
+self.popup = False
 
 self.receipt_request_tag = self.stanza.getTag('request',
 namespace=xmpp.NS_RECEIPTS)
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback when using normal socks5 FT

[Yann Leboulanger]

changeset 51c9600fc1f1 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=51c9600fc1f1
description: prevent traceback when using normal socks5 FT

diffstat:

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

diffs (13 lines):

diff -r 4c57cd302a0a -r 51c9600fc1f1 src/gui_interface.py
--- a/src/gui_interface.py  Sat Jul 02 00:47:33 2011 +0200
+++ b/src/gui_interface.py  Sat Jul 02 00:52:35 2011 +0200
@@ -922,7 +922,8 @@
 jid = unicode(file_props['receiver'])
 
 # End jingle session
-if file_props['session-type'] == 'jingle' and file_props['type'] == 
'r':
+if file_props.get('session-type') == 'jingle' and file_props['type'] 
==\
+'r':
 session = gajim.connections[account].get_jingle_session(jid,
 sid=file_props['session-sid'])
 # get content:
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback with metacontacts. Fixes #6902, #5910

[Yann Leboulanger]

changeset 8148ba147f21 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=8148ba147f21
description: prevent traceback with metacontacts. Fixes #6902, #5910

diffstat:

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

diffs (15 lines):

diff -r 73523ed11fc3 -r 8148ba147f21 src/roster_window.py
--- a/src/roster_window.py  Tue Jun 14 19:17:39 2011 +0200
+++ b/src/roster_window.py  Wed Jun 15 12:20:23 2011 +0200
@@ -1418,9 +1418,10 @@
 self._iters = {}
 # for merged mode
 self._iters['MERGED'] = {'account': None, 'groups': {}}
-
 for acct in gajim.contacts.get_accounts():
 self._iters[acct] = {'account': None, 'groups': {}, 'contacts': {}}
+
+for acct in gajim.contacts.get_accounts():
 self.add_account(acct)
 self.add_account_contacts(acct)
 
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback with metacontacts. Fixes #6902, #5910

[Yann Leboulanger]

changeset 73a053432c2b in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=73a053432c2b
description: prevent traceback with metacontacts. Fixes #6902, #5910

diffstat:

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

diffs (15 lines):

diff -r f19deb09f7db -r 73a053432c2b src/roster_window.py
--- a/src/roster_window.py  Tue Jun 14 19:28:13 2011 +0200
+++ b/src/roster_window.py  Wed Jun 15 12:20:23 2011 +0200
@@ -1409,9 +1409,10 @@
 self._iters = {}
 # for merged mode
 self._iters['MERGED'] = {'account': None, 'groups': {}}
-
 for acct in gajim.contacts.get_accounts():
 self._iters[acct] = {'account': None, 'groups': {}, 'contacts': {}}
+
+for acct in gajim.contacts.get_accounts():
 self.add_account(acct)
 self.add_account_contacts(acct)
 
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent Traceback when there is an empty secret file. Fix...

[Yann Leboulanger]

changeset 3e98fd816fdf in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=3e98fd816fdf
description: prevent Traceback when there is an empty secret file. Fixes #6752

diffstat:

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

diffs (12 lines):

diff -r 31348a3e6d87 -r 3e98fd816fdf src/secrets.py
--- a/src/secrets.pyWed Jan 12 06:56:28 2011 +0100
+++ b/src/secrets.pyWed Jan 12 22:47:36 2011 +0100
@@ -99,7 +99,7 @@
 
 try:
 secrets = pickle.load(f)
-except KeyError:
+except (KeyError, EOFError):
 f.close()
 secrets = Secrets(filename)
 
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback if reconnect menuitem is activated. Fix...

[Denis Fomin]

changeset b40c07282d05 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=b40c07282d05
description: prevent traceback if reconnect menuitem is activated. Fixes #6834

diffstat:

 src/roster_window.py |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (19 lines):

diff -r b679e79466e8 -r b40c07282d05 src/roster_window.py
--- a/src/roster_window.py  Wed May 11 20:42:44 2011 +0200
+++ b/src/roster_window.py  Mon Mar 14 13:20:48 2011 +0300
@@ -3011,12 +3011,12 @@
 
 def on_reconnect(self, widget, jid, account):
 
-When disconnect menuitem is activated: disconect from room
+When reconnect menuitem is activated: join the room
 
 if jid in gajim.interface.minimized_controls[account]:
 ctrl = gajim.interface.minimized_controls[account][jid]
-gajim.interface.join_gc_room(account, jid, ctrl.nick,
-gajim.gc_passwords.get(jid, ''))
+gajim.interface.join_gc_room(account, jid, ctrl.nick,
+gajim.gc_passwords.get(jid, ''))
 
 def on_send_single_message_menuitem_activate(self, widget, account,
 contact=None):
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback if reconnect menuitem is activated. Fix...

[Denis Fomin]

changeset 297ad7711d20 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=297ad7711d20
description: prevent traceback if reconnect menuitem is activated. Fixes #6834

diffstat:

 src/roster_window.py |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (19 lines):

diff -r 1f842a5f3d17 -r 297ad7711d20 src/roster_window.py
--- a/src/roster_window.py  Fri Mar 11 00:35:26 2011 +0300
+++ b/src/roster_window.py  Mon Mar 14 13:20:48 2011 +0300
@@ -3146,12 +3146,12 @@
 
 def on_reconnect(self, widget, jid, account):
 
-When disconnect menuitem is activated: disconect from room
+When reconnect menuitem is activated: join the room
 
 if jid in gajim.interface.minimized_controls[account]:
 ctrl = gajim.interface.minimized_controls[account][jid]
-gajim.interface.join_gc_room(account, jid, ctrl.nick,
-gajim.gc_passwords.get(jid, ''))
+gajim.interface.join_gc_room(account, jid, ctrl.nick,
+gajim.gc_passwords.get(jid, ''))
 
 def on_send_single_message_menuitem_activate(self, widget, account,
 contact=None):
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback If the gajim icon is absent

[Denis Fomin]

changeset 913f18edc7d7 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=913f18edc7d7
description: prevent traceback If the gajim icon is absent

diffstat:

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

diffs (15 lines):

diff -r a98e1d445d62 -r 913f18edc7d7 src/gui_interface.py
--- a/src/gui_interface.py  Mon Feb 21 18:11:47 2011 +0300
+++ b/src/gui_interface.py  Mon Feb 21 23:52:16 2011 +0300
@@ -2779,8 +2779,9 @@
 self.systray = statusicon.StatusIcon()
 
 pix = gtkgui_helpers.get_icon_pixmap('gajim', 32)
-# set the icon to all windows
-gtk.window_set_default_icon(pix)
+if pix is not None:
+# set the icon to all windows
+gtk.window_set_default_icon(pix)
 
 self.init_emoticons()
 self.make_regexps()
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback

[Yann Leboulanger]

changeset 29472b5ba6e0 in /home/hg/repos/gajim

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

diffstat:

 src/common/connection_handlers_events.py |  5 -
 1 files changed, 4 insertions(+), 1 deletions(-)

diffs (15 lines):

diff -r f78ccd449879 -r 29472b5ba6e0 src/common/connection_handlers_events.py
--- a/src/common/connection_handlers_events.py  Thu Jan 06 21:01:43 2011 +0100
+++ b/src/common/connection_handlers_events.py  Sun Jan 09 20:58:58 2011 +0100
@@ -881,7 +881,10 @@
 # We may ask it to real jid in gui part.
 self.status_code = []
 ns_muc_user_x = self.stanza.getTag('x', namespace=xmpp.NS_MUC_USER)
-destroy = ns_muc_user_x.getTag('destroy')
+if ns_muc_user_x:
+destroy = ns_muc_user_x.getTag('destroy')
+else:
+destroy = None
 if ns_muc_user_x and destroy:
 # Room has been destroyed. see
 # http://www.xmpp.org/extensions/xep-0045.html#destroyroom
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback. Fixes #5978

[Yann Leboulanger]

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%(
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback when we get a groupchat message for a r...

[Yann Leboulanger]

changeset 1f386a858d48 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=1f386a858d48
description: prevent traceback when we get a groupchat message for a room we're 
no more conencted. Fixes #5993

diffstat:

 src/remote_control.py |  3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diffs (13 lines):

diff -r 71889998d62f -r 1f386a858d48 src/remote_control.py
--- a/src/remote_control.py Mon Oct 25 09:57:40 2010 +0200
+++ b/src/remote_control.py Mon Oct 25 11:23:10 2010 +0200
@@ -171,6 +171,9 @@
 self.raise_signal('Unsubscribed', (obj.conn.name, obj.jid))
 
 def on_gc_message_received(self, obj):
+if not hasattr(obj, 'needs_highlight'):
+# event has not been handled at GUI level
+return
 self.raise_signal('GCMessage', (obj.conn.name, [obj.fjid, obj.msgtxt,
 obj.timestamp, obj.has_timestamp, obj.xhtml_msgtxt, 
obj.status_code,
 obj.displaymarking, obj.captcha_form, obj.needs_highlight]))
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback when opening change status dialog. Fixe...

[Yann Leboulanger]

changeset 0f64fdfb45ce in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=0f64fdfb45ce
description: prevent traceback when opening change status dialog. Fixes #5985

diffstat:

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

diffs (36 lines):

diff -r b10ba9f938bd -r 0f64fdfb45ce src/dialogs.py
--- a/src/dialogs.pySat Oct 16 23:24:46 2010 +0200
+++ b/src/dialogs.pyTue Oct 19 21:43:09 2010 +0200
@@ -664,15 +664,14 @@
 label = self.xml.get_object('activity_button_label')
 if 'activity' in self.pep_dict and self.pep_dict['activity'] in \
pep.ACTIVITIES:
-if 'subactivity' in self.pep_dict and self.pep_dict['subactivity'] 
in \
-   pep.ACTIVITIES[self.pep_dict['activity']]:
+if 'subactivity' in self.pep_dict and self.pep_dict['subactivity'] 
\
+in pep.ACTIVITIES[self.pep_dict['activity']]:
 img.set_from_pixbuf(gtkgui_helpers.load_activity_icon(
-self.pep_dict['activity'], 
self.pep_dict['subactivity']).\
-get_pixbuf())
+self.pep_dict['activity'], self.pep_dict['subactivity']).\
+get_pixbuf())
 else:
 img.set_from_pixbuf(gtkgui_helpers.load_activity_icon(
-self.pep_dict['activity']).get_pixbuf())
-#   
item.set_tooltip_text(pep.ACTIVITIES[category]['category'])
+self.pep_dict['activity']).get_pixbuf())
 if self.pep_dict['activity_text']:
 label.set_text(self.pep_dict['activity_text'])
 else:
@@ -687,9 +686,9 @@
 
 img = self.xml.get_object('mood_image')
 label = self.xml.get_object('mood_button_label')
-if self.pep_dict['mood'] in pep.MOODS:
+if 'mood' in self.pep_dict and self.pep_dict['mood'] in pep.MOODS:
 img.set_from_pixbuf(gtkgui_helpers.load_mood_icon(
-self.pep_dict['mood']).get_pixbuf())
+self.pep_dict['mood']).get_pixbuf())
 if self.pep_dict['mood_text']:
 label.set_text(self.pep_dict['mood_text'])
 else:
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback when opening change status dialog. Fixe...

[Yann Leboulanger]

changeset 89ff917c301a in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=89ff917c301a
description: prevent traceback when opening change status dialog. Fixes #5985

diffstat:

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

diffs (36 lines):

diff -r 30010db4d1cd -r 89ff917c301a src/dialogs.py
--- a/src/dialogs.pyTue Oct 19 18:14:30 2010 +0200
+++ b/src/dialogs.pyTue Oct 19 21:43:09 2010 +0200
@@ -665,15 +665,14 @@
 label = self.xml.get_object('activity_button_label')
 if 'activity' in self.pep_dict and self.pep_dict['activity'] in \
pep.ACTIVITIES:
-if 'subactivity' in self.pep_dict and self.pep_dict['subactivity'] 
in \
-   pep.ACTIVITIES[self.pep_dict['activity']]:
+if 'subactivity' in self.pep_dict and self.pep_dict['subactivity'] 
\
+in pep.ACTIVITIES[self.pep_dict['activity']]:
 img.set_from_pixbuf(gtkgui_helpers.load_activity_icon(
-self.pep_dict['activity'], 
self.pep_dict['subactivity']).\
-get_pixbuf())
+self.pep_dict['activity'], self.pep_dict['subactivity']).\
+get_pixbuf())
 else:
 img.set_from_pixbuf(gtkgui_helpers.load_activity_icon(
-self.pep_dict['activity']).get_pixbuf())
-#   
item.set_tooltip_text(pep.ACTIVITIES[category]['category'])
+self.pep_dict['activity']).get_pixbuf())
 if self.pep_dict['activity_text']:
 label.set_text(self.pep_dict['activity_text'])
 else:
@@ -688,9 +687,9 @@
 
 img = self.xml.get_object('mood_image')
 label = self.xml.get_object('mood_button_label')
-if self.pep_dict['mood'] in pep.MOODS:
+if 'mood' in self.pep_dict and self.pep_dict['mood'] in pep.MOODS:
 img.set_from_pixbuf(gtkgui_helpers.load_mood_icon(
-self.pep_dict['mood']).get_pixbuf())
+self.pep_dict['mood']).get_pixbuf())
 if self.pep_dict['mood_text']:
 label.set_text(self.pep_dict['mood_text'])
 else:
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback

[Yann Leboulanger]

changeset 8edc45e9a637 in /home/hg/repos/gajim

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

diffstat:

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

diffs (12 lines):

diff -r e1edaf27dd11 -r 8edc45e9a637 src/dialogs.py
--- a/src/dialogs.pyFri Sep 03 10:49:19 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: prevent traceback when receiving strange reply to iq:last...

[Yann Leboulanger]

changeset 46e4d8425796 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=46e4d8425796
description: prevent traceback when receiving strange reply to iq:last. Fixes 
#5898

diffstat:

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

diffs (12 lines):

diff -r b5703ff5c457 -r 46e4d8425796 src/common/connection_handlers.py
--- a/src/common/connection_handlers.py Wed Sep 08 22:26:04 2010 +0200
+++ b/src/common/connection_handlers.py Fri Sep 10 21:27:10 2010 +0200
@@ -820,6 +820,8 @@
 def _LastResultCB(self, con, iq_obj):
 log.debug('LastResultCB')
 qp = iq_obj.getTag('query')
+if not qp:
+return
 seconds = qp.getAttr('seconds')
 status = qp.getData()
 try:
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback when receiving strange reply to iq:last...

[Yann Leboulanger]

changeset 314cd6abb601 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=314cd6abb601
description: prevent traceback when receiving strange reply to iq:last. Fixes 
#5898

diffstat:

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

diffs (12 lines):

diff -r 44a33a30bdd8 -r 314cd6abb601 src/common/connection_handlers_events.py
--- a/src/common/connection_handlers_events.py  Thu Sep 09 16:40:58 2010 +0200
+++ b/src/common/connection_handlers_events.py  Fri Sep 10 21:27:10 2010 +0200
@@ -72,6 +72,8 @@
 return True
 
 qp = self.iq_obj.getTag('query')
+if not qp:
+return
 sec = qp.getAttr('seconds')
 self.status = qp.getData()
 try:
___
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: prevent traceback

[Yann Leboulanger]

changeset d2b7fe3b41d5 in /home/hg/repos/gajim

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

diffstat:

 src/common/socks5.py |  6 --
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (16 lines):

diff -r 17c95fb022ad -r d2b7fe3b41d5 src/common/socks5.py
--- a/src/common/socks5.py  Thu Aug 26 13:31:29 2010 +0200
+++ b/src/common/socks5.py  Thu Aug 26 13:52:40 2010 +0200
@@ -304,8 +304,10 @@
 if account in self.files_props:
 fl_props = self.files_props[account]
 if sid in fl_props:
-del self.on_success[sid]
-del self.on_failure[sid]
+if sid in self.on_success:
+del self.on_success[sid]
+if sid in self.on_failure:
+del self.on_failure[sid]
 del(fl_props[sid])
 
 if len(self.files_props) == 0:
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback when atom entry has no title

[Yann Leboulanger]

changeset bcfc58b1f0ce in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=bcfc58b1f0ce
description: prevent traceback when atom entry has no title

diffstat:

 src/atom_window.py |  15 +--
 1 files changed, 9 insertions(+), 6 deletions(-)

diffs (26 lines):

diff -r df6802e9ac10 -r bcfc58b1f0ce src/atom_window.py
--- a/src/atom_window.pyTue May 25 09:36:30 2010 +0200
+++ b/src/atom_window.pyTue May 25 09:46:12 2010 +0200
@@ -94,13 +94,16 @@
 u'small%s/small' % \
 gobject.markup_escape_text(newentry.feed_tagline))
 
-if newentry.uri is not None:
-self.entry_title_label.set_markup(
-u'span foreground=blue underline=single%s/span' % \
-gobject.markup_escape_text(newentry.title))
+if newentry.title:
+if newentry.uri is not None:
+self.entry_title_label.set_markup(
+u'span foreground=blue underline=single%s/span' % \
+gobject.markup_escape_text(newentry.title))
+else:
+self.entry_title_label.set_markup(
+gobject.markup_escape_text(newentry.title))
 else:
-self.entry_title_label.set_markup(
-gobject.markup_escape_text(newentry.title))
+self.entry_title_label.set_markup('')
 
 self.last_modified_label.set_text(newentry.updated)
 
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback when destroy handler already clean self...

[Yann Leboulanger]

changeset 89ee1d10d853 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=89ee1d10d853
description: prevent traceback when destroy handler already clean 
self.instances[account]['online_dialog'] dict. Fixes #5604

diffstat:

 src/gajim.py |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (14 lines):

diff -r 05c45bb18950 -r 89ee1d10d853 src/gajim.py
--- a/src/gajim.py  Tue Feb 16 09:44:23 2010 +0100
+++ b/src/gajim.py  Tue Feb 16 10:41:16 2010 +0100
@@ -612,7 +612,9 @@
# .keys() is needed to not have a dictionary 
length changed during
# iteration error

self.instances[account]['online_dialog'][name].destroy()
-   del 
self.instances[account]['online_dialog'][name]
+   if name in 
self.instances[account]['online_dialog']:
+   # destroy handler may have already 
removed it
+   del 
self.instances[account]['online_dialog'][name]
for request in self.gpg_passphrase.values():
if request:
request.interrupt()
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback when writing in a closed gc control. Fi...

[Yann Leboulanger]

changeset f2f53f360918 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=f2f53f360918
description: prevent traceback when writing in a closed gc control. Fixes #5455

diffstat:

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

diffs (16 lines):

diff -r 832fa903871f -r f2f53f360918 src/htmltextview.py
--- a/src/htmltextview.py   Tue Dec 29 00:01:55 2009 +0100
+++ b/src/htmltextview.py   Mon Nov 30 14:32:59 2009 +0100
@@ -893,8 +893,10 @@
def on_text_buffer_mark_set(self, location, mark, unused_data):
bounds = self.get_buffer().get_selection_bounds()
if bounds:
-   clipboard = 
self.get_clipboard(gtk.gdk.SELECTION_PRIMARY)
-   clipboard.set_text(self.get_selected_text())
+   # textview can be hidden while we add a new line in it.
+   if self.has_screen():
+   clipboard = 
self.get_clipboard(gtk.gdk.SELECTION_PRIMARY)
+   clipboard.set_text(self.get_selected_text())
 
def get_selected_text(self):
bounds = self.get_buffer().get_selection_bounds()
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback when writing in a closed gc control. Fi...

[Yann Leboulanger]

changeset 41a7e43261c0 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=41a7e43261c0
description: prevent traceback when writing in a closed gc control. Fixes #5455

diffstat:

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

diffs (16 lines):

diff -r b9993a87ea04 -r 41a7e43261c0 src/htmltextview.py
--- a/src/htmltextview.py   Mon Nov 30 14:58:43 2009 +0200
+++ b/src/htmltextview.py   Mon Nov 30 14:32:59 2009 +0100
@@ -892,8 +892,10 @@
def on_text_buffer_mark_set(self, location, mark, unused_data):
bounds = self.get_buffer().get_selection_bounds()
if bounds:
-   clipboard = 
self.get_clipboard(gtk.gdk.SELECTION_PRIMARY)
-   clipboard.set_text(self.get_selected_text())
+   # textview can be hidden while we add a new line in it.
+   if self.has_screen():
+   clipboard = 
self.get_clipboard(gtk.gdk.SELECTION_PRIMARY)
+   clipboard.set_text(self.get_selected_text())
 
def get_selected_text(self):
bounds = self.get_buffer().get_selection_bounds()
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback. Fixes #5402

[Yann Leboulanger]

changeset 198f60aaf9e2 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=198f60aaf9e2
description: prevent traceback. Fixes #5402

diffstat:

 src/roster_window.py |  3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diffs (13 lines):

diff -r 61e06febb160 -r 198f60aaf9e2 src/roster_window.py
--- a/src/roster_window.py  Tue Nov 03 22:27:21 2009 +0100
+++ b/src/roster_window.py  Wed Nov 04 20:37:22 2009 +0100
@@ -1234,6 +1234,9 @@
child_path = self.model.get_path(child_iter)
path = 
self.modelfilter.convert_child_path_to_path(child_path)
 
+   if not path:
+   continue
+
if not self.tree.row_expanded(path) and 
icon_name != 'event':
iterC = 
self.model.iter_children(child_iter)
while iterC:
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback when changing resource of a control whe...

[Yann Leboulanger]

changeset 7905d12c7bf0 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=7905d12c7bf0
description: prevent traceback when changing resource of a control when there 
is no event for the account at all. Fixes #5375

diffstat:

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

diffs (12 lines):

diff -r ab1f9ab7cc6c -r 7905d12c7bf0 src/common/events.py
--- a/src/common/events.py  Thu Oct 29 16:46:36 2009 +0100
+++ b/src/common/events.py  Fri Oct 30 09:44:40 2009 +0100
@@ -163,6 +163,8 @@
del self._events[account][jid]
 
def change_jid(self, account, old_jid, new_jid):
+   if account not in self._events:
+   return
if old_jid not in self._events[account]:
return
if new_jid in self._events[account]:
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback in upgrade function

[Yann Leboulanger]

changeset 4ef4f9964cab in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=4ef4f9964cab
description: prevent traceback in upgrade function

diffstat:

 src/common/optparser.py |  4 
 1 files changed, 4 insertions(+), 0 deletions(-)

diffs (21 lines):

diff -r c02ab1f90645 -r 4ef4f9964cab src/common/optparser.py
--- a/src/common/optparser.py   Tue Oct 13 20:27:12 2009 +0200
+++ b/src/common/optparser.py   Tue Oct 13 21:44:14 2009 +0200
@@ -760,6 +760,8 @@
'urlmsgcolor': ['#ff', '#204a87'],
'gc_nicknames_colors': 
['#a34526:#c000ff:#0012ff:#388a99:#045723:#7c7c7c:#ff8a00:#94452d:#244b5a:#32645a',
 
'#4e9a06:#f57900:#ce5c00:#3465a4:#204a87:#75507b:#5c3566:#c17d11:#8f5902:#ef2929:#cc:#a4']}
for c in vals:
+   if c not in self.old_values:
+   continue
val = self.old_values[c]
if val == vals[c][0]:
# We didn't change default value, so update it 
with new default
@@ -770,6 +772,8 @@
vals = {'statusmsgcolor': ['#73d216', '#4e9a06'],
'outmsgtxtcolor': ['#a2a2a2', '#555753']}
for c in vals:
+   if c not in self.old_values:
+   continue
val = self.old_values[c]
if val == vals[c][0]:
# We didn't change default value, so update it 
with new default
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback when enabling Tune. Fixes #5277

[Yann Leboulanger]

changeset da71859f334a in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=da71859f334a
description: prevent traceback when enabling Tune. Fixes #5277

diffstat:

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

diffs (13 lines):

diff -r a2021b65ddac -r da71859f334a src/gajim.py
--- a/src/gajim.py  Fri Sep 18 18:45:08 2009 +0300
+++ b/src/gajim.py  Sun Sep 20 20:19:31 2009 +0200
@@ -3004,8 +3004,8 @@
pass
 
def enable_music_listener(self):
+   listener = MusicTrackListener.get()
if not self.music_track_changed_signal:
-   listener = MusicTrackListener.get()
self.music_track_changed_signal = listener.connect(
'music-track-changed', self.music_track_changed)
track = listener.get_playing_track()
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback when showing a warning before roster is...

[Yann Leboulanger]

changeset 55e1f8723fe8 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=55e1f8723fe8
description: prevent traceback when showing a warning before roster is built

diffstat:

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

diffs (13 lines):

diff -r b69c5f221150 -r 55e1f8723fe8 src/dialogs.py
--- a/src/dialogs.pyFri Aug 28 15:27:25 2009 +0200
+++ b/src/dialogs.pyFri Aug 28 20:42:48 2009 +0200
@@ -1368,7 +1368,8 @@
HigDialog.__init__( self, None,
gtk.MESSAGE_WARNING, 
gtk.BUTTONS_OK, pritext, sectext)
self.set_modal(False)
-   self.set_transient_for(gajim.interface.roster.window)
+   if hasattr(gajim.interface, 'roster'):
+   self.set_transient_for(gajim.interface.roster.window)
self.popup()
 
 class InformationDialog(HigDialog):
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback when changing nick

[Yann Leboulanger]

changeset 1ac938734956 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=1ac938734956
description: prevent traceback when changing nick

diffstat:

 src/common/connection.py |  25 +
 1 files changed, 13 insertions(+), 12 deletions(-)

diffs (35 lines):

diff -r a2b260cb56b4 -r 1ac938734956 src/common/connection.py
--- a/src/common/connection.py  Thu Aug 27 20:09:57 2009 +0200
+++ b/src/common/connection.py  Thu Aug 27 20:15:54 2009 +0200
@@ -1746,18 +1746,19 @@
self.add_lang(p)
if not change_nick:
t = p.setTag(common.xmpp.NS_MUC + ' x')
-   last_date = gajim.logger.get_last_date_that_has_logs(room_jid, 
self.name,
-   is_room=True)
-   if last_date is None:
-   last_date = time.time() - 
gajim.config.get('muc_restore_timeout') * 60
-   else:
-   last_time = min(last_date, time.time() - 
gajim.config.get(
-   'muc_restore_timeout') * 60)
-   last_date = time.strftime('%Y-%m-%dT%H:%M:%SZ', 
time.gmtime(last_date))
-   t.setTag('history', {'maxstanzas': 
gajim.config.get('muc_restore_lines'),
-   'since': last_date})
-   if password:
-   t.setTagData('password', password)
+   last_date = 
gajim.logger.get_last_date_that_has_logs(room_jid,
+   self.name, is_room=True)
+   if last_date is None:
+   last_date = time.time() - gajim.config.get(
+   'muc_restore_timeout') * 60
+   else:
+   last_time = min(last_date, time.time() - 
gajim.config.get(
+   'muc_restore_timeout') * 60)
+   last_date = time.strftime('%Y-%m-%dT%H:%M:%SZ', 
time.gmtime(last_date))
+   t.setTag('history', {'maxstanzas': gajim.config.get(
+   'muc_restore_lines'), 'since': last_date})
+   if password:
+   t.setTagData('password', password)
self.connection.send(p)
 
# last date/time in history to avoid duplicate
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback. Fixes #5202

[Yann Leboulanger]

changeset 622b60b7ac7e in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=622b60b7ac7e
description: prevent traceback. Fixes #5202

diffstat:

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

diffs (12 lines):

diff -r 7f2c28bda0e8 -r 622b60b7ac7e src/common/connection.py
--- a/src/common/connection.py  Thu Aug 06 00:01:07 2009 +0200
+++ b/src/common/connection.py  Thu Aug 06 00:07:23 2009 +0200
@@ -1742,6 +1742,8 @@
self.connection.send(iq)
 
def send_gc_config(self, room_jid, form):
+   if not self.connection:
+   return
iq = common.xmpp.Iq(typ = 'set', to = room_jid, queryNS =\
common.xmpp.NS_MUC_OWNER)
query = iq.getTag('query')
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback. Fixes #5202

[Yann Leboulanger]

changeset 933547e776e2 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=933547e776e2
description: prevent traceback. Fixes #5202

diffstat:

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

diffs (12 lines):

diff -r ae0fc79f426d -r 933547e776e2 src/common/connection.py
--- a/src/common/connection.py  Thu Aug 06 00:01:07 2009 +0200
+++ b/src/common/connection.py  Thu Aug 06 00:07:23 2009 +0200
@@ -1880,6 +1880,8 @@
self.connection.send(iq)
 
def send_gc_config(self, room_jid, form):
+   if not self.connection:
+   return
iq = common.xmpp.Iq(typ = 'set', to = room_jid, queryNS =\
common.xmpp.NS_MUC_OWNER)
query = iq.getTag('query')
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback when a room is destroyed. Fixes #5194

[Yann Leboulanger]

changeset afeef7ec21ab in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=afeef7ec21ab
description: prevent traceback when a room is destroyed. Fixes #5194

diffstat:

 src/common/connection_handlers.py |  13 +++--
 1 files changed, 7 insertions(+), 6 deletions(-)

diffs (23 lines):

diff -r 7e5938fe32c5 -r afeef7ec21ab src/common/connection_handlers.py
--- a/src/common/connection_handlers.py Fri Jul 31 17:11:55 2009 +0200
+++ b/src/common/connection_handlers.py Sat Aug 01 18:28:25 2009 +0200
@@ -2329,12 +2329,13 @@
r = destroy.getTagData('reason')
if r:
reason += ' (%s)' % r
-   try:
-   jid = 
helpers.parse_jid(destroy.getAttr('jid'))
-   except common.helpers.InvalidFormat:
-   pass
-   if jid:
-   reason += '\n' + _('You can 
join this room instead: %s') % jid
+   if destroy.getAttr('jid'):
+   try:
+   jid = 
helpers.parse_jid(destroy.getAttr('jid'))
+   reason += '\n' + _('You 
can join this room instead: %s') \
+   % jid
+   except 
common.helpers.InvalidFormat:
+   pass
statusCode = ['destroyed']
else:
reason = prs.getReason()
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback when we get an empty roster item exchan...

[Yann Leboulanger]

changeset 171fa64bf28e in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=171fa64bf28e
description: prevent traceback when we get an empty roster item exchange message

diffstat:

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

diffs (12 lines):

diff -r b5316b6bf52b -r 171fa64bf28e src/common/connection_handlers.py
--- a/src/common/connection_handlers.py Wed Jul 22 09:49:56 2009 +0200
+++ b/src/common/connection_handlers.py Wed Jul 22 10:48:28 2009 +0200
@@ -1820,6 +1820,8 @@
exchange_items_list = {}
jid_from = helpers.get_full_jid_from_iq(msg)
items_list = msg.getTag('x').getChildren()
+   if not items_list:
+   return
action = items_list[0].getAttr('action')
if action == None:
action = 'add'
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback when we remove contacts in iter_contact...

[Yann Leboulanger]

changeset c08280b346b5 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=c08280b346b5
description: prevent traceback when we remove contacts in iter_contacts() loop.

diffstat:

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

diffs (14 lines):

diff -r d771ec6ea227 -r c08280b346b5 src/common/contacts.py
--- a/src/common/contacts.pyMon Jul 20 20:09:39 2009 +0200
+++ b/src/common/contacts.pyMon Jul 20 23:47:59 2009 +0200
@@ -291,8 +291,8 @@
 
def iter_contacts(self, account):
if account in self._contacts:
-   for jid in self._contacts[account]:
-   for contact in self._contacts[account][jid]:
+   for jid in self._contacts[account].keys():
+   for contact in 
self._contacts[account][jid].keys():
yield contact
 
def get_contact_from_full_jid(self, account, fjid):
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback when trying to open a second search win...

[Yann Leboulanger]

changeset 2fb08580caf7 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=2fb08580caf7
description: prevent traceback when trying to open a second search window. 
Fixes #5073
diffstat:

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

diffs (13 lines):

diff -r 5f8450bdd974 -r 2fb08580caf7 src/disco.py
--- a/src/disco.py  Wed Jun 03 22:45:04 2009 +0200
+++ b/src/disco.py  Thu Jun 04 17:34:38 2009 +0200
@@ -1242,7 +1242,8 @@
return
service = model[iter][0].decode('utf-8')
if service in gajim.interface.instances[self.account]['search']:
-   
gajim.interface.instances[self.account]['search'][service].present()
+   
gajim.interface.instances[self.account]['search'][service].window.\
+   present()
else:

gajim.interface.instances[self.account]['search'][service] = \
search_window.SearchWindow(self.account, 
service)
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback when receiving a disco info while we ar...

[Yann Leboulanger]

changeset ce8ed2a7c080 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=ce8ed2a7c080
description: prevent traceback when receiving a disco info while we are 
disconnected. Fixes #5042
diffstat:

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

diffs (12 lines):

diff -r 6f6c0ac4236de44fdcba710c8a20bdc83258bc86 -r 
ce8ed2a7c080bb4e8310703ca24051a25c02681d src/common/connection_handlers.py
--- a/src/common/connection_handlers.py Wed May 20 10:58:46 2009 +0200
+++ b/src/common/connection_handlers.py Thu May 21 21:12:11 2009 +0200
@@ -829,6 +829,8 @@
 
def _DiscoverInfoCB(self, con, iq_obj):
log.debug('DiscoverInfoCB')
+   if not self.connection or self.connected  2:
+   return
# According to XEP-0030:
# For identity: category, type is mandatory, name is optional.
# For feature: var is mandatory
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback when we receive a presence but we are n...

[Yann Leboulanger]

changeset 427b5a6593f9 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=427b5a6593f9
description: prevent traceback when we receive a presence but we are no more 
connected. Fixes #5028
diffstat:

 src/common/connection_handlers.py |  3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diffs (13 lines):

diff -r 8ae0a55caafe -r 427b5a6593f9 src/common/connection_handlers.py
--- a/src/common/connection_handlers.py Tue May 19 15:27:33 2009 +0200
+++ b/src/common/connection_handlers.py Wed May 20 10:33:19 2009 +0200
@@ -2072,6 +2072,9 @@
if ptype and not ptype in rfc_types:
ptype = None
log.debug('PresenceCB: %s' % ptype)
+   if not self.connection or self.connected  2:
+   log.debug('account is no more connected')
+   return
try:
who = helpers.get_full_jid_from_iq(prs)
except Exception:
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: prevent traceback when notification daemon doesn't suppor...

[Yann Leboulanger]

changeset f36942be7aca in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=f36942be7aca
description: prevent traceback when notification daemon doesn't support 
GetCapabilities. Fixed #5015
diffstat:

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

diffs (12 lines):

diff -r ed03130710de -r f36942be7aca src/notify.py
--- a/src/notify.py Sun May 17 17:59:00 2009 +0200
+++ b/src/notify.py Mon May 18 16:17:14 2009 +0200
@@ -544,6 +544,8 @@
self.attempt_notify()
else:
self.capabilities = self.notif.GetCapabilities()
+   if self.capabilities is None:
+   self.capabilities = ['actions']
self.get_version()
 
def attempt_notify(self):
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits