Save the client base JID for authentication in case it differs from the email (for accounts non-Goo…

remoting/host/mac/me2me_preference_pane.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "remoting/host/mac/me2me_preference_pane.h"
 
 #import <Cocoa/Cocoa.h>
 #include <CommonCrypto/CommonHMAC.h>
 #include <errno.h>
 #include <launch.h>
@@ skipping 450 matching lines @@
       message = @"Remote connections to this computer are disabled. To enable "
           "remote connections you must confirm your PIN.";
     } else {
       message = @"Remote connections to this computer are disabled.";
     }
   }
   [status_message_ setStringValue:message];
 
   std::string email;
   if (config_.get()) {
-    bool result = config_->GetString(remoting::kHostOwnerConfigPath, &email);
+    bool result =
+        config_->GetString(remoting::kHostOwnerEmailConfigPath, &email);
     if (!result) {
-      result = config_->GetString(remoting::kXmppLoginConfigPath, &email);
+      result = config_->GetString(remoting::kHostOwnerConfigPath, &email);
+      if (!result) {
+        result = config_->GetString(remoting::kXmppLoginConfigPath, &email);
 
-      // The config has already been checked by |IsConfigValid|.
-      if (!result) {
-        [self showError];
-        return;
+        // The config has already been checked by |IsConfigValid|.
+        if (!result) {
+          [self showError];
+          return;
+        }
       }
     }
   }
   [disable_view_ setEnabled:(is_pane_unlocked_ && is_service_running_ &&
                              !restart_pending_or_canceled_)];
   [confirm_pin_view_ setEnabled:(is_pane_unlocked_ &&
                                  !restart_pending_or_canceled_)];
   [confirm_pin_view_ setEmail:[NSString stringWithUTF8String:email.c_str()]];
   NSString* applyButtonText = is_service_running_ ? @"Confirm" : @"Enable";
   [confirm_pin_view_ setButtonText:applyButtonText];
@@ skipping 260 matching lines @@
   NSArray* arguments = [NSArray arrayWithObjects:@"--relaunch-prefpane", nil];
   [task setLaunchPath:command];
   [task setArguments:arguments];
   [task setStandardInput:[NSPipe pipe]];
   [task launch];
   [task release];
   [NSApp terminate:nil];
 }
 
 @end