diff options
| author | Damian Minkov <damencho@jitsi.org> | 2013-12-20 16:31:22 +0200 |
|---|---|---|
| committer | Damian Minkov <damencho@jitsi.org> | 2014-01-07 11:50:01 +0200 |
| commit | 051e3f817a2ca9026d65ee3f6b608de08ca52b34 (patch) | |
| tree | 77801b499e0b53ccfd08de8d7356f056154a69eb /src/net/java/sip/communicator/impl/muc | |
| parent | cbd25f3a73bc200831d248607df50ca3c2f74ff9 (diff) | |
| download | jitsi-051e3f817a2ca9026d65ee3f6b608de08ca52b34.zip jitsi-051e3f817a2ca9026d65ee3f6b608de08ca52b34.tar.gz jitsi-051e3f817a2ca9026d65ee3f6b608de08ca52b34.tar.bz2 | |
Removes MUCService dependence from desktoputil plugin.
Diffstat (limited to 'src/net/java/sip/communicator/impl/muc')
| -rw-r--r-- | src/net/java/sip/communicator/impl/muc/MUCCustomContactActionService.java | 15 | ||||
| -rw-r--r-- | src/net/java/sip/communicator/impl/muc/MUCServiceImpl.java | 4 |
2 files changed, 15 insertions, 4 deletions
diff --git a/src/net/java/sip/communicator/impl/muc/MUCCustomContactActionService.java b/src/net/java/sip/communicator/impl/muc/MUCCustomContactActionService.java index 2498654..3ce9190 100644 --- a/src/net/java/sip/communicator/impl/muc/MUCCustomContactActionService.java +++ b/src/net/java/sip/communicator/impl/muc/MUCCustomContactActionService.java @@ -185,7 +185,10 @@ public class MUCCustomContactActionService joinOptions = ChatRoomJoinOptionsDialog.getJoinOptions(
chatRoomWrapper.getParentProvider()
.getProtocolProvider(),
- chatRoomWrapper.getChatRoomID());
+ chatRoomWrapper.getChatRoomID(),
+ MUCActivator.getMUCService().getDefaultNickname(
+ chatRoomWrapper.getParentProvider()
+ .getProtocolProvider()));
nickName = joinOptions[0];
subject = joinOptions[1];
}
@@ -204,7 +207,10 @@ public class MUCCustomContactActionService String[] joinOptions;
joinOptions = ChatRoomJoinOptionsDialog.getJoinOptions(
chatRoomWrapper.getParentProvider().getProtocolProvider(),
- chatRoomWrapper.getChatRoomID());
+ chatRoomWrapper.getChatRoomID(),
+ MUCActivator.getMUCService().getDefaultNickname(
+ chatRoomWrapper.getParentProvider()
+ .getProtocolProvider()));
if(joinOptions[0] == null)
return;
MUCActivator.getMUCService()
@@ -244,7 +250,10 @@ public class MUCCustomContactActionService {
ChatRoomJoinOptionsDialog.getJoinOptions(true,
chatRoomWrapper.getParentProvider().getProtocolProvider(),
- chatRoomWrapper.getChatRoomID());
+ chatRoomWrapper.getChatRoomID(),
+ MUCActivator.getMUCService().getDefaultNickname(
+ chatRoomWrapper.getParentProvider()
+ .getProtocolProvider()));
}
},
autoJoinRunnable,
diff --git a/src/net/java/sip/communicator/impl/muc/MUCServiceImpl.java b/src/net/java/sip/communicator/impl/muc/MUCServiceImpl.java index 0dc9b5b..7b01948 100644 --- a/src/net/java/sip/communicator/impl/muc/MUCServiceImpl.java +++ b/src/net/java/sip/communicator/impl/muc/MUCServiceImpl.java @@ -1012,7 +1012,9 @@ public class MUCServiceImpl {
String[] joinOptions = ChatRoomJoinOptionsDialog.getJoinOptions(
room.getParentProvider().getProtocolProvider(),
- room.getChatRoomID());
+ room.getChatRoomID(),
+ getDefaultNickname(
+ room.getParentProvider().getProtocolProvider()));
savedNick = joinOptions[0];
subject = joinOptions[1];
|