# HG changeset patch
# User zas_
# Date 1210708453 0
# Node ID 3f4bd5ead07a1847560ecda1ac3441faa641f0c1
# Parent  a2d74c9843db0ecb4c2a636c2b33f53a74952625
vficon_pop_menu(): drop "gint active" parameter, use stored click_id instead.

diff -r a2d74c9843db -r 3f4bd5ead07a src/view_file_icon.c
--- a/src/view_file_icon.c	Tue May 13 19:51:22 2008 +0000
+++ b/src/view_file_icon.c	Tue May 13 19:54:13 2008 +0000
@@ -225,11 +225,14 @@
 	vf->popup = NULL;
 }
 
-static GtkWidget *vficon_pop_menu(ViewFile *vf, gint active)
+static GtkWidget *vficon_pop_menu(ViewFile *vf)
 {
 	GtkWidget *menu;
 	GtkWidget *item;
 	GtkWidget *submenu;
+	gint active;
+
+	active = (VFICON_INFO(vf, click_id) != NULL);
 
 	menu = popup_menu_short_lived();
 
@@ -1291,7 +1294,7 @@
 			vficon_selection_add(vf, VFICON_INFO(vf, click_id), SELECTION_PRELIGHT, NULL);
 			tip_unschedule(vf);
 
-			vf->popup = vficon_pop_menu(vf, (id != NULL));
+			vf->popup = vficon_pop_menu(vf);
 			gtk_menu_popup(GTK_MENU(vf->popup), NULL, NULL, vfi_menu_position_cb, vf, 0, GDK_CURRENT_TIME);
 			break;
 		default:
@@ -1395,7 +1398,7 @@
 #endif
 			break;
 		case MOUSE_BUTTON_RIGHT:
-			vf->popup = vficon_pop_menu(vf, (id != NULL));
+			vf->popup = vficon_pop_menu(vf);
 			gtk_menu_popup(GTK_MENU(vf->popup), NULL, NULL, NULL, NULL, bevent->button, bevent->time);
 			break;
 		default: