From 7ee95e588fd26b42d367a8db40e9a8793c93df0e Mon Sep 17 00:00:00 2001
From: Miguel de Icaza <miguel@novell.com>
Date: Tue, 1 Dec 1998 00:33:02 +0000
Subject: [PATCH] Sync sync - Federico

---
 gnome/ChangeLog |  5 +++++
 gnome/gpopup.c  |  4 ++++
 gnome/gscreen.c | 12 +++++++++++-
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/gnome/ChangeLog b/gnome/ChangeLog
index 4f720d462..47cc7de26 100644
--- a/gnome/ChangeLog
+++ b/gnome/ChangeLog
@@ -1,3 +1,8 @@
+1998-11-30  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+	* gscreen.c (panel_icon_list_select_icon): Use gpopup_do_popup().
+	(panel_file_list_select_row): Use gpopup_do_popup().
+
 1998-11-29  Federico Mena Quintero  <federico@nuclecu.unam.mx>
 
 	* gscreen.c (display_mini_info): Use g_strdup_printf() to make it
diff --git a/gnome/gpopup.c b/gnome/gpopup.c
index 3a9e67354..0c21e91cd 100644
--- a/gnome/gpopup.c
+++ b/gnome/gpopup.c
@@ -130,6 +130,9 @@ popup_open (GtkWidget *widget, gpointer data)
 		return;
 	}
 
+	do_enter (pfi->panel);
+
+#if 0
 	if (S_ISDIR (s.st_mode)) {
 		/* Open the directory in the panel the menu was activated from */
 
@@ -141,6 +144,7 @@ popup_open (GtkWidget *widget, gpointer data)
 	} else {
 		/* FIXME: get default program and launch it with this file */
 	}
+#endif
 }
 
 static void
diff --git a/gnome/gscreen.c b/gnome/gscreen.c
index 9ae260e85..aea782c3f 100644
--- a/gnome/gscreen.c
+++ b/gnome/gscreen.c
@@ -30,6 +30,7 @@
 #include "gdnd.h"
 #include "gtree.h"
 #include "gpageprop.h"
+#include "gpopup.h"
 #include "gcliplabel.h"
 #include "gblist.h"
 #include "../vfs/vfs.h"
@@ -834,7 +835,12 @@ panel_file_list_select_row (GtkWidget *file_list, int row, int column, GdkEvent
 			break;
 
 		case 3:
+#if 1
 			file_popup (&event->button, panel, NULL, row, panel->dir.list[row].fname);
+#else
+			/* FIXME: this should happen on button press, not button release */
+			gpopup_do_popup (panel->dir.list[row].fname, panel, (GdkEventButton *) event);
+#endif
 			break;
 		}
 
@@ -1464,8 +1470,12 @@ panel_icon_list_select_icon (GtkWidget *widget, int index, GdkEvent *event, WPan
 	
 	switch (event->type){
 	case GDK_BUTTON_PRESS:
-		if (event->button.button == 3){
+		if (event->button.button == 3) {
+#if 1
 			file_popup (&event->button, panel, NULL, index, panel->dir.list [index].fname);
+#else
+			gpopup_do_popup (panel->dir.list[index].fname, panel, (GdkEventButton *) event);
+#endif
 			return;
 		}
 		break;