r11624 - in packages/trunk/snowballz/debian: . patches

[Peter Pentchev]

Author: roam-guest
Date: 2011-01-07 09:20:40 +0000 (Fri, 07 Jan 2011)
New Revision: 11624

Added:
   packages/trunk/snowballz/debian/patches/res_config_check.patch
Modified:
   packages/trunk/snowballz/debian/changelog
   packages/trunk/snowballz/debian/patches/series
Log:
Add a patch to check whether the screen resolution is supported.

Closes:		#585118
Reported by:	SevenMachines <SevenMachines at yahoo.co.uk>


Modified: packages/trunk/snowballz/debian/changelog
===================================================================
--- packages/trunk/snowballz/debian/changelog	2011-01-07 09:10:36 UTC (rev 11623)
+++ packages/trunk/snowballz/debian/changelog	2011-01-07 09:20:40 UTC (rev 11624)
@@ -16,6 +16,9 @@
   * Point the Homepage to the SourceForge snowballz project page.
     Closes: #608361
   * Acknowledge Sandro Tosi's NMU of 0.9.5.1-2.1; thanks!
+  * Add the res_config_check patch to check if the display resolution is
+    actually within range; thanks to SevenMachines for the report and patch.
+    Closes: #585118
 
  -- Peter Pentchev <roam at ringlet.net>  Fri, 07 Jan 2011 10:11:22 +0200
 

Added: packages/trunk/snowballz/debian/patches/res_config_check.patch
===================================================================
--- packages/trunk/snowballz/debian/patches/res_config_check.patch	                        (rev 0)
+++ packages/trunk/snowballz/debian/patches/res_config_check.patch	2011-01-07 09:20:40 UTC (rev 11624)
@@ -0,0 +1,28 @@
+Subject: Check user configs resolution is within range of available
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/snowballz/+bug/591619
+Author: Niall Creech <niallcreech at googlemail.com>
+Last-Update: 2011-01-07
+
+Index: snowballz-0.9.5.1/settings.py
+===================================================================
+--- snowballz-0.9.5.1.orig/settings.py	2010-06-09 09:21:45.000000000 +0100
++++ snowballz-0.9.5.1/settings.py	2010-06-09 09:23:14.000000000 +0100
+@@ -25,6 +25,11 @@
+         config.set('display', 'resolution', '0')
+         save_config()
+         qm = 0
++   # Catch bad resolution in config problem
++    if len(get_res_available()) < qm:
++        config.set('display', 'resolution', '0')
++        save_config()
++        qm = 0
+     return get_res_available()[int(qm)]
+ 
+ def get_option(option):
+@@ -79,4 +84,4 @@
+     file = open(path, 'w')
+     config.write(file)
+ 
+-load_config()
+\ No newline at end of file
++load_config()

Modified: packages/trunk/snowballz/debian/patches/series
===================================================================
--- packages/trunk/snowballz/debian/patches/series	2011-01-07 09:10:36 UTC (rev 11623)
+++ packages/trunk/snowballz/debian/patches/series	2011-01-07 09:20:40 UTC (rev 11624)
@@ -1,2 +1,3 @@
 typeerror_crash.patch
 list_nohash.patch
+res_config_check.patch