diff options
| author | hristoterezov <hristo@jitsi.org> | 2013-12-11 10:58:57 +0200 |
|---|---|---|
| committer | hristoterezov <hristo@jitsi.org> | 2013-12-11 10:58:57 +0200 |
| commit | c42404dc832eee275113d3032790c83f81ab2c85 (patch) | |
| tree | dfc88f8845f5e8304e08c0905ffdb34ee2acf88c /src/net/java/sip/communicator/impl | |
| parent | f320157c7b37552a8910783d17199079ae5397aa (diff) | |
| download | jitsi-c42404dc832eee275113d3032790c83f81ab2c85.zip jitsi-c42404dc832eee275113d3032790c83f81ab2c85.tar.gz jitsi-c42404dc832eee275113d3032790c83f81ab2c85.tar.bz2 | |
Changes the chat room error messages to show in popup notifications
instead of dialogs.
Diffstat (limited to 'src/net/java/sip/communicator/impl')
| -rw-r--r-- | src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatManager.java | 26 | ||||
| -rw-r--r-- | src/net/java/sip/communicator/impl/muc/MUCServiceImpl.java | 2 |
2 files changed, 12 insertions, 16 deletions
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatManager.java b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatManager.java index 92e08de..744d978 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatManager.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatManager.java @@ -412,14 +412,12 @@ public class ConferenceChatManager else if (evt.getEventType().equals(
LocalUserAdHocChatRoomPresenceChangeEvent.LOCAL_USER_JOIN_FAILED))
{
- new ErrorDialog(
- GuiActivator.getUIService().getMainFrame(),
- GuiActivator.getResources().getI18NString("service.gui.ERROR"),
+ GuiActivator.getAlertUIService().showAlertPopup(
+ GuiActivator.getResources().getI18NString("service.gui.ERROR"),
GuiActivator.getResources().getI18NString(
- "service.gui.FAILED_TO_JOIN_CHAT_ROOM",
- new String[]{sourceAdHocChatRoom.getName()})
- + evt.getReason())
- .showDialog();
+ "service.gui.FAILED_TO_JOIN_CHAT_ROOM",
+ new String[]{sourceAdHocChatRoom.getName()})
+ + evt.getReason());
}
else if (LocalUserAdHocChatRoomPresenceChangeEvent
.LOCAL_USER_LEFT.equals(eventType)
@@ -510,13 +508,12 @@ public class ConferenceChatManager else if (LocalUserChatRoomPresenceChangeEvent
.LOCAL_USER_JOIN_FAILED.equals(eventType))
{
- new ErrorDialog(
- GuiActivator.getUIService().getMainFrame(),
- GuiActivator.getResources().getI18NString("service.gui.ERROR"),
+ GuiActivator.getAlertUIService().showAlertPopup(
+ GuiActivator.getResources().getI18NString("service.gui.ERROR"),
GuiActivator.getResources().getI18NString(
"service.gui.FAILED_TO_JOIN_CHAT_ROOM",
- new String[]{sourceChatRoom.getName()}) + evt.getReason())
- .showDialog();
+ new String[]{sourceChatRoom.getName()})
+ + evt.getReason());
}
else if (LocalUserChatRoomPresenceChangeEvent
.LOCAL_USER_LEFT.equals(eventType)
@@ -1053,10 +1050,9 @@ public class ConferenceChatManager if (!SUCCESS.equals(returnCode)
&& !AUTHENTICATION_FAILED.equals(returnCode))
{
- new ErrorDialog(
- GuiActivator.getUIService().getMainFrame(),
+ GuiActivator.getAlertUIService().showAlertPopup(
GuiActivator.getResources().getI18NString(
- "service.gui.ERROR"), errorMessage).showDialog();
+ "service.gui.ERROR"), errorMessage);
}
}
}
diff --git a/src/net/java/sip/communicator/impl/muc/MUCServiceImpl.java b/src/net/java/sip/communicator/impl/muc/MUCServiceImpl.java index e05842c..0dc9b5b 100644 --- a/src/net/java/sip/communicator/impl/muc/MUCServiceImpl.java +++ b/src/net/java/sip/communicator/impl/muc/MUCServiceImpl.java @@ -794,7 +794,7 @@ public class MUCServiceImpl if (!SUCCESS.equals(returnCode) &&
!AUTHENTICATION_FAILED.equals(returnCode))
{
- MUCActivator.getAlertUIService().showAlertDialog(
+ MUCActivator.getAlertUIService().showAlertPopup(
resources.getI18NString("service.gui.ERROR"), errorMessage);
}
|