From: epage <eopage@byu.net>
Date: Tue, 21 Jul 2009 02:54:28 +0000 (+0000)
Subject: * Ignoring cookies for callback since that cookie doesn't exist anymore
X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=aad736012736ae249cb51864a6a6f57f092397e9;p=gc-dialer

* Ignoring cookies for callback since that cookie doesn't exist anymore
* Adding some extra error checking
* Switching excepting catching to StandardError from RuntimeError



git-svn-id: file:///svnroot/gc-dialer/trunk@368 c39d3808-3fe2-4d86-a59f-b7f623ee9f21
---

diff --git a/src/dc_glade.py b/src/dc_glade.py
index 690039e..7a339a6 100755
--- a/src/dc_glade.py
+++ b/src/dc_glade.py
@@ -18,6 +18,7 @@ You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
+@todo Figure out how to integrate with the Maemo contacts app
 @todo Look into an actor system
 @bug Session timeouts are bad, possible solutions:
 	@li For every X minutes, if logged in, attempt login
@@ -645,7 +646,7 @@ class Dialcentral(object):
 		assert message
 		try:
 			loggedIn = self._phoneBackends[self._selectedBackendId].is_authed()
-		except RuntimeError, e:
+		except StandardError, e:
 			loggedIn = False
 			self._errorDisplay.push_exception(e)
 			return
@@ -660,7 +661,7 @@ class Dialcentral(object):
 		try:
 			self._phoneBackends[self._selectedBackendId].send_sms(number, message)
 			dialed = True
-		except RuntimeError, e:
+		except StandardError, e:
 			self._errorDisplay.push_exception(e)
 		except ValueError, e:
 			self._errorDisplay.push_exception(e)
@@ -669,7 +670,7 @@ class Dialcentral(object):
 		assert number
 		try:
 			loggedIn = self._phoneBackends[self._selectedBackendId].is_authed()
-		except RuntimeError, e:
+		except StandardError, e:
 			loggedIn = False
 			self._errorDisplay.push_exception(e)
 			return
@@ -685,7 +686,7 @@ class Dialcentral(object):
 			assert self._phoneBackends[self._selectedBackendId].get_callback_number() != ""
 			self._phoneBackends[self._selectedBackendId].dial(number)
 			dialed = True
-		except RuntimeError, e:
+		except StandardError, e:
 			self._errorDisplay.push_exception(e)
 		except ValueError, e:
 			self._errorDisplay.push_exception(e)
diff --git a/src/gc_views.py b/src/gc_views.py
index de52402..d01ac95 100644
--- a/src/gc_views.py
+++ b/src/gc_views.py
@@ -610,7 +610,7 @@ class AccountInfo(object):
 		self._callbackList.clear()
 		try:
 			callbackNumbers = self._backend.get_callback_numbers()
-		except RuntimeError, e:
+		except StandardError, e:
 			self._errorDisplay.push_exception(e)
 			self._isPopulated = False
 			return
@@ -629,16 +629,31 @@ class AccountInfo(object):
 			if not self._backend.is_valid_syntax(number):
 				self._errorDisplay.push_message("%s is not a valid callback number" % number)
 			elif number == self._backend.get_callback_number():
-				warnings.warn("Callback number already is %s" % self._backend.get_callback_number(), UserWarning, 2)
+				warnings.warn(
+					"Callback number already is %s" % (
+						self._backend.get_callback_number(),
+					),
+					UserWarning,
+					2
+				)
 			else:
 				self._backend.set_callback_number(number)
-				warnings.warn("Callback number set to %s" % self._backend.get_callback_number(), UserWarning, 2)
-		except RuntimeError, e:
+				assert make_ugly(number) == make_ugly(self._backend.get_callback_number()), "Callback number should be %s but instead is %s" % (
+					make_pretty(number), make_pretty(self._backend.get_callback_number())
+				)
+				warnings.warn(
+					"Callback number set to %s" % (
+						self._backend.get_callback_number(),
+					),
+					UserWarning, 2
+				)
+		except StandardError, e:
 			self._errorDisplay.push_exception(e)
 
 	def _on_callbackentry_changed(self, *args):
 		text = self.get_selected_callback_number()
-		self._set_callback_number(text)
+		number = make_ugly(text)
+		self._set_callback_number(number)
 
 
 class RecentCallsView(object):
@@ -743,7 +758,7 @@ class RecentCallsView(object):
 
 		try:
 			recentItems = self._backend.get_recent()
-		except RuntimeError, e:
+		except StandardError, e:
 			self._errorDisplay.push_exception_with_lock(e)
 			self._isPopulated = False
 			recentItems = []
@@ -885,7 +900,7 @@ class MessagesView(object):
 
 		try:
 			messageItems = self._backend.get_messages()
-		except RuntimeError, e:
+		except StandardError, e:
 			self._errorDisplay.push_exception_with_lock(e)
 			self._isPopulated = False
 			messageItems = []
@@ -1063,7 +1078,7 @@ class ContactsView(object):
 			addressBook = self._addressBook
 			try:
 				contacts = addressBook.get_contacts()
-			except RuntimeError, e:
+			except StandardError, e:
 				contacts = []
 				self._isPopulated = False
 				self._errorDisplay.push_exception_with_lock(e)
@@ -1094,7 +1109,7 @@ class ContactsView(object):
 		contactName = self._contactsmodel.get_value(itr, 1)
 		try:
 			contactDetails = self._addressBook.get_contact_details(contactId)
-		except RuntimeError, e:
+		except StandardError, e:
 			contactDetails = []
 			self._errorDisplay.push_exception(e)
 		contactPhoneNumbers = [phoneNumber for phoneNumber in contactDetails]
diff --git a/src/gv_backend.py b/src/gv_backend.py
index b269489..90d8a30 100644
--- a/src/gv_backend.py
+++ b/src/gv_backend.py
@@ -318,9 +318,9 @@ class GVDialer(object):
 		"""
 		@returns Current callback number or None
 		"""
-		for c in self._browser.cookies:
-			if c.name == "gv-ph":
-				return c.value
+		#for c in self._browser.cookies:
+		#	if c.name == "gv-ph":
+		#		return c.value
 		return self._callbackNumber
 
 	def get_recent(self):