projects
/
gc-dialer
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
18818b3
)
Fixing a bug with the delay init of missed call handling which prevented the feature...
author
Ed Page
<eopage@byu.net>
Wed, 20 Apr 2011 00:28:42 +0000
(19:28 -0500)
committer
Ed Page
<eopage@byu.net>
Wed, 20 Apr 2011 00:28:42 +0000
(19:28 -0500)
src/dialcentral_qt.py
patch
|
blob
|
history
diff --git
a/src/dialcentral_qt.py
b/src/dialcentral_qt.py
index
e39d553
..
2582418
100755
(executable)
--- a/
src/dialcentral_qt.py
+++ b/
src/dialcentral_qt.py
@@
-353,6
+353,13
@@
class MainWindow(qwrappers.WindowWrapper):
self.set_fullscreen(self._app.fullscreenAction.isChecked())
self.update_orientation(self._app.orientation)
self.set_fullscreen(self._app.fullscreenAction.isChecked())
self.update_orientation(self._app.orientation)
+ def _init_call_handler(self):
+ if self._callHandler is not None:
+ return
+ import call_handler
+ self._callHandler = call_handler.MissedCallWatcher()
+ self._callHandler.callMissed.connect(self._voicemailRefreshDelay.start)
+
def set_default_credentials(self, username, password):
self._defaultCredentials = username, password
def set_default_credentials(self, username, password):
self._defaultCredentials = username, password
@@
-550,7
+557,7
@@
class MainWindow(qwrappers.WindowWrapper):
self._accountDialog.setIfNotificationsSupported(self._app.alarmHandler.backgroundNotificationsSupported)
self._accountDialog.settingsApproved.connect(self._on_settings_approved)
self._accountDialog.setIfNotificationsSupported(self._app.alarmHandler.backgroundNotificationsSupported)
self._accountDialog.settingsApproved.connect(self._on_settings_approved)
- if self._callHandler is None or not self._callHandler.isSupported:
+ if self._callHandler is not None and not self._callHandler.isSupported:
self._accountDialog.updateVMOnMissedCall = self._accountDialog.VOICEMAIL_CHECK_NOT_SUPPORTED
elif self._updateVoicemailOnMissedCall:
self._accountDialog.updateVMOnMissedCall = self._accountDialog.VOICEMAIL_CHECK_ENABLED
self._accountDialog.updateVMOnMissedCall = self._accountDialog.VOICEMAIL_CHECK_NOT_SUPPORTED
elif self._updateVoicemailOnMissedCall:
self._accountDialog.updateVMOnMissedCall = self._accountDialog.VOICEMAIL_CHECK_ENABLED
@@
-585,14
+592,16
@@
class MainWindow(qwrappers.WindowWrapper):
callbackNumber = self._accountDialog.selectedCallback
self._session.set_callback_number(callbackNumber)
callbackNumber = self._accountDialog.selectedCallback
self._session.set_callback_number(callbackNumber)
- if self._callHandler is None or self._accountDialog.updateVMOnMissedCall == self._accountDialog.VOICEMAIL_CHECK_DISABLEDD:
+ if self._accountDialog.updateVMOnMissedCall == self._accountDialog.VOICEMAIL_CHECK_NOT_SUPPORTED:
pass
elif self._accountDialog.updateVMOnMissedCall == self._accountDialog.VOICEMAIL_CHECK_ENABLED:
self._updateVoicemailOnMissedCall = True
pass
elif self._accountDialog.updateVMOnMissedCall == self._accountDialog.VOICEMAIL_CHECK_ENABLED:
self._updateVoicemailOnMissedCall = True
+ self._init_call_handler()
self._callHandler.start()
else:
self._updateVoicemailOnMissedCall = False
self._callHandler.start()
else:
self._updateVoicemailOnMissedCall = False
- self._callHandler.stop()
+ if self._callHandler is not None:
+ self._callHandler.stop()
if (
self._accountDialog.notifyOnMissed or
self._accountDialog.notifyOnVoicemail or
if (
self._accountDialog.notifyOnMissed or
self._accountDialog.notifyOnVoicemail or
@@
-656,10
+665,7
@@
class MainWindow(qwrappers.WindowWrapper):
tab.enable()
self._initialize_tab(self._currentTab)
if self._updateVoicemailOnMissedCall:
tab.enable()
self._initialize_tab(self._currentTab)
if self._updateVoicemailOnMissedCall:
- if self._callHandler is None:
- import call_handler
- self._callHandler = call_handler.MissedCallWatcher()
- self._callHandler.callMissed.connect(self._voicemailRefreshDelay.start)
+ self._init_call_handler()
self._callHandler.start()
@qt_compat.Slot()
self._callHandler.start()
@qt_compat.Slot()