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: fix import loops

[Yann Leboulanger]

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

details:http://hg.gajim.org/gajim?cmd=changeset;node=4c57cd302a0a
description: fix import loops

diffstat:

 src/common/jingle_ft.py   |   1 -
 src/common/protocol/bytestream.py |  10 --
 2 files changed, 8 insertions(+), 3 deletions(-)

diffs (73 lines):

diff -r 978fcbe254c1 -r 4c57cd302a0a src/common/jingle_ft.py
--- a/src/common/jingle_ft.py   Tue Jun 28 18:31:07 2011 -0400
+++ b/src/common/jingle_ft.py   Sat Jul 02 00:47:33 2011 +0200
@@ -24,7 +24,6 @@
 from jingle_content import contents, JingleContent
 from jingle_transport import JingleTransportICEUDP, JingleTransportSocks5
 from jingle_transport import JingleTransportIBB
-from jingle_session import JingleStates
 from common import helpers
 from common.socks5 import Socks5Receiver
 from common.connection_handlers_events import FileRequestReceivedEvent
diff -r 978fcbe254c1 -r 4c57cd302a0a src/common/protocol/bytestream.py
--- a/src/common/protocol/bytestream.py Tue Jun 28 18:31:07 2011 -0400
+++ b/src/common/protocol/bytestream.py Sat Jul 02 00:47:33 2011 +0200
@@ -37,8 +37,6 @@
 from common import gajim
 from common import helpers
 from common import dataforms
-from common.connection_handlers_events import FileRequestReceivedEvent, \
-FileRequestErrorEvent
 from common import ged
 from common import jingle_xtls
 
@@ -250,6 +248,7 @@
 raise xmpp.NodeProcessed
 
 def _siSetCB(self, con, iq_obj):
+from common.connection_handlers_events import FileRequestReceivedEvent
 gajim.nec.push_incoming_event(FileRequestReceivedEvent(None, conn=self,
 stanza=iq_obj))
 raise xmpp.NodeProcessed
@@ -269,6 +268,7 @@
 return
 jid = self._ft_get_from(iq_obj)
 file_props['error'] = -3
+from common.connection_handlers_events import FileRequestErrorEvent
 gajim.nec.push_incoming_event(FileRequestErrorEvent(None, conn=self,
 jid=jid, file_props=file_props, error_msg=''))
 raise xmpp.NodeProcessed
@@ -302,6 +302,8 @@
 if contact.get_full_jid() == receiver_jid:
 file_props['error'] = -5
 self.remove_transfer(file_props)
+from common.connection_handlers_events import \
+FileRequestErrorEvent
 gajim.nec.push_incoming_event(FileRequestErrorEvent(None,
 conn=self, jid=contact.jid, file_props=file_props,
 error_msg=''))
@@ -364,6 +366,7 @@
 self._result_socks5_sid, file_props['sid'])
 if not listener:
 file_props['error'] = -5
+from common.connection_handlers_events import FileRequestErrorEvent
 gajim.nec.push_incoming_event(FileRequestErrorEvent(None, 
conn=self,
 jid=unicode(receiver), file_props=file_props, error_msg=''))
 self._connect_error(unicode(receiver), file_props['sid'],
@@ -494,6 +497,8 @@
 if file_props is not None:
 self.disconnect_transfer(file_props)
 file_props['error'] = -3
+from common.connection_handlers_events import \
+FileRequestErrorEvent
 gajim.nec.push_incoming_event(FileRequestErrorEvent(None,
 conn=self, jid=to, file_props=file_props, error_msg=msg))
 
@@ -526,6 +531,7 @@
 return
 file_props = self.files_props[id_]
 file_props['error'] = -4
+from common.connection_handlers_events import FileRequestErrorEvent
 gajim.nec.push_incoming_event(FileRequestErrorEvent(None, conn=self,
 jid=jid, file_props=file_props, error_msg=''))
 raise xmpp.NodeProcessed
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: fix error dialog. Fixes #6906

[Yann Leboulanger]

changeset 93a3916f2788 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=93a3916f2788
description: fix error dialog. Fixes #6906

diffstat:

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

diffs (57 lines):

diff -r 4f267c122997 -r 93a3916f2788 src/gui_interface.py
--- a/src/gui_interface.py  Thu Jun 30 08:06:03 2011 +0200
+++ b/src/gui_interface.py  Fri Jul 01 16:08:15 2011 +0200
@@ -2689,7 +2689,8 @@
 Join the room immediately
 """
 
-if gajim.contacts.get_contact(account, room_jid):
+if gajim.contacts.get_contact(account, room_jid) and \
+not gajim.contacts.get_contact(account, room_jid).is_groupchat():
 dialogs.ErrorDialog(_('This is not a group chat'),
 _('%s is not the name of a group chat.') % room_jid)
 return
@@ -2697,11 +2698,17 @@
 if not nick:
 nick = gajim.nicks[account]
 
-if self.msg_win_mgr.has_window(room_jid, account) and \
-gajim.gc_connected[account][room_jid]:
-gc_ctrl = self.msg_win_mgr.get_gc_control(room_jid, account)
-win = gc_ctrl.parent_win
-win.set_active_tab(gc_ctrl)
+minimized_control = gajim.interface.minimized_controls[account].get(
+room_jid, None)
+
+if (self.msg_win_mgr.has_window(room_jid, account) or \
+minimized_control) and gajim.gc_connected[account][room_jid]:
+if self.msg_win_mgr.has_window(room_jid, account):
+gc_ctrl = self.msg_win_mgr.get_gc_control(room_jid, account)
+win = gc_ctrl.parent_win
+win.set_active_tab(gc_ctrl)
+else:
+self.roster.on_groupchat_maximized(None, room_jid, account)
 dialogs.ErrorDialog(_('You are already in group chat %s') % \
 room_jid)
 return
@@ -2712,9 +2719,6 @@
 _('You cannot join a group chat while you are invisible'))
 return
 
-minimized_control = gajim.interface.minimized_controls[account].get(
-room_jid, None)
-
 if minimized_control is None and not self.msg_win_mgr.has_window(
 room_jid, account):
 # Join new groupchat
@@ -2734,10 +2738,6 @@
 gc_control = self.msg_win_mgr.get_gc_control(room_jid, account)
 gc_control.nick = nick
 gc_control.parent_win.set_active_tab(gc_control)
-else:
-# We are already in this groupchat and it is minimized
-minimized_control.nick = nick
-self.roster.add_groupchat(room_jid, account)
 
 # Connect
 gajim.connections[account].join_gc(nick, room_jid, password)
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: fix error dialog. Fixes #6906

[Yann Leboulanger]

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

details:http://hg.gajim.org/gajim?cmd=changeset;node=2b6d2460a2b6
description: fix error dialog. Fixes #6906

diffstat:

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

diffs (57 lines):

diff -r 5b0d36675b14 -r 2b6d2460a2b6 src/gui_interface.py
--- a/src/gui_interface.py  Sun Jun 26 00:28:42 2011 +0400
+++ b/src/gui_interface.py  Fri Jul 01 16:08:15 2011 +0200
@@ -1925,7 +1925,8 @@
 Join the room immediately
 """
 
-if gajim.contacts.get_contact(account, room_jid):
+if gajim.contacts.get_contact(account, room_jid) and \
+not gajim.contacts.get_contact(account, room_jid).is_groupchat():
 dialogs.ErrorDialog(_('This is not a group chat'),
 _('%s is not the name of a group chat.') % room_jid)
 return
@@ -1933,11 +1934,17 @@
 if not nick:
 nick = gajim.nicks[account]
 
-if self.msg_win_mgr.has_window(room_jid, account) and \
-gajim.gc_connected[account][room_jid]:
-gc_ctrl = self.msg_win_mgr.get_gc_control(room_jid, account)
-win = gc_ctrl.parent_win
-win.set_active_tab(gc_ctrl)
+minimized_control = gajim.interface.minimized_controls[account].get(
+room_jid, None)
+
+if (self.msg_win_mgr.has_window(room_jid, account) or \
+minimized_control) and gajim.gc_connected[account][room_jid]:
+if self.msg_win_mgr.has_window(room_jid, account):
+gc_ctrl = self.msg_win_mgr.get_gc_control(room_jid, account)
+win = gc_ctrl.parent_win
+win.set_active_tab(gc_ctrl)
+else:
+self.roster.on_groupchat_maximized(None, room_jid, account)
 dialogs.ErrorDialog(_('You are already in group chat %s') % \
 room_jid)
 return
@@ -1948,9 +1955,6 @@
 _('You cannot join a group chat while you are invisible'))
 return
 
-minimized_control = gajim.interface.minimized_controls[account].get(
-room_jid, None)
-
 if minimized_control is None and not self.msg_win_mgr.has_window(
 room_jid, account):
 # Join new groupchat
@@ -1970,10 +1974,6 @@
 gc_control = self.msg_win_mgr.get_gc_control(room_jid, account)
 gc_control.nick = nick
 gc_control.parent_win.set_active_tab(gc_control)
-else:
-# We are already in this groupchat and it is minimized
-minimized_control.nick = nick
-self.roster.add_groupchat(room_jid, account)
 
 # Connect
 gajim.connections[account].join_gc(nick, room_jid, password)
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits