[Xfce4-commits] [xfce/xfce4-settings] 02/02: Fix "overlap" variable shadowing a global function

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

jannis pushed a commit to branch master
in repository xfce/xfce4-settings.

commit 168b90b16b6c0a2d7d87d83befee3f1ba60e56e9
Author: Jannis Pohlmann <jannis at xfce.org>
Date:   Sun Jul 27 16:03:51 2014 +0200

    Fix "overlap" variable shadowing a global function
---
 dialogs/display-settings/main.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index b904213..a7ee1f5 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -2005,7 +2005,7 @@ output_overlaps (XfceOutputInfo *output)
 {
     GList         *connected_outputs = NULL;
     GList         *list;
-    gboolean       overlap = FALSE;
+    gboolean       overlaps = FALSE;
     GdkRectangle   output_rect;
 
     get_output_rect (output, &output_rect);
@@ -2022,13 +2022,13 @@ output_overlaps (XfceOutputInfo *output)
             get_output_rect (other, &other_rect);
             if (gdk_rectangle_intersect (&output_rect, &other_rect, NULL))
             {
-                overlap = TRUE;
+                overlaps = TRUE;
                 break;
             }
         }
     }
 
-    return overlap;
+    return overlaps;
 }
 
 static gboolean

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.