X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fgc_backend.py;h=e1573db59b793f8914d4ecb3e4bf2f52534f96c7;hb=800d975c587d923407147ff9cf5edf3565591b34;hp=227838b9f0b7c17e8ff715a23b5ccb25533c0696;hpb=bf082beeb8f3babb39b1416d6b841c97b216d4c7;p=gc-dialer

diff --git a/src/gc_backend.py b/src/gc_backend.py
index 227838b..e1573db 100644
--- a/src/gc_backend.py
+++ b/src/gc_backend.py
@@ -51,7 +51,6 @@ class GCDialer(object):
 	_inboxRe = re.compile(r"""<td>.*?(voicemail|received|missed|call return).*?</td>\s+<td>\s+<font size="2">\s+(.*?)\s+&nbsp;\|&nbsp;\s+<a href="/mobile/contacts/.*?">(.*?)\s?</a>\s+<br/>\s+(.*?)\s?<a href=""", re.S)
 	_contactsRe = re.compile(r"""<a href="/mobile/contacts/detail/(\d+)">(.*?)</a>""", re.S)
 	_contactsNextRe = re.compile(r""".*<a href="/mobile/contacts(\?page=\d+)">Next</a>""", re.S)
-	_contactDetailGroupRe = re.compile(r"""Group:\s*(\w*)""", re.S)
 	_contactDetailPhoneRe = re.compile(r"""(\w+):[0-9\-\(\) \t]*?<a href="/mobile/calls/click_to_call\?destno=(\d+).*?">call</a>""", re.S)
 
 	_validateRe = re.compile("^[0-9]{10,}$")
@@ -93,7 +92,7 @@ class GCDialer(object):
 		try:
 			forwardSelectionPage = self._browser.download(GCDialer._forwardselectURL)
 		except urllib2.URLError, e:
-			raise RuntimeError("%s is not accesible" % GCDialer._clicktocallURL)
+			raise RuntimeError("%s is not accesible" % GCDialer._forwardselectURL)
 
 		self._browser.cookies.save()
 		if GCDialer._isLoginPageRe.search(forwardSelectionPage) is None:
@@ -116,7 +115,7 @@ class GCDialer(object):
 		try:
 			loginSuccessOrFailurePage = self._browser.download(GCDialer._loginURL, loginPostData)
 		except urllib2.URLError, e:
-			raise RuntimeError("%s is not accesible" % GCDialer._clicktocallURL)
+			raise RuntimeError("%s is not accesible" % GCDialer._loginURL)
 
 		return self.is_authed()
 
@@ -223,7 +222,7 @@ class GCDialer(object):
 		try:
 			callbackSetPage = self._browser.download(GCDialer._setforwardURL, callbackPostData)
 		except urllib2.URLError, e:
-			raise RuntimeError("%s is not accesible" % GCDialer._clicktocallURL)
+			raise RuntimeError("%s is not accesible" % GCDialer._setforwardURL)
 
 		self._browser.cookies.save()
 		return True
@@ -244,7 +243,7 @@ class GCDialer(object):
 		try:
 			recentCallsPage = self._browser.download(GCDialer._inboxallURL)
 		except urllib2.URLError, e:
-			raise RuntimeError("%s is not accesible" % GCDialer._clicktocallURL)
+			raise RuntimeError("%s is not accesible" % GCDialer._inboxallURL)
 
 		for match in self._inboxRe.finditer(recentCallsPage):
 			phoneNumber = match.group(4)
@@ -282,7 +281,7 @@ class GCDialer(object):
 				try:
 					contactsPage = self._browser.download(contactsPageUrl)
 				except urllib2.URLError, e:
-					raise RuntimeError("%s is not accesible" % GCDialer._clicktocallURL)
+					raise RuntimeError("%s is not accesible" % contactsPageUrl)
 				for contact_match in self._contactsRe.finditer(contactsPage):
 					contactId = contact_match.group(1)
 					contactName = contact_match.group(2)
@@ -305,7 +304,7 @@ class GCDialer(object):
 		try:
 			detailPage = self._browser.download(GCDialer._contactDetailURL + '/' + contactId)
 		except urllib2.URLError, e:
-			raise RuntimeError("%s is not accesible" % GCDialer._clicktocallURL)
+			raise RuntimeError("%s is not accesible" % GCDialer._contactDetailURL)
 
 		for detail_match in self._contactDetailPhoneRe.finditer(detailPage):
 			phoneType = detail_match.group(1)