[gnome-shell/gnome-3-10] layout: Protect against broken monitor size reports

[Adel Gadllah <agadllah src gnome org>]

commit e5c982351f3e47824194262733586fa4fd7e47f5
Author: Adel Gadllah <adel gadllah gmail com>
Date:   Mon Feb 17 13:34:42 2014 +0100

    layout: Protect against broken monitor size reports
    
    VNC / XRDP reports nonsensial (i.e 0) monitor dimensions causing us to
    end up with a dpi of "Infinity" and thus scale even though we shouldn't.
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1065788

 js/ui/layout.js |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
---
diff --git a/js/ui/layout.js b/js/ui/layout.js
index ab03f51..c68ba9d 100644
--- a/js/ui/layout.js
+++ b/js/ui/layout.js
@@ -489,6 +489,12 @@ const LayoutManager = new Lang.Class({
 
     _updateScaling: function() {
         let primary = this.monitors[this.primaryIndex];
+        let width_mm = global.gdk_screen.get_monitor_width_mm(this.primaryIndex);
+        let height_mm = global.gdk_screen.get_monitor_height_mm(this.primaryIndex);
+        if (width_mm == 0 || height_mm == 0) {
+            St.ThemeContext.get_for_stage(global.stage).scale_factor = 1;
+            return;
+        }
         let dpi_x = primary.width / (global.gdk_screen.get_monitor_width_mm(this.primaryIndex) / 25.4);
         let dpi_y = primary.height / (global.gdk_screen.get_monitor_height_mm(this.primaryIndex) / 25.4);
         if (dpi_x > HIGH_DPI_LIMIT && dpi_y > HIGH_DPI_LIMIT)