X-Git-Url: http://git.maemo.org/git/?p=watersofshiloah;a=blobdiff_plain;f=src%2Fmormonchannel_gtk.py;h=9320663b19113a18a1df3613d5d6901346899ca6;hp=f3e541e1136bf117286e01b7c8c9e76ed32582c7;hb=48395f16da1ee02cec1eea38c46072c1fd957a16;hpb=9081b983a67017f0815b8540072a1265c6b5d566

diff --git a/src/mormonchannel_gtk.py b/src/mormonchannel_gtk.py
index f3e541e..9320663 100755
--- a/src/mormonchannel_gtk.py
+++ b/src/mormonchannel_gtk.py
@@ -2,10 +2,8 @@
 # -*- coding: utf-8 -*-
 
 """
-@todo Fix scrollto for Fremantle
-@todo backgrounds need some resizing
 @todo Re-use windows for better performance
-@bug For some reason, the back/close button doesn't work when I nest multiple levels
+@todo Make radio program updates only happen when the app has focus to reduce CPU wakes
 @todo Need to confirm id's are persistent (not just for todos but broken behavior on transition)
 	@todo Track recent
 	@todo Persisted Pause
@@ -13,6 +11,7 @@
 @todo Sleep timer
 @todo Reverse order option.  Toggle between playing ascending/descending chronological order
 @todo Podcast integration
+	@todo Default with BYU Devotionals, http://speeches.byu.edu/?act=help&page=podcast
 """
 
 from __future__ import with_statement
@@ -110,25 +109,26 @@ class MormonChannelProgram(hildonize.get_app_class()):
 
 	@misc_utils.log_exception(_moduleLogger)
 	def _on_destroy(self, widget = None, data = None):
-		self.quit()
+		try:
+			self.quit()
+		finally:
+			gtk.main_quit()
 
 	def quit(self):
-		try:
-			self._save_settings()
+		self._save_settings()
 
-			self._index.stop()
-			self._store.stop()
+		self._player.stop()
+		self._index.stop()
+		self._store.stop()
 
-			try:
-				self._deviceState.close()
-			except AttributeError:
-				pass # Either None or close was removed (in Fremantle)
-			try:
-				self._osso_c.close()
-			except AttributeError:
-				pass # Either None or close was removed (in Fremantle)
-		finally:
-			gtk.main_quit()
+		try:
+			self._deviceState.close()
+		except AttributeError:
+			pass # Either None or close was removed (in Fremantle)
+		try:
+			self._osso_c.close()
+		except AttributeError:
+			pass # Either None or close was removed (in Fremantle)
 
 	@misc_utils.log_exception(_moduleLogger)
 	def _on_show_about(self, widget = None, data = None):
@@ -150,7 +150,7 @@ def run():
 	gtk.gdk.threads_init()
 	l = dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
 
-	hildonize.set_application_title(constants.__pretty_app_name__)
+	hildonize.set_application_name("FMRadio") # Playback while silent on Maemo 5
 	app = MormonChannelProgram()
 	if not PROFILE_STARTUP:
 		try:
@@ -158,6 +158,8 @@ def run():
 		except KeyboardInterrupt:
 			app.quit()
 			raise
+	else:
+		app.quit()
 
 
 if __name__ == "__main__":