[maemo-commits] [maemo-commits] r12943 - projects/haf/trunk/gtk+/gtk

[From: subversion at stage.maemo.org]

Author: xan
Date: 2007-07-31 12:56:33 +0300 (Tue, 31 Jul 2007)
New Revision: 12943

Modified:
   projects/haf/trunk/gtk+/gtk/gtkentrycompletion.c
Log:
Remove debug, consolidate positioning logic.


Modified: projects/haf/trunk/gtk+/gtk/gtkentrycompletion.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkentrycompletion.c	2007-07-31 09:56:26 UTC (rev 12942)
+++ projects/haf/trunk/gtk+/gtk/gtkentrycompletion.c	2007-07-31 09:56:33 UTC (rev 12943)
@@ -1426,7 +1426,7 @@
 
       val = (guint32*)data;
 
-      for (i = 0, j = 0; i < nitems_return; i+=4, j++)
+      for (i = 0, j = 0; j < n_rects; i+=4, j++)
         {
           rectangles[j].x = val[i];
           rectangles[j].y = val[i+1];
@@ -1475,21 +1475,17 @@
       /* If the popup fits below the entry we will put it there, otherwise it will
          go above it. If it does not fit in either direction we will put it below
          anyway. This is not exactly right, but we don't have other options */
-      if (popup_req.height <= to_bottom)
+      if (popup_req.height <= to_bottom ||
+          popup_req.height > to_top)
         {
           above = FALSE;
           y += entry_req.height;
         }
-      else if (popup_req.height <= to_top)
+      else
         {
           above = TRUE;
           y -= popup_req.height;
         }
-      else
-        {
-          above = FALSE;
-          y += entry_req.height;
-        }
 
       g_slice_free1 (sizeof(GdkRectangle)*n_rects, rectangles);
     }