Change OAuth token names in config to be less confusing

locationbot.py

@@ -62,8 +62,8 @@ class LocationBot(ircbot.SingleServerIRCBot):
 			self.__admins = self.__config.get(nick, 'admins').split()
 			self.__channels = set(self.__config.get(nick, 'channels').split())
 			self.__dsn = self.__config.get(nick, 'dsn')
-			self.__latitude_key = self.__config.get(nick, 'latitude_key')
-			self.__latitude_consumer = oauth.Consumer(key = self.__latitude_key, secret = self.__config.get(nick, 'latitude_secret'))
+			self.__latitude_client_id = self.__config.get(nick, 'latitude_client_id')
+			self.__latitude_consumer = oauth.Consumer(key = self.__latitude_client_id, secret = self.__config.get(nick, 'latitude_client_secret'))
 		except NoOptionError, error:
 			sys.exit(error)
 
@@ -535,7 +535,7 @@ class LocationBot(ircbot.SingleServerIRCBot):
 
 				if not authorized:
 					connection.privmsg(nick, 'go to https://www.google.com/latitude/apps/OAuthAuthorizeToken?' + urllib.urlencode({
-						'domain': self.__latitude_key,
+						'domain': self.__latitude_client_id,
 						'granularity': value,
 						'oauth_token': token,
 					}))