From: Ed Page <eopage@byu.net>
Date: Tue, 19 Apr 2011 23:50:44 +0000 (-0500)
Subject: Merge branch 'settings'
X-Git-Url: http://git.maemo.org/git/?p=gc-dialer;a=commitdiff_plain;h=6c9678a800644c0692c3592b24882c6b5fcc9493

Merge branch 'settings'
---

6c9678a800644c0692c3592b24882c6b5fcc9493
diff --cc src/session.py
index f0fb9cf,af7af7d..dbdc3e4
--- a/src/session.py
+++ b/src/session.py
@@@ -193,19 -198,20 +198,21 @@@ class Draft(QtCore.QObject)
  class Session(QtCore.QObject):
  
  	# @todo Somehow add support for csv contacts
 +	# @BUG When loading without caches, downloads messages twice
  
- 	stateChange = QtCore.pyqtSignal(str)
- 	loggedOut = QtCore.pyqtSignal()
- 	loggedIn = QtCore.pyqtSignal()
- 	callbackNumberChanged = QtCore.pyqtSignal(str)
+ 	stateChange = qt_compat.Signal(str)
+ 	loggedOut = qt_compat.Signal()
+ 	loggedIn = qt_compat.Signal()
+ 	callbackNumberChanged = qt_compat.Signal(str)
  
- 	contactsUpdated = QtCore.pyqtSignal()
- 	messagesUpdated = QtCore.pyqtSignal()
- 	historyUpdated = QtCore.pyqtSignal()
- 	dndStateChange = QtCore.pyqtSignal(bool)
+ 	accountUpdated = qt_compat.Signal()
+ 	messagesUpdated = qt_compat.Signal()
+ 	newMessages = qt_compat.Signal()
+ 	historyUpdated = qt_compat.Signal()
+ 	dndStateChange = qt_compat.Signal(bool)
+ 	voicemailAvailable = qt_compat.Signal(str, str)
  
- 	error = QtCore.pyqtSignal(str)
+ 	error = qt_compat.Signal(str)
  
  	LOGGEDOUT_STATE = "logged out"
  	LOGGINGIN_STATE = "logging in"