From: Ed Page <eopage@byu.net>
Date: Thu, 19 Jan 2012 02:26:26 +0000 (-0600)
Subject: Bump to 1.1.6 to fix a user issue
X-Git-Url: http://git.maemo.org/git/?p=gonvert;a=commitdiff_plain;h=274a5bddf827150362b48fe3eac1cb2f3156b533;hp=f13daa4bec939982066b25b96594b5ade49e7a54

Bump to 1.1.6 to fix a user issue
---

diff --git a/Makefile b/Makefile
index 3592b41..4edd813 100644
--- a/Makefile
+++ b/Makefile
@@ -78,7 +78,7 @@ upload_diablo:
 upload_fremantle:
 	dput fremantle-extras-builder $(DIST_BASE_PATH)_fremantle/$(PROJECT_NAME)*.changes
 upload_harmattan:
-	./support/obs_upload.sh $(PROJECT_NAME) harmattan dist_harmattan
+	echo "OBS upload disabled" #./support/obs_upload.sh $(PROJECT_NAME) harmattan dist_harmattan
 upload_ubuntu:
 	cp $(DIST_BASE_PATH)_ubuntu/*.deb www/$(PROJECT_NAME).deb
 
diff --git a/gonvert/constants.py b/gonvert/constants.py
index 266ed3f..df8a4bf 100644
--- a/gonvert/constants.py
+++ b/gonvert/constants.py
@@ -1,7 +1,7 @@
 __pretty_app_name__ = "Gonvert"
 __app_name__ = "gonvert"
-__version__ = "1.1.5"
-__build__ = 3
+__version__ = "1.1.6"
+__build__ = 0
 __app_magic__ = 0xdeadbeef
 
 PROFILE_STARTUP = False
diff --git a/gonvert/gonvert_qt.py b/gonvert/gonvert_qt.py
index 3cc50b6..074c4de 100755
--- a/gonvert/gonvert_qt.py
+++ b/gonvert/gonvert_qt.py
@@ -647,7 +647,13 @@ class QuickConvert(object):
 		if defaultInputUnitName:
 			self.select_input(defaultInputUnitName)
 			defaultOutputUnitName = self._app.get_recent_unit(categoryName, 1)
-			assert defaultOutputUnitName
+			if not defaultOutputUnitName:
+				_moduleLogger.error(
+					"Somehow we have an odd numer of items in the history for category %r with only %r present",
+					categoryName,
+					defaultInputUnitName,
+				)
+				defaultOutputUnitName = defaultInputUnitName
 			self.select_output(defaultOutputUnitName)
 
 	def _select_input(self, name):
diff --git a/setup.py b/setup.py
index 61c2a99..18ab299 100755
--- a/setup.py
+++ b/setup.py
@@ -37,9 +37,7 @@ ICON_CATEGORY="apps"
 ICON_SIZES=[32,48]
 #[[[end]]] (checksum: fefe5943a0176aa799fab0d963c33832)
 
-CHANGES = """* Support for PySide
-* XDG Support
-* Fixed a race condition
+CHANGES = """* Fixing an issue reported by a user that I have no clue how to reproduce
 """.strip()
 BUGTRACKER_URL = "https://bugs.maemo.org/enter_bug.cgi?product=Gonvert"
 
diff --git a/www/gonvert.deb b/www/gonvert.deb
index d53a2b2..c6c205a 100644
Binary files a/www/gonvert.deb and b/www/gonvert.deb differ