Merge lp:~brendan-donegan/checkbox/fix_minimum_resolution into lp:checkbox

[Brendan Donegan]

The script had a typo where min_h was used twice instead of min_h and min_v as in the function header. Also simplified the logic a bit (no need to use an if statement to modify the return of a boolean function)

[Marc Tardif (cr3)]

Looks good, merging and updating ppa.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-21 13:33:59 +0000
+++ debian/changelog	2011-09-21 14:43:18 +0000
@@ -4,6 +4,7 @@
   * Remove test for FTP connection from network_check script (LP: #854222)
   * Update a parameter in usb_test to have it run faster.
   * Remove record_playback_after_suspend from Ubuntu Friendly whitelist (LP: #855540)
+  * Fix minor typo in multi-monitor friendly resolution_test script which caused minimum_resolution test to fail (LP: #855599)
 
   [Daniel Manrique]
   * Restored _recover attribute, re-enabling welcome and test selection

=== modified file 'scripts/resolution_test'
--- scripts/resolution_test	2011-09-20 15:42:18 +0000
+++ scripts/resolution_test	2011-09-21 14:43:18 +0000
@@ -18,7 +18,7 @@
     # Evaluate just the primary display
     screen = Gdk.Screen.get_default()
     geom = screen.get_monitor_geometry(screen.get_primary_monitor())
-    return geom.width >= min_h and geom.height >= min_h
+    return geom.width >= min_h and geom.height >= min_v
 
 def main(args):
     usage = "Usage: %prog [OPTIONS]"
@@ -34,8 +34,7 @@
     (options, args) = parser.parse_args(args)
 
     if (options.horizontal > 0) and (options.vertical > 0):
-        if not compare_resolution(options.horizontal, options.vertical):
-            return 1
+        return not compare_resolution(options.horizontal, options.vertical)
     else:
         check_resolution()