diff src/protocols/jabber/pproxy.c @ 3127:4e7cefc55971

[gaim-migrate @ 3142] Upgraded jabber to most recent stable version committer: Tailor Script <[e-mail]>

--- a/src/protocols/jabber/pproxy.c	Thu Apr 04 00:59:12 2002 +0000
+++ b/src/protocols/jabber/pproxy.c	Thu Apr 04 03:04:57 2002 +0000
@@ -1,23 +1,45 @@
-/*
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+/* --------------------------------------------------------------------------
+ *
+ * License
+ *
+ * The contents of this file are subject to the Jabber Open Source License
+ * Version 1.0 (the "JOSL").  You may not copy or use this file, in either
+ * source code or executable form, except in compliance with the JOSL. You
+ * may obtain a copy of the JOSL at http://www.jabber.org/ or at
+ * http://www.opensource.org/.  
+ *
+ * Software distributed under the JOSL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied.  See the JOSL
+ * for the specific language governing rights and limitations under the
+ * JOSL.
+ *
+ * Copyrights
+ * 
+ * Portions created by or assigned to Jabber.com, Inc. are 
+ * Copyright (c) 1999-2002 Jabber.com, Inc.  All Rights Reserved.  Contact
+ * information for Jabber.com, Inc. is available at http://www.jabber.com/.
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- *  Jabber
- *  Copyright (C) 1998-1999 The Jabber Team http://jabber.org/
- */
+ * Portions Copyright (c) 1998-1999 Jeremie Miller.
+ * 
+ * Acknowledgements
+ * 
+ * Special thanks to the Jabber Open Source Contributors for their
+ * suggestions and support of Jabber.
+ * 
+ * Alternatively, the contents of this file may be used under the terms of the
+ * GNU General Public License Version 2 or later (the "GPL"), in which case
+ * the provisions of the GPL are applicable instead of those above.  If you
+ * wish to allow use of your version of this file only under the terms of the
+ * GPL and not to allow others to use your version of this file under the JOSL,
+ * indicate your decision by deleting the provisions above and replace them
+ * with the notice and other provisions required by the GPL.  If you do not
+ * delete the provisions above, a recipient may use your version of this file
+ * under either the JOSL or the GPL. 
+ * 
+ * 
+ * --------------------------------------------------------------------------*/
 
-#include "jabber.h"
+#include "lib.h"
 
 /* these aren't the most efficient things in the world, a hash optimized for tiny spaces would be far better */
 
@@ -49,7 +71,6 @@
 
 ppdb ppdb_insert(ppdb db, jid id, xmlnode x)
 {
-    char *res;
     ppdb cur, curu;
     pool p;
 
@@ -60,7 +81,7 @@
     if(db == NULL)
     {
         p = pool_heap(1024);
-        db = _ppdb_new(p,id);
+        db = _ppdb_new(p,NULL);
     }
 
     cur = _ppdb_get(db,id);
@@ -81,25 +102,17 @@
     cur->next = db->next;
     db->next = cur;
 
-    /* this is a presence from a resource, make an entry for just the user */
-    if(id->user != NULL && id->resource != NULL)
+    /* if this is a user's resource presence, get the the user entry */
+    if(id->user != NULL && (curu = _ppdb_get(db,jid_user(id))) != cur)
     {
-        /* modify the id to just user@host */
-        res = id->resource;
-        jid_set(id,NULL,JID_RESOURCE);
-        curu = _ppdb_get(db,id);
-
         /* no user entry, make one */
         if(curu == NULL)
         {
-            curu = _ppdb_new(db->p,id);
+            curu = _ppdb_new(db->p,jid_user(id));
             curu->next = db->next;
             db->next = curu;
         }
 
-        /* restore the id */
-        jid_set(id,res,JID_RESOURCE);
-
         /* insert this resource into the user list */
         cur->user = curu->user;
         curu->user = cur;