[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - vcl/unx

[Caolán McNamara]

 vcl/unx/gtk/app/gtksys.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit ff8d03d3871818238f8986b76ff901e4eb6fb701
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Mar 15 10:38:06 2013 +0000

    Resolves: rhbz#906137 slide show inverts outputs
    
    we go to some effort to determine the right value of ret
    and then throw it away and return 0
    
    regression since 4a7e3482912c90b73d6e12c82bcd9ce31975e3f1
    
    Change-Id: I652cfbe44fdab6560c1c8dc8fe25d6211b5357cb
    (cherry picked from commit 67aae198f80195e77bd62e7675a372312075b126)
    Reviewed-on: https://gerrit.libreoffice.org/2743
    Reviewed-by: Michael Meeks <michael.meeks at suse.com>
    Tested-by: Michael Meeks <michael.meeks at suse.com>

diff --git a/vcl/unx/gtk/app/gtksys.cxx b/vcl/unx/gtk/app/gtksys.cxx
index b7996c1..f5862c2 100644
--- a/vcl/unx/gtk/app/gtksys.cxx
+++ b/vcl/unx/gtk/app/gtksys.cxx
@@ -179,14 +179,14 @@ namespace {
 static int _fallback_get_primary_monitor (GdkScreen *pScreen)
 {
     // Use monitor name as primacy heuristic
-    int ret = -1;
     int max = gdk_screen_get_n_monitors (pScreen);
-    for (int i = 0; i < max && ret < 0; i++)
+    for (int i = 0; i < max; ++i)
     {
         char *name = gdk_screen_get_monitor_plug_name (pScreen, i);
-        if (name && !g_ascii_strncasecmp (name, "LVDS", 4))
-            ret = i;
+        bool bLaptop = (name && !g_ascii_strncasecmp (name, "LVDS", 4));
         g_free (name);
+        if (bLaptop)
+            return i;
     }
     return 0;
 }