diff options
| author | slewis | 2006-05-26 20:16:14 +0000 |
|---|---|---|
| committer | slewis | 2006-05-26 20:16:14 +0000 |
| commit | e9eedf6b11dc023a2255dc1de3eaa05a2e571fe8 (patch) | |
| tree | c1c3cf9f0c0f731250c4614f967ee895c1e4e394 /providers/bundles | |
| parent | 468681721067f4c8b5bcca77fce750606b5581ee (diff) | |
| download | org.eclipse.ecf-e9eedf6b11dc023a2255dc1de3eaa05a2e571fe8.tar.gz org.eclipse.ecf-e9eedf6b11dc023a2255dc1de3eaa05a2e571fe8.tar.xz org.eclipse.ecf-e9eedf6b11dc023a2255dc1de3eaa05a2e571fe8.zip | |
Update to 0.8.3. Added Eclipse-AutoStart to manifests to allow 3.1.2 Eclipse version. Generated javadocs for 0.8.3
Diffstat (limited to 'providers/bundles')
3 files changed, 7 insertions, 5 deletions
diff --git a/providers/bundles/org.eclipse.ecf.provider.jmdns/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.jmdns/META-INF/MANIFEST.MF index 0c943a406..8716b8a24 100644 --- a/providers/bundles/org.eclipse.ecf.provider.jmdns/META-INF/MANIFEST.MF +++ b/providers/bundles/org.eclipse.ecf.provider.jmdns/META-INF/MANIFEST.MF @@ -2,10 +2,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ECF Zeroconf Discovery Provider Bundle-SymbolicName: org.eclipse.ecf.provider.jmdns;singleton:=true -Bundle-Version: 0.8.2 +Bundle-Version: 0.8.3 Bundle-Activator: org.eclipse.ecf.provider.jmdns.JmdnsPlugin Bundle-Vendor: Eclipse.org Bundle-Localization: plugin +Eclipse-AutoStart: true Require-Bundle: org.eclipse.core.runtime, org.eclipse.ecf, org.eclipse.ecf.discovery diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.xmpp/META-INF/MANIFEST.MF index e24f106de..65776a3e7 100644 --- a/providers/bundles/org.eclipse.ecf.provider.xmpp/META-INF/MANIFEST.MF +++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-Name: ECF XMPP Provider Bundle-SymbolicName: org.eclipse.ecf.provider.xmpp;singleton=true -Bundle-Version: 0.8.2 +Bundle-Version: 0.8.3 Bundle-ClassPath: xmpp.jar Bundle-Activator: org.eclipse.ecf.provider.xmpp.XmppPlugin Bundle-Vendor: Eclipse.org diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPClientSOContainer.java b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPClientSOContainer.java index 3382b6ad0..3d160858c 100644 --- a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPClientSOContainer.java +++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPClientSOContainer.java @@ -691,10 +691,11 @@ public class XMPPClientSOContainer extends ClientSOContainer { } protected IRoomInfo getChatRoomInfo(String roomname) { try { - RoomInfo info = MultiUserChat.getRoomInfo(sharedObject.getConnection(),roomname); + // Create roomid + XMPPRoomID roomID = new XMPPRoomID(getConnectNamespace(),sharedObject.getConnection(),roomname); + String mucName = roomID.getMucString(); + RoomInfo info = MultiUserChat.getRoomInfo(sharedObject.getConnection(),mucName); if (info != null) { - // Create roomid - XMPPRoomID roomID = new XMPPRoomID(getConnectNamespace(),sharedObject.getConnection(),roomname); return new ECFRoomInfo(roomID,info,getConnectedID()); } } catch (Exception e) { |