[gimp/soc-2009-dynamics] Some more cleanup and a fix of a tiny earlier cleanup glitch

[Alexia Death <alexiade src gnome org>]

commit 3db3ad0703f4d083e7cd9366c201875a044c7a46
Author: Michael Natterer <mitch gimp org>
Date:   Fri Jul 10 03:46:42 2009 +0200

    Some more cleanup and a fix of a tiny earlier cleanup glitch

 app/widgets/gimptagpopup.c |   15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)
---
diff --git a/app/widgets/gimptagpopup.c b/app/widgets/gimptagpopup.c
index f4eb976..b0672c9 100644
--- a/app/widgets/gimptagpopup.c
+++ b/app/widgets/gimptagpopup.c
@@ -830,9 +830,7 @@ gimp_tag_popup_list_event (GtkWidget    *widget,
       popup->single_select_disabled = TRUE;
 
       x = button_event->x;
-      y = button_event->y;
-
-      y += popup->scroll_y;
+      y = button_event->y + popup->scroll_y;
 
       for (i = 0; i < popup->tag_count; i++)
         {
@@ -857,9 +855,7 @@ gimp_tag_popup_list_event (GtkWidget    *widget,
       gint            i;
 
       x = motion_event->x;
-      y = motion_event->y;
-
-      y += popup->scroll_y;
+      y = motion_event->y + popup->scroll_y;
 
       for (i = 0; i < popup->tag_count; i++)
         {
@@ -874,8 +870,9 @@ gimp_tag_popup_list_event (GtkWidget    *widget,
                 {
                   popup->prelight = tag_data;
                   gtk_widget_queue_draw (widget);
-                  break;
                 }
+
+              break;
             }
         }
     }
@@ -890,9 +887,7 @@ gimp_tag_popup_list_event (GtkWidget    *widget,
       popup->single_select_disabled = TRUE;
 
       x = button_event->x;
-      y = button_event->y;
-
-      y += popup->scroll_y;
+      y = button_event->y + popup->scroll_y;
 
       for (i = 0; i < popup->tag_count; i++)
         {