X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fdialcentral_qt.py;h=0f4150b13e0b4d22149d5251347a31d1244feeca;hb=8af5627ea879c80cf6adb1dc64df17a36e1a4cb0;hp=0d7b50ad0f9e3f329647d7130b8e5739ac9b74ba;hpb=e8b2bcefc62ba5f36a395070887513181aa0bfda;p=gc-dialer

diff --git a/src/dialcentral_qt.py b/src/dialcentral_qt.py
index 0d7b50a..0f4150b 100755
--- a/src/dialcentral_qt.py
+++ b/src/dialcentral_qt.py
@@ -542,7 +542,17 @@ class MainWindow(qwrappers.WindowWrapper):
 			else:
 				callbackNumber = self._accountDialog.selectedCallback
 				self._session.set_callback_number(callbackNumber)
-			self._app.alarmHandler.apply_settings(self._accountDialog.notifications, self._accountDialog.notificationTime)
+
+			if (
+				self._accountDialog.notifyOnMissed or
+				self._accountDialog.notifyOnVoicemail or
+				self._accountDialog.notifyOnSms
+			):
+				notifications = self._accountDialog.notifications
+			else:
+				notifications = self._accountDialog.ALARM_NONE
+			self._app.alarmHandler.apply_settings(notifications, self._accountDialog.notificationTime)
+
 			self._app.notifyOnMissed = self._accountDialog.notifyOnMissed
 			self._app.notifyOnVoicemail = self._accountDialog.notifyOnVoicemail
 			self._app.notifyOnSms = self._accountDialog.notifyOnSms
@@ -595,7 +605,12 @@ class MainWindow(qwrappers.WindowWrapper):
 	def _on_app_alert(self):
 		with qui_utils.notify_error(self._errorLog):
 			if self._session.state == self._session.LOGGEDIN_STATE:
-				self._session.update_messages(force=True)
+				messageType = {
+					(True, True): self._session.MESSAGE_ALL,
+					(True, False): self._session.MESSAGE_TEXTS,
+					(False, True): self._session.MESSAGE_VOICEMAILS,
+				}[(self._app.notifyOnSms, self._app.notifyOnVoicemail)]
+				self._session.update_messages(messageType, force=True)
 
 	@QtCore.pyqtSlot()
 	@misc_utils.log_exception(_moduleLogger)