From: Ed Page <eopage@byu.net>
Date: Sun, 27 Feb 2011 00:25:01 +0000 (-0600)
Subject: Auto-select no alarm system if there is nothing to notify on changes
X-Git-Url: http://git.maemo.org/git/?p=gc-dialer;a=commitdiff_plain;h=6c0f16fff22006803b5b035cdcaa5807b9327a49

Auto-select no alarm system if there is nothing to notify on changes
---

diff --git a/src/dialcentral_qt.py b/src/dialcentral_qt.py
index 7ba1e7e..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