Index: xmpp_api.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/xmppframework/contrib/xmpp_api/xmpp_api.module,v
retrieving revision 1.1.2.2
diff -u -p -r1.1.2.2 xmpp_api.module
--- xmpp_api.module	7 Nov 2008 14:17:14 -0000	1.1.2.2
+++ xmpp_api.module	17 Dec 2008 20:28:54 -0000
@@ -558,10 +558,21 @@ function _xmpp_api_build_conn($jid = NUL
   else {
     // no username or password received so use the global user
     global $user;
-    $username = $user->xmppclient['user_name'];
-    $password = __xmppclient_password($user->xmppclient['password'], TRUE);
-    $server = $user->xmppclient['server'];
-    $resource = $user->xmppclient['resource'];
+    $user = user_load($user->uid);
+    if (module_exists('xmpp_user')) {
+      $jid = variable_get('xmpp_user_jid', '');
+      $username = xmpp_user_parse_jid($jid, TRUE);
+      $password = variable_get('xmpp_user_password', '');
+      $server = xmpp_user_parse_jid($jid);
+      $resource = '1';
+    }
+    else {
+      // Fall back to the xmppclient module if xmpp_user isn't enabled
+      $username = $user->xmppclient['user_name'];
+      $password = __xmppclient_password($user->xmppclient['password'], TRUE);
+      $server = $user->xmppclient['server'];
+      $resource = $user->xmppclient['resource'];
+    }
   }
   $conn = new XMPPHP_XMPP(XMPP_API_SERVER, XMPP_API_PORT, $username, $password, $resource, $server, $printlog=false, $loglevel=XMPPHP_Log::LEVEL_VERBOSE);
   $conn->autoSubscribe();