diff options
| author | Nikos Kouremenos <kourem@gmail.com> | 2006-10-08 16:07:33 +0400 |
|---|---|---|
| committer | Nikos Kouremenos <kourem@gmail.com> | 2006-10-08 16:07:33 +0400 |
| commit | 8d74950f421759cf335b03381668d9795ae22096 (patch) | |
| tree | c9f95633cfddc1ef2670995386edb67356a1f4bf /src | |
| parent | 54265a93bd8e966889d1e4e939965a0dbdfc10cc (diff) | |
use GajimGeneralException instead of RuntimeError everywhere we meant to use that
Diffstat (limited to 'src')
| -rw-r--r-- | src/conversation_textview.py | 6 | ||||
| -rw-r--r-- | src/dialogs.py | 2 | ||||
| -rw-r--r-- | src/disco.py | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/conversation_textview.py b/src/conversation_textview.py index eb55ac4c8..c1bc80249 100644 --- a/src/conversation_textview.py +++ b/src/conversation_textview.py @@ -31,7 +31,7 @@ from calendar import timegm from common.fuzzyclock import FuzzyClock from htmltextview import HtmlTextView - +from common.exceptions import GajimGeneralException as GajimGeneralException class ConversationTextview: '''Class for the conversation textview (where user reads already said messages) @@ -443,7 +443,7 @@ class ConversationTextview: gajim.interface.roster.new_chat_from_jid(self.account, jid) def on_join_group_chat_menuitem_activate(self, widget, room_jid): - if gajim.interface.instances[self.account].has_key('join_gc'): + if 'join_gc' in gajim.interface.instances[self.account]: instance = gajim.interface.instances[self.account]['join_gc'] instance.xml.get_widget('room_jid_entry').set_text(room_jid) gajim.interface.instances[self.account]['join_gc'].window.present() @@ -451,7 +451,7 @@ class ConversationTextview: try: gajim.interface.instances[self.account]['join_gc'] = \ dialogs.JoinGroupchatWindow(self.account, room_jid) - except RuntimeError: + except GajimGeneralException: pass def on_add_to_roster_activate(self, widget, jid): diff --git a/src/dialogs.py b/src/dialogs.py index de826764c..eae459362 100644 --- a/src/dialogs.py +++ b/src/dialogs.py @@ -2176,7 +2176,7 @@ class InvitationReceivedDialog: self.dialog.destroy() try: JoinGroupchatWindow(self.account, self.room_jid) - except RuntimeError: + except GajimGeneralException: pass class ProgressDialog: diff --git a/src/disco.py b/src/disco.py index 1354a11ac..4dd082a5b 100644 --- a/src/disco.py +++ b/src/disco.py @@ -1532,7 +1532,7 @@ class MucBrowser(AgentBrowser): try: room_jid = '%s@%s' % (service, room) dialogs.JoinGroupchatWindow(self.account, service) - except RuntimeError: + except GajimGeneralException: pass else: gajim.interface.instances[self.account]['join_gc'].window.present() |