[GATE-38] Emergency update to dodge wiping of buddy list.

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

src/plugins/gateway/changelog.html

@@ -44,6 +44,12 @@
 IM Gateway Changelog
 </h1>
 
+<p><b>1.0 Beta 1a<</b> -- September 18, 2006</p>
+
+<ul>
+    <li>Emergency bugfix for beta 1 to fix partial wipe of AIM/ICQ contact list.</li>
+</ul>
+
 <p><b>1.0 Beta 1</b> -- September 18, 2006</p>
 
 <ul>

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 1</version>
+    <version>1.0 Beta 1a</version>
     <date>09/18/2006</date>
     <minServerVersion>3.1.0</minServerVersion>
     <databaseKey>gateway</databaseKey>

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

@@ -166,15 +166,15 @@ public class OSCARSession extends TransportSession {
             if (buddy.getScreenname().equalsIgnoreCase(contact)) {
                 if (buddy.getGroupId() == 0) {
                     // Ok this group is the "main group", which we can cheerfully remove from.
-                    Log.debug("Removing "+buddy+" because of in main group");
-                    request(new DeleteItemsCmd(buddy.toSsiItem()));
-                    buddies.remove(""+buddy.getGroupId()+"."+buddy.getId());
+//                    Log.debug("Removing "+buddy+" because of in main group");
+//                    request(new DeleteItemsCmd(buddy.toSsiItem()));
+//                    buddies.remove(""+buddy.getGroupId()+"."+buddy.getId());
                 }
                 else if (!groups.containsKey(buddy.getGroupId())) {
                     // Well this is odd, a group we don't know about?  Nuke it.
-                    Log.debug("Removing "+buddy+" because of unknown group");
-                    request(new DeleteItemsCmd(buddy.toSsiItem()));
-                    buddies.remove(""+buddy.getGroupId()+"."+buddy.getId());
+//                    Log.debug("Removing "+buddy+" because of unknown group");
+//                    request(new DeleteItemsCmd(buddy.toSsiItem()));
+//                    buddies.remove(""+buddy.getGroupId()+"."+buddy.getId());
                 }
                 else if (!grouplist.contains(groups.get(buddy.getGroupId()).getGroupName())) {
                     Log.debug("Removing "+buddy+" because not in list of groups");