Index: messaging_sms.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/messaging/messaging_sms/messaging_sms.module,v
retrieving revision 1.1.2.6.2.6
diff -u -r1.1.2.6.2.6 messaging_sms.module
--- messaging_sms.module	16 Dec 2008 15:00:31 -0000	1.1.2.6.2.6
+++ messaging_sms.module	30 Jan 2009 18:20:14 -0000
@@ -44,13 +44,10 @@
  * Send mail message to user account
  */
 function messaging_sms_user_destination($account, $message) {
-  if ($account->sms_user[0]['status'] == 2) {
-    $destination = new Stdclass();
-    $destination->number = $account->sms_user[0]['number'];
-    foreach ($account->sms_user[0]['gateway'] as $key => $field) {
-      $destination->$key = $field;
-    }
-    return $destination;
+  // Check for active mobile infomation. Simply return it so that the send
+  // callback and access everything.
+  if (!empty($account->sms_user) && $account->sms_user[0]['status'] == 2) {
+    return $account->sms_user[0];
   }
 }
 
@@ -61,9 +58,7 @@
  */
 function messaging_sms_send_msg($destination, $message, $params = array()) {
   $message = (array)$message;
-  // This function takes an array of destinations so 
-  $params['country'] = $destination->country;
-  return sms_send($destination->number, $message['subject'].$message['body'], $params);
+  return sms_send($destination['number'], $message['subject'].$message['body'], $destination['gateway']);
 }
  
 /**