Index: contrib/xmpp_xmlrpc/xmpp_xmlrpc.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/xmppframework/contrib/xmpp_xmlrpc/xmpp_xmlrpc.module,v
retrieving revision 1.1
diff -u -r1.1 xmpp_xmlrpc.module
--- contrib/xmpp_xmlrpc/xmpp_xmlrpc.module	2 Oct 2008 20:57:52 -0000	1.1
+++ contrib/xmpp_xmlrpc/xmpp_xmlrpc.module	29 Oct 2008 19:48:26 -0000
@@ -137,13 +137,7 @@
  *      Subject of the message
  */
 function xmpp_xmlrpc_send_message($to, $type = 'chat', $body = null, $subject = null) {
-  $url = xmpp_xmlrpc_url();
-  $result = xmlrpc($url, 'send_message', array('from' => $to, 'to' => $to, 'subject' => $subject, 'body' => $body));
-  if ($result === FALSE) {
-    watchdog('xmpp_xmlrpc', 'Errno: '. xmlrpc_errno() .' Message: '. xmlrpc_error_msg(), WATCHDOG_ERROR);
-    return false;
-  }
-  return true;
+  return _xmpp_xmlrpc('send_message', array('from' => $to, 'to' => $to, 'subject' => $subject, 'body' => $body));
 }
 
 /**
@@ -157,13 +151,7 @@
  *      User Password
  */
 function xmpp_xmlrpc_delete_account($name, $host, $password) {
-  $url = xmpp_xmlrpc_url();
-  $result = xmlrpc($url, 'delete_account', array('user' => $user->name, 'host' => $host, 'password' => $password));
-  if ($result === FALSE) {
-    watchdog('xmpp_xmlrpc', 'Errno: '. xmlrpc_errno() .' Message: '. xmlrpc_error_msg(), WATCHDOG_ERROR);
-    return false;
-  }
-  return true;
+  return _xmpp_xmlrpc('delete_account', array('user' => $user->name, 'host' => $host, 'password' => $password));
 }
 
 /**
@@ -180,18 +168,13 @@
  */
 function xmpp_xmlrpc_create_muc($name, $service, $server, $title) {
   $url = xmpp_xmlrpc_url();
-  $result = xmlrpc($url, 'create_muc_room', array('name' => $name, 'service' => $service, 'server' => $server));
+  $result = _xmpp_xmlrpc('create_muc_room', array('name' => $name, 'service' => $service, 'server' => $server));
   if ($result === FALSE) {
-    watchdog('xmpp_xmlrpc', 'Errno: '. xmlrpc_errno() .' Message: '. xmlrpc_error_msg(), WATCHDOG_ERROR);
     return false;
   }
   // change the title i.e. the description for the room
-  $result = xmlrpc($url, 'muc_room_change_option', array('name' => $name, 'service' => $service, 'option' => 'title', 'value' => $title));
-  if ($result === FALSE) {
-    watchdog('xmpp_xmlrpc', 'Errno: '. xmlrpc_errno() .' Message: '. xmlrpc_error_msg(), WATCHDOG_ERROR);
-    return false;
-  }
-  return true;
+  return _xmpp_xmlrpc('muc_room_change_option', array('name' => $name, 'service' => $service, 'option' => 'title', 'value' => $title));
+
 }
 
 /**
@@ -207,14 +190,8 @@
  *      The description name for the room
  */
 function xmpp_xmlrpc_configure_muc($name, $service, $server, $title) {
-  $url = xmpp_xmlrpc_url();
   // change the title i.e. the description for the room
-  $result = xmlrpc($url, 'muc_room_change_option', array('name' => $name, 'service' => $service, 'option' => 'title', 'value' => $title));
-  if ($result === FALSE) {
-    watchdog('xmpp_xmlrpc', 'Errno: '. xmlrpc_errno() .' Message: '. xmlrpc_error_msg(), WATCHDOG_ERROR);
-    return false;
-  }
-  return true;
+  return _xmpp_xmlrpc('muc_room_change_option', array('name' => $name, 'service' => $service, 'option' => 'title', 'value' => $title));
 }
 
 /**
@@ -228,13 +205,7 @@
  *      The server the muc will be created on
  */
 function xmpp_xmlrpc_delete_muc($name, $service, $server) {
-  $url = xmpp_xmlrpc_url();
-  $result = xmlrpc($url, 'delete_muc_room', array('name' => $name, 'service' => $service, 'server' => $server));
-  if ($result === FALSE) {
-    watchdog('xmpp_node_muc', 'Errno: '. xmlrpc_errno() .' Message: '. xmlrpc_error_msg(), WATCHDOG_ERROR);
-    return false;
-  }
-  return true;
+  return _xmpp_xmlrpc('delete_muc_room', array('name' => $name, 'service' => $service, 'server' => $server));
 }
 
 /**
@@ -256,13 +227,7 @@
  *      Subscription i.e. both, to, from, none
  */
 function xmpp_xmlrpc_add_rosteritem($uname, $userver, $cname, $cserver, $nick, $group, $subscription) {
-  $url = xmpp_xmlrpc_url();
-  $result = xmlrpc($url, 'add_rosteritem', array('localuser' => $uname, 'localserver' => $userver, 'user' => $cname, 'server' => $cserver, 'nick' => $nick, 'group' => $group, 'subs' => $subscription));
-  if ($result === FALSE) {
-    watchdog('xmpp_xmlrpc', 'Errno: '. xmlrpc_errno() .' Message: '. xmlrpc_error_msg(), WATCHDOG_ERROR);
-    return false;
-  }
-  return true;
+  return _xmpp_xmlrpc('add_rosteritem', array('localuser' => $uname, 'localserver' => $userver, 'user' => $cname, 'server' => $cserver, 'nick' => $nick, 'group' => $group, 'subs' => $subscription));
 }
 
 /**
@@ -278,13 +243,7 @@
  *      Contact server
  */
 function xmpp_xmlrpc_delete_rosteritem($uname, $userver, $cname, $cserver) {
-  $url = xmpp_xmlrpc_url();
-  $result = xmlrpc($url, 'delete_rosteritem', array('localuser' => $uname, 'localserver' => $userver, 'user' => $cname, 'server' => $cserver));
-  if ($result === FALSE) {
-    watchdog('xmpp_xmlrpc', 'Errno: '. xmlrpc_errno() .' Message: '. xmlrpc_error_msg(), WATCHDOG_ERROR);
-    return false;
-  }
-  return true;
+  return _xmpp_xmlrpc('delete_rosteritem', array('localuser' => $uname, 'localserver' => $userver, 'user' => $cname, 'server' => $cserver));
 }
 
 /**
@@ -297,10 +256,9 @@
   if (!$user) {
     global $user;
   }
-  $url = xmpp_xmlrpc_url();
-  $result = xmlrpc($url, 'get_roster', array('user' => $user->xmppclient['user_name'], 'server' => $user->xmppclient['server']));
+
+  $result = _xmpp_xmlrpc('get_roster', array('user' => $user->xmppclient['user_name'], 'server' => $user->xmppclient['server']));
   if ($result === FALSE) {
-    watchdog('xmpp_xmlrpc', 'Errno: '. xmlrpc_errno() .' Message: '. xmlrpc_error_msg(), WATCHDOG_ERROR);
     return false;
   }
   // parse the information and return as an array
@@ -332,13 +290,7 @@
     global $user;
   }
 
-  $url = xmpp_xmlrpc_url();
-  $result = xmlrpc($url, 'num_resources', array('user' => $user->xmppclient['user_name'], 'host' => $user->xmppclient['server']));
-  if ($result === FALSE) {
-    watchdog('xmpp_xmlrpc', 'Errno: '. xmlrpc_errno() .' Message: '. xmlrpc_error_msg(), WATCHDOG_ERROR);
-    return false;
-  }
-  return $result;
+  return _xmpp_xmlrpc('num_resources', array('user' => $user->xmppclient['user_name'], 'host' => $user->xmppclient['server']));
 }
 
 /**
@@ -351,3 +303,16 @@
   }
   return $url;
 }
+
+/**
+ * Helper function. Make XMLRPC with error logging.
+ */
+function _xmpp_xmlrpc($service, $params) {
+  $result = xmlrpc(xmpp_xmlrpc_url(), $params);
+  if ($result === FALSE) {
+    watchdog('xmpp_node_muc', 'Errno: '. xmlrpc_errno() .' Message: '. xmlrpc_error_msg(), array(), WATCHDOG_ERROR);
+    return FALSE;
+  } else {
+    return TRUE;
+  }
+}
Index: contrib/xmpp_messaging/xmpp_messaging.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/xmppframework/contrib/xmpp_messaging/xmpp_messaging.module,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 xmpp_messaging.module
--- contrib/xmpp_messaging/xmpp_messaging.module	7 Oct 2008 15:52:38 -0000	1.1.2.1
+++ contrib/xmpp_messaging/xmpp_messaging.module	29 Oct 2008 19:48:23 -0000
@@ -109,7 +109,7 @@
     }
     // calling the messaging framework send user method will either queue using messaging queue or send as a mail
     if (!(messaging_message_send_user($destination, $message, $method, $queue))) {
-      watchdog('xmpp_messaging', t('Message was not sent to @user due to error', array('@user' => $destination->name)), WATCHDOG_ERROR);
+      watchdog('xmpp_messaging', 'Message was not sent to @user due to error', array('@user' => $destination->name), WATCHDOG_ERROR);
       return false;
     }
   }
Index: contrib/xmpp_api/xmpp_api.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/xmppframework/contrib/xmpp_api/xmpp_api.module,v
retrieving revision 1.1
diff -u -r1.1 xmpp_api.module
--- contrib/xmpp_api/xmpp_api.module	2 Oct 2008 20:57:51 -0000	1.1
+++ contrib/xmpp_api/xmpp_api.module	29 Oct 2008 19:48:23 -0000
@@ -154,8 +154,15 @@
  */
 function xmpp_api_send_message($to, $type = 'chat', $body = null, $subject = null) {
   // connect to the server, send the message and disconnect from the server
-  $conn = _xmpp_api_connect();
+  $conn = _xmpp_api_connect(XMPP_API_ADMINJID, XMPP_API_ADMINJID_PASSWORD);
   $conn->message($to, $body, $type, $subject);
+
+  /*
+  $log = $conn->getLog();
+  ob_start();
+  $log->printout();
+  dsm(ob_get_clean());
+  */
   _xmpp_api_disconnect($conn);
   return true;
 }
@@ -173,7 +180,7 @@
 function xmpp_api_delete_account($name, $host, $password) {
   // TODO: will have to look at the admin interface via XEP-0133
   if (!strlen(XMPP_API_ADMINJID) || !strlen(XMPP_API_ADMINJID_PASSWORD)) {
-    watchdog('xmpp_api', t('Admin JID or Password is not set for server administration'), WATCHDOG_ERROR);
+    watchdog('xmpp_api', 'Admin JID or Password is not set for server administration', array(), WATCHDOG_ERROR);
     return false;
   }
 
@@ -189,7 +196,7 @@
   // checking if the packet is an array or not
   if (!is_array($packet)) {
     _xmpp_api_disconnect($conn);
-    watchdog('xmpp_api', t('@name does not have the correct privileges to perform server administration via ad-hoc commands', array('@name' => XMPP_API_ADMINJID)), WATCHDOG_ERROR);
+    watchdog('xmpp_api', '@name does not have the correct privileges to perform server administration via ad-hoc commands', array('@name' => XMPP_API_ADMINJID), WATCHDOG_ERROR);
     return false;
   }
   // setting the user name we wish to delete from the server
@@ -200,7 +207,7 @@
   _xmpp_api_disconnect($conn);
   // error occurred while setting the user name
   if ($payload[0][1] != 'result') {
-    watchdog('xmpp_api', t('Error occurred while removing the user account'), WATCHDOG_ERROR);
+    watchdog('xmpp_api', 'Error occurred while removing the user account', array(), WATCHDOG_ERROR);
     return false;
   }
 
@@ -222,7 +229,7 @@
 function xmpp_api_create_muc($name, $service, $server, $title) {
   // implemented via XEP-0045 for the creation of the room
   if (!strlen(XMPP_API_ADMINJID) || !strlen(XMPP_API_ADMINJID_PASSWORD)) {
-    watchdog('xmpp_api', t('Admin JID or Password is not set for server administration'), WATCHDOG_ERROR);
+    watchdog('xmpp_api', 'Admin JID or Password is not set for server administration', array(), WATCHDOG_ERROR);
     return false;
   }
   // connecting to the xmpp server
@@ -236,7 +243,7 @@
   $payload = $conn->processUntil('initial_room_enter', XMPP_API_PROCESS_TIMEOUT);
   if ($payload[0][1] != 'result') {
     _xmpp_api_disconnect($conn);
-    watchdog('xmpp_api', t('@name does not have privileges to create muc rooms', array('@name' => XMPP_API_ADMINJID)), WATCHDOG_ERROR);
+    watchdog('xmpp_api', '@name does not have privileges to create muc rooms', array('@name' => XMPP_API_ADMINJID), WATCHDOG_ERROR);
     return false;
   }
 
@@ -249,7 +256,7 @@
   // if we are not returned an array we know there was an error in the configuration
   if (!is_array($packet)) {
     _xmpp_api_disconnect($conn);
-    watchdog('xmpp_api', t('@name does not have privileges to configure muc rooms', array('@name' => XMPP_API_ADMINJID)), WATCHDOG_ERROR);
+    watchdog('xmpp_api', '@name does not have privileges to configure muc rooms', array('@name' => XMPP_API_ADMINJID), WATCHDOG_ERROR);
     return false;
   }
 
@@ -267,7 +274,7 @@
   _xmpp_api_disconnect($conn);
 
   if ($payload[0][1] != 'result') {
-    watchdog('xmpp_api', t('Configuration options specified by the user are unacceptable to the room'), WATCHDOG_ERROR);
+    watchdog('xmpp_api', 'Configuration options specified by the user are unacceptable to the room', array(), WATCHDOG_ERROR);
     return false;
   }
 
@@ -280,7 +287,7 @@
 function xmpp_api_configure_muc($name, $service, $server, $title) {
   // implemented via XEP-0045 for the creation of the room
   if (!strlen(XMPP_API_ADMINJID) || !strlen(XMPP_API_ADMINJID_PASSWORD)) {
-    watchdog('xmpp_api', t('Admin JID or Password is not set for server administration'), WATCHDOG_ERROR);
+    watchdog('xmpp_api', 'Admin JID or Password is not set for server administration', array(), WATCHDOG_ERROR);
     return false;
   }
   // connecting to the xmpp server
@@ -296,7 +303,7 @@
   // if we are not returned an array we know there was an error in the configuration
   if (!is_array($packet)) {
     _xmpp_api_disconnect($conn);
-    watchdog('xmpp_api', t('@name does not have privileges to configure muc rooms', array('@name' => XMPP_API_ADMINJID)), WATCHDOG_ERROR);
+    watchdog('xmpp_api', '@name does not have privileges to configure muc rooms', array('@name' => XMPP_API_ADMINJID), WATCHDOG_ERROR);
     return false;
   }
   // have pre-determined options that we want to set the muc as i.e. title, persistent etc
@@ -313,7 +320,7 @@
   // disconnect from the xmpp server
   _xmpp_api_disconnect($conn);
   if ($payload[0][1] != 'result') {
-    watchdog('xmpp_api', t('Configuration options specified by the user are unacceptable to the room'), WATCHDOG_ERROR);
+    watchdog('xmpp_api', 'Configuration options specified by the user are unacceptable to the room', array(), WATCHDOG_ERROR);
     return false;
   }
 
@@ -334,7 +341,7 @@
 function xmpp_api_delete_muc($name, $service, $server) {
   // implemented via XEP-0045 for the removal of the room
   if (!strlen(XMPP_API_ADMINJID) || !strlen(XMPP_API_ADMINJID_PASSWORD)) {
-    watchdog('xmpp_api', t('Admin JID or Password is not set for server administration'), WATCHDOG_ERROR);
+    watchdog('xmpp_api', 'Admin JID or Password is not set for server administration', array(), WATCHDOG_ERROR);
     return false;
   }
   // connecting to the xmpp server
@@ -347,10 +354,10 @@
   // disconnect from the xmpp server
   _xmpp_api_disconnect($conn);
   if ($payload[0][1] != 'result') {
-    watchdog('xmpp_api', t('MUC could not be removed from the xmpp server'), WATCHDOG_ERROR);
+    watchdog('xmpp_api', 'MUC could not be removed from the xmpp server', array(), WATCHDOG_ERROR);
     return false;
   }
-  watchdog('xmpp_api', t('MUC successfully removed from the xmpp server'), WATCHDOG_NOTICE);
+  watchdog('xmpp_api', 'MUC successfully removed from the xmpp server', array(), WATCHDOG_NOTICE);
   return true;
 }
 
@@ -374,7 +381,7 @@
  */
 function xmpp_api_add_rosteritem($uname, $userver, $cname, $cserver, $nick, $group, $subscription) {
   if (!$cname || !$cserver) {
-    watchdog('xmppframework', t('Contact name or server not received'), WATCHDOG_ERROR);
+    watchdog('xmppframework', 'Contact name or server not received', array(), WATCHDOG_ERROR);
     return false;
   }
   // setting the jid of the contact we will add to our roster
@@ -387,7 +394,7 @@
   $payload = $conn->processUntil('contact_added', XMPP_API_PROCESS_TIMEOUT);
   // doing error checking to make sure the contact was loaded
   if ($payload[0][1] != 'result') {
-    watchdog('xmpp_api', t('Could not add user @jid to the roster, error occurred', array('@jid' => $jid)), WATCHDOG_ERROR);
+    watchdog('xmpp_api', 'Could not add user @jid to the roster, error occurred', array('@jid' => $jid), WATCHDOG_ERROR);
     _xmpp_api_disconnect($conn);
     return false;
   }
@@ -412,7 +419,7 @@
  */
 function xmpp_api_delete_rosteritem($uname, $userver, $cname, $cserver) {
   if (!$cname || !$cserver) {
-    watchdog('xmppframework', t('Contact name or server not received'), WATCHDOG_ERROR);
+    watchdog('xmppframework', 'Contact name or server not received', array(), WATCHDOG_ERROR);
     return false;
   }
   // setting the jid of the contact we will remove from our roster
@@ -426,7 +433,7 @@
 
   // error checking to make sure the packet returned was not an error packet
   if ($payload[0][1] != 'result') {
-    watchdog('xmpp_api', t('Error while trying to delete roster item: @jid', array('@jid' => $jid)), WATCHDOG_ERROR);
+    watchdog('xmpp_api', 'Error while trying to delete roster item: @jid', array('@jid' => $jid), WATCHDOG_ERROR);
     return false;
   }
   return true;
@@ -448,7 +455,7 @@
   $packet = $conn->processUntil('vcard_received', XMPP_API_PROCESS_TIMEOUT);
   _xmpp_api_disconnect($conn);
   if (!is_array($packet[0][1])) {
-    watchdog('xmpp_api', t('Could not retrieve users vcard from the xmpp server'), WATCHDOG_ERROR);
+    watchdog('xmpp_api', 'Could not retrieve users vcard from the xmpp server', array(), WATCHDOG_ERROR);
     return false;
   }
 
@@ -467,7 +474,7 @@
 
   // checking for errors that might have occurred
   if ($payload[0][1] != 'result') {
-    watchdog('xmpp_api', t('Could not set @name vcard, error occurred', array('@name' => $user->xmppclient['jid'])), WATCHDOG_ERROR);
+    watchdog('xmpp_api', 'Could not set @name vcard, error occurred', array('@name' => $user->xmppclient['jid']), WATCHDOG_ERROR);
     return false;
   }
   return true;
@@ -491,7 +498,7 @@
 
   // error checking to make sure we receive the roster and not an error
   if (!is_array($packet[0][1])) {
-    watchdog('xmpp_api', t('Could not retrieve the users roster from the system'), WATCHDOG_ERROR);
+    watchdog('xmpp_api', 'Could not retrieve the users roster from the system', array(), WATCHDOG_ERROR);
     return false;
   }
   return $packet[0][1];
@@ -532,6 +539,7 @@
 function _xmpp_api_build_conn($jid = NULL, $password = NULL) {
   // if we received a username and password use them to log
   if ($jid && $password) {
+    dsm("xmpp_api_build_conn jid=$jid pass=$password");
     $pieces = explode('@', $jid);
     $username = $pieces[0];
     $server = $pieces[1];
Index: contrib/xmpp_node_muc/xmpp_node_muc_xmlrpc.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/xmppframework/contrib/xmpp_node_muc/xmpp_node_muc_xmlrpc.inc,v
retrieving revision 1.1
diff -u -r1.1 xmpp_node_muc_xmlrpc.inc
--- contrib/xmpp_node_muc/xmpp_node_muc_xmlrpc.inc	2 Oct 2008 20:57:52 -0000	1.1
+++ contrib/xmpp_node_muc/xmpp_node_muc_xmlrpc.inc	29 Oct 2008 19:48:23 -0000
@@ -32,7 +32,7 @@
     if ($presence == 'available') {
       db_query("UPDATE {xmpp_node_muc_users} SET nickname = '%s', join_time = %d WHERE jid = '%s' AND gid = %d", $nickname, time(), $jid, $gid);
       if (variable_get('xmpp_node_muc_xmlrpc_debug', false)) {
-        watchdog('xmpp_node_muc', 'JID: '. $jid .' changed nickname to: '. $nickname .' in room: '. $room, WATCHDOG_NOTICE);
+        watchdog('xmpp_node_muc', 'JID: '. $jid .' changed nickname to: '. $nickname .' in room: '. $room, array(), WATCHDOG_NOTICE);
       }
     }
     else {
@@ -54,7 +54,7 @@
     if ($presence == 'available') {
       db_query("INSERT INTO {xmpp_node_muc_users} (gid, nid, uid, jid, nickname, join_time) VALUES (%d, %d, %d, '%s', '%s', %d)", $gid, $group->nid, $uid, $jid, $nickname, time());
       if (variable_get('xmpp_node_muc_xmlrpc_debug', false)) {
-        watchdog('xmpp_node_muc', 'JID: '. $jid .' with nickname: '. $nickname .' has entered room: '. $room, WATCHDOG_NOTICE);
+        watchdog('xmpp_node_muc', 'JID: '. $jid .' with nickname: '. $nickname .' has entered room: '. $room, array(), WATCHDOG_NOTICE);
       }
     }
   }
@@ -77,7 +77,7 @@
   $nickname = substr($jid, 0, strpos($jid, '/')); // retrieving the nickname from the jid
 
   if (variable_get('xmpp_node_muc_xmlrpc_debug', false)) {
-    watchdog('xmpp_node_muc', 'ROOM LOG: '. $room .' From: '. $nickname .' Subject: '. $subject .' Body: '. $body, WATCHDOG_NOTICE);
+    watchdog('xmpp_node_muc', 'ROOM LOG: '. $room .' From: '. $nickname .' Subject: '. $subject .' Body: '. $body, array(), WATCHDOG_NOTICE);
   }
   // not one of our configured rooms hence we do not want to do anything with this record
   if (!($gid = _xmpp_node_muc_group_gid($room))) {
Index: contrib/xmpp_vcard/xmpp_vcard.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/xmppframework/contrib/xmpp_vcard/xmpp_vcard.module,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 xmpp_vcard.module
--- contrib/xmpp_vcard/xmpp_vcard.module	26 Oct 2008 16:06:16 -0000	1.1.2.1
+++ contrib/xmpp_vcard/xmpp_vcard.module	29 Oct 2008 19:48:24 -0000
@@ -179,7 +179,7 @@
   // return error if no profile is loaded since we cannot
   // do any mappings without the profile node being loaded
   if (!($profile = _xmpp_vcard_content_profile_load())) {
-    watchdog('xmpp_vcard', t('No content node matches the type specified for mapping between xmpp vcards and content profiles'), WATCHDOG_NOTICE);
+    watchdog('xmpp_vcard', 'No content node matches the type specified for mapping between xmpp vcards and content profiles', array(), WATCHDOG_NOTICE);
     return '<div style="text-align: center;">'. t('No content node is available, mapping between xmpp vcard and your drupal profile cannot occur') .'</div>';
   }
   // calling the xmppframework to retrieve the vcard
@@ -207,7 +207,7 @@
   $field_mapping = _xmpp_vcard_fields(strtoupper($field));
   // load the content profile node and verify that it exists
   if (!($profile = _xmpp_vcard_content_profile_load())) {
-    watchdog('xmpp_vcard', t('No content node matches the type specified for mapping between xmpp vcards and content profiles'), WATCHDOG_NOTICE);
+    watchdog('xmpp_vcard', 'No content node matches the type specified for mapping between xmpp vcards and content profiles');
     drupal_set_message(t('No content node is available, mapping between xmpp vcard and your drupal profile cannot occur'), 'error');
     drupal_goto('user/'. $user->uid .'/vcard');
   }
@@ -253,7 +253,7 @@
   $field_mapping = _xmpp_vcard_fields();
   // load the content profile node and verify that it exists
   if (!($profile = _xmpp_vcard_content_profile_load())) {
-    watchdog('xmpp_vcard', t('No content node matches the type specified for mapping between xmpp vcards and content profiles'), WATCHDOG_NOTICE);
+    watchdog('xmpp_vcard', 'No content node matches the type specified for mapping between xmpp vcards and content profiles');
     drupal_set_message(t('No content node is available, mapping between xmpp vcard and your drupal profile cannot occur'), 'error');
     drupal_goto('user/'. $user->uid .'/vcard');
   }
Index: xmppframework.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/xmppframework/xmppframework.module,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 xmppframework.module
--- xmppframework.module	8 Oct 2008 14:23:21 -0000	1.1.2.2
+++ xmppframework.module	29 Oct 2008 19:48:22 -0000
@@ -123,7 +123,7 @@
     $func = call_user_func($info['operation'], 'send_message');
     if ($func && function_exists($func)) {
       if (!call_user_func($func, $to, $type, $body, $subject)) {
-        watchdog('xmppframework', t('Failed to send message to user %to', array('%to' => $to)), WATCHDOG_ERROR);
+        watchdog('xmppframework', 'Failed to send message to user %to', array('%to' => $to), WATCHDOG_ERROR);
       }
     }
   }
@@ -145,7 +145,7 @@
     $func = call_user_func($info['operation'], 'delete_account');
     if ($func && function_exists($func)) {
       if (!call_user_func($func, $name, $host, $password)) {
-        watchdog('xmppframework', t('Failed to delete %user account from server', array('%user' => $name)), WATCHDOG_ERROR);
+        watchdog('xmppframework', 'Failed to delete %user account from server', array('%user' => $name), WATCHDOG_ERROR);
       }
     }
   }
@@ -167,7 +167,7 @@
     $func = call_user_func($info['operation'], 'create_muc');
     if ($func && function_exists($func)) {
       if (!call_user_func($func, $name, $service, $server, $title)) {
-        watchdog('xmppframework', t('Failed to create muc: %name', array('%name' => $name)), WATCHDOG_ERROR);
+        watchdog('xmppframework', 'Failed to create muc: %name', array('%name' => $name), WATCHDOG_ERROR);
       }
     }
   }
@@ -189,7 +189,7 @@
     $func = call_user_func($info['operation'], 'configure_muc');
     if ($func && function_exists($func)) {
       if (!call_user_func($func, $name, $service, $server, $title)) {
-        watchdog('xmppframework', t('Failed to configure muc: %name', array('%name' => $name)), WATCHDOG_ERROR);
+        watchdog('xmppframework', 'Failed to configure muc: %name', array('%name' => $name), WATCHDOG_ERROR);
       }
     }
   }
@@ -209,7 +209,7 @@
     $func = call_user_func($info['operation'], 'delete_muc');
     if ($func && function_exists($func)) {
       if (!call_user_func($func, $name, $service, $server)) {
-        watchdog('xmppframework', t('Failed to delete muc: %name', array('%name' => $name)), WATCHDOG_ERROR);
+        watchdog('xmppframework', 'Failed to delete muc: %name', array('%name' => $name), WATCHDOG_ERROR);
       }
     }
   }
@@ -237,7 +237,7 @@
     $func = call_user_func($info['operation'], 'add_rosteritem');
     if ($func && function_exists($func)) {
       if (!call_user_func($func, $uname, $userver, $cname, $cserver, $nick, $group, $subscription)) {
-        watchdog('xmppframework', t('Failed to add %cname to %uname roster', array('%cname' => $cname, '%uname' => $uname)), WATCHDOG_ERROR);
+        watchdog('xmppframework', 'Failed to add %cname to %uname roster', array('%cname' => $cname, '%uname' => $uname), WATCHDOG_ERROR);
       }
     }
   }
@@ -284,7 +284,7 @@
       $data = call_user_func($func);
       // if data is not an array then there was an error when trying to retrieve the users vcard
       if (!is_array($data)) {
-        watchdog('xmppframework', t('Failed to retrieve %user vcard from server', array('%user' => $user->name)), WATCHDOG_ERROR);
+        watchdog('xmppframework', 'Failed to retrieve %user vcard from server', array('%user' => $user->name), WATCHDOG_ERROR);
       }
     }
     return $data;
@@ -313,7 +313,7 @@
     $func = call_user_func($info['operation'], 'set_vcard');
     if ($func && function_exists($func)) {
       if (!call_user_func($func, $vcard)) {
-        watchdog('xmppframework', t('Failed to set %user vcard', array('%user' => $user->name)), WATCHDOG_ERROR);
+        watchdog('xmppframework', 'Failed to set %user vcard', array('%user' => $user->name), WATCHDOG_ERROR);
       }
     }
   }
@@ -331,7 +331,7 @@
     $func = call_user_func($info['operation'], 'get_roster');
     if ($func && function_exists($func)) {
       if (!($roster = call_user_func($func, $user))) {
-        watchdog('xmppframework', t('Failed to retrieve roster'), WATCHDOG_ERROR);
+        watchdog('xmppframework', 'Failed to retrieve roster', array(), WATCHDOG_ERROR);
       }
     }
   }
@@ -346,13 +346,14 @@
  *
  */
 function xmppframework_get_user_resources($user = NULL) {
+  return 1;
   $info = xmppframework_apis(XMPPFRAMEWORK_API);
   if ($info && function_exists($info['operation'])) {
     $func = call_user_func($info['operation'], 'get_user_resources');
     if ($func && function_exists($func)) {
       $resources = call_user_func($func, $user);
       if (!is_numeric($resources)) {
-        watchdog('xmppframework', t('Failed to retrieve the number of user resources'), WATCHDOG_ERROR);
+        watchdog('xmppframework', 'Failed to retrieve the number of user resources', array(), WATCHDOG_ERROR);
       }
     }
   }