From 9ff6038fc0e36d68430e0644ee80d7030812048a Mon Sep 17 00:00:00 2001
From: Miguel de Icaza <miguel@novell.com>
Date: Sat, 6 Feb 1999 00:11:39 +0000
Subject: [PATCH] Revert Jonathan's patch for use gpopup2 until it is actually
 commited to CVS

---
 gnome/gnome-file-property-dialog.c | 40 ++++++++++++++----------------
 gnome/gpopup.c                     |  2 +-
 gnome/gscreen.c                    | 10 ++++----
 3 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/gnome/gnome-file-property-dialog.c b/gnome/gnome-file-property-dialog.c
index 3e8d9320c..d05b691bc 100644
--- a/gnome/gnome-file-property-dialog.c
+++ b/gnome/gnome-file-property-dialog.c
@@ -355,8 +355,6 @@ switch_metadata_box (GnomeFilePropertyDialog *fp_dlg)
 
 	if (fp_dlg->desktop_url){
 		gtk_entry_set_text (GTK_ENTRY (fp_dlg->desktop_entry), fp_dlg->desktop_url);
-		fp_dlg->changing = FALSE;
-		return;
 	}
 	
 	if (fp_dlg->executable) {
@@ -998,25 +996,23 @@ gnome_file_property_dialog_new (gchar *file_name, gboolean can_set_icon)
 		gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
 					  create_url_properties (fp_dlg),
 					  gtk_label_new (_("URL")));
-	else {
-		gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
-					  create_general_properties (fp_dlg),
-					  gtk_label_new (_("Statistics")));
+	gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
+				  create_general_properties (fp_dlg),
+				  gtk_label_new (_("Statistics")));
 	
-		new_page = create_settings_pane (fp_dlg);
-		if (new_page)
-			gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
-						  new_page,
-						  gtk_label_new (_("Options")));
+	new_page = create_settings_pane (fp_dlg);
+	if (new_page)
 		gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
-					  create_perm_properties (fp_dlg),
-					  gtk_label_new (_("Permissions")));
-		gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (fp_dlg)->vbox),
-				    notebook, TRUE, TRUE, 0);
-		title_string = g_strconcat (rindex (file_name, '/') + 1, _(" Properties"), NULL);
-		gtk_window_set_title (GTK_WINDOW (fp_dlg), title_string);
-		g_free (title_string);
-	}
+					  new_page,
+					  gtk_label_new (_("Options")));
+	gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
+				  create_perm_properties (fp_dlg),
+				  gtk_label_new (_("Permissions")));
+	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (fp_dlg)->vbox),
+			    notebook, TRUE, TRUE, 0);
+	title_string = g_strconcat (rindex (file_name, '/') + 1, _(" Properties"), NULL);
+	gtk_window_set_title (GTK_WINDOW (fp_dlg), title_string);
+	g_free (title_string);
 	
 	gnome_dialog_append_button ( GNOME_DIALOG(fp_dlg), 
 				     GNOME_STOCK_BUTTON_OK);
@@ -1098,9 +1094,9 @@ apply_uid_group_change (GnomeFilePropertyDialog *fpd)
 static gint
 apply_name_change (GnomeFilePropertyDialog *fpd)
 {
-	gchar *new_name;
-	gchar *base_name;
-	gchar *full_target;
+	char *new_name;
+	char *base_name;
+	char *full_target;
 	FileOpContext *ctx;
 	long   count = 0;
 	double bytes = 0;
diff --git a/gnome/gpopup.c b/gnome/gpopup.c
index cb636f8b8..edfdcc3c4 100644
--- a/gnome/gpopup.c
+++ b/gnome/gpopup.c
@@ -8,8 +8,8 @@
 
 
 #include <config.h>
-#include <gnome.h>
 #include "global.h"
+#include <gnome.h>
 #include "panel.h"
 #include "cmd.h"
 #include "dialog.h"
diff --git a/gnome/gscreen.c b/gnome/gscreen.c
index 82a41e2e6..2d336976c 100644
--- a/gnome/gscreen.c
+++ b/gnome/gscreen.c
@@ -1363,7 +1363,8 @@ panel_icon_list_select_icon (GtkWidget *widget, int index, GdkEvent *event, WPan
 	switch (event->type){
 	case GDK_BUTTON_PRESS:
 		if (event->button.button == 3)
-			gpopup_do_popup2 ((GdkEventButton *) event, panel, NULL, TRUE);
+			gpopup_do_popup ((GdkEventButton *) event, panel, NULL, index,
+					 panel->dir.list[index].fname);
 		break;
 
 	case GDK_BUTTON_RELEASE:
@@ -1429,10 +1430,9 @@ panel_icon_list_button_press (GtkWidget *widget, GdkEventButton *event, WPanel *
 
 	icon = gnome_icon_list_get_icon_at (gil, event->x, event->y);
 
-	if (icon == -1) {
-		if (event->button == 3)
-			gpopup_do_popup2 ((GdkEventButton *) event, panel, NULL, FALSE);
-	} else {
+	if (icon == -1)
+		panel->maybe_start_drag = 0;
+	else {
 		if (event->button != 3)
 			panel->maybe_start_drag = event->button;
 	}