Arg. IntelliJ undid my changes to OSCARSession for some reason... Fixed for 1.0 Beta 6a release.

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@6436 b35dd754-fafc-0310-a699-88a17e54d16e

src/plugins/gateway/changelog.html

@@ -167,6 +167,13 @@ hr {
 </ul>
 
 
+<h2>1.0 Beta 6a -- <span style="font-weight: normal;">December 18, 2006</span></h2>
+
+<b>Bug Fixes</b>
+<ul>
+<li>Restored OSCAR work that IntelliJ undid for some reason.</li>
+</ul>
+
 <h2>1.0 Beta 6 -- <span style="font-weight: normal;">December 18, 2006</span></h2>
 
 <b>Bug Fixes</b>

src/plugins/gateway/plugin.xml

@@ -8,7 +8,7 @@
     <name>IM Gateway</name>
     <description>Provides gateway connectivity to the other public instant messaging networks</description>
     <author>Daniel Henninger</author>
-    <version>1.0 Beta 6</version>
+    <version>1.0 Beta 6a</version>
     <date>12/18/2006</date>
     <minServerVersion>3.1.1</minServerVersion>
     <databaseKey>gateway</databaseKey>

src/plugins/gateway/src/java/org/jivesoftware/wildfire/gateway/protocols/oscar/OSCARSession.java

@@ -66,7 +66,6 @@ public class OSCARSession extends TransportSession {
         super(registration, jid, transport, priority);
         this.propertyPrefix = "plugin.gateway."+transport.getType().toString();
         OscarTools.setDefaultCharset(JiveGlobals.getProperty(this.propertyPrefix+".encoding", "ISO8859-1"));
-        groups.put(0, null); // Main group
         highestBuddyIdPerGroup.put(0, 0); // Main group highest id
     }
 
@@ -465,11 +464,10 @@ public class OSCARSession extends TransportSession {
             
             int groupid = buddy.getGroupId();
             String groupname = null;
-            if (groups.containsKey(groupid) && groups.get(groupid) != null) {
+            if (groupid != 0 && groups.containsKey(groupid)) {
                 String newgroupname = groups.get(groupid).getGroupName();
-                if (groupname.length() > 0) {
+                if (newgroupname.length() > 0) {
                     groupname = newgroupname;
-                    groupname = "Transport Buddies";
                 }
             }