# HG changeset patch
# User yaz
# Date 1152888953 25200
# Node ID 3bc53d7f9012ed5f324cec4065a6d3bbd3aac8d1
# Parent  c40785ffb875881e112745c2251477d7603b8bb4
[svn] - now filepopup_pointer_check_iter() returns immediately if cfg.show_filepopup_for_tuple is FALSE.

diff -r c40785ffb875 -r 3bc53d7f9012 ChangeLog
--- a/ChangeLog	Fri Jul 14 07:45:57 2006 -0700
+++ b/ChangeLog	Fri Jul 14 07:55:53 2006 -0700
@@ -1,3 +1,11 @@
+2006-07-14 14:45:57 +0000  Giacomo Lozito <james@develia.org>
+  revision [1714]
+  - amidi-plug: use AMIDIPLUG_VERSION instead of VERSION for about box
+
+  Changes:        Modified:
+  +1 -1           trunk/Plugins/Input/amidi-plug/i_utils.c  
+
+
 2006-07-13 23:41:48 +0000  Tony Vroon <chainsaw@gentoo.org>
   revision [1712]
   Add missing file.
diff -r c40785ffb875 -r 3bc53d7f9012 audacious/ui_fileinfo.c
--- a/audacious/ui_fileinfo.c	Fri Jul 14 07:45:57 2006 -0700
+++ b/audacious/ui_fileinfo.c	Fri Jul 14 07:55:53 2006 -0700
@@ -180,7 +180,8 @@
 	static gint prev_x = 0, prev_y = 0, ctr = 0;
 	gboolean skip = FALSE;
 
-	if (playlistwin_is_shaded() || playlistwin_list->pl_tooltips == FALSE
+	if (!cfg.show_filepopup_for_tuple || playlistwin_is_shaded()
+		|| playlistwin_list->pl_tooltips == FALSE
 		|| gdk_window_at_pointer(NULL, NULL) != GDK_WINDOW(playlistwin->window)
 		|| gdk_window_at_pointer(NULL, NULL) == NULL)
 	{
@@ -218,9 +219,7 @@
 	    	}
 
 		tuple = playlist_get_tuple(pos);
-		if(cfg.show_filepopup_for_tuple){
-			filepopup_show_for_tuple(tuple);
-		}
+		filepopup_show_for_tuple(tuple);
 	}
 
 	return TRUE;