Fix bug #1293: 1999-05-26 Miguel de Icaza <miguel@nuclecu.unam.mx>

* gpopup.c (panel_action_properties): Hanlde properly gnome_dialog_run here. * gpopup2.c (handle_properties): ditto * gmain.c (gnome_check_super_user): Use dialog_run_and_close here. * gpopup.c (dicon_properties): Handle propery gnome_dialog_run * gdialogs.c (file_mask_dialog): Fix usage of gnome_dialog_run here. Handle case == -1. * gcmd.c (gnome_select): Fix usage of gnome_dialog_run here (handle case == -1)
1999-05-27 02:06:27 +00:00 · 1999-05-27 02:06:27 +00:00 · 7a0defee61
--- a/gnome/ChangeLog
+++ b/gnome/ChangeLog
@ -1,5 +1,20 @@
 1999-05-26  Miguel de Icaza  <miguel@nuclecu.unam.mx>

+	* gpopup.c (panel_action_properties): Hanlde properly
+	gnome_dialog_run here.
+
+	* gpopup2.c (handle_properties): ditto
+
+	* gmain.c (gnome_check_super_user): Use dialog_run_and_close here.
+
+	* gpopup.c (dicon_properties): Handle propery gnome_dialog_run
+
+	* gdialogs.c (file_mask_dialog): Fix usage of gnome_dialog_run
+	here.  Handle case == -1.
+
+	* gcmd.c (gnome_select): Fix usage of gnome_dialog_run here
+	(handle case == -1)
+
 	* gscreen.c (panel_fill_panel_icons): Add a hack to work around
 	gnome-libs/gnome-icon-list bug that did not reset the proper
 	values.  A fix will be available in gnome-libs-1.0.10.
--- a/gnome/gcmd.c
+++ b/gnome/gcmd.c
@ -355,8 +355,9 @@ gnome_sort_cmd (GtkWidget *widget, WPanel *panel)
 		panel_set_sort_order (panel, sfn);
 		break;
 	case 1:
-	default:
 		break;
+	default:
+		return;
 	}
 	gtk_widget_destroy (sort_box);
 }
@ -378,7 +379,8 @@ get_nickname (gchar *text)
 	GtkWidget *entry;
 	GtkWidget *label;
 	gchar *retval = NULL;
-
+	int destroy;
+	
 	dlg = gnome_dialog_new (_("Enter name."), GNOME_STOCK_BUTTON_OK, 
 				GNOME_STOCK_BUTTON_CANCEL, NULL);
 	gtk_window_set_position (GTK_WINDOW (dlg), GTK_WIN_POS_MOUSE);
@ -392,14 +394,20 @@ get_nickname (gchar *text)
 	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dlg)->vbox),
 			    entry, FALSE, FALSE, 0);
 	gtk_widget_show_all (GNOME_DIALOG (dlg)->vbox);
+	destroy = TRUE;
 	switch (gnome_dialog_run (GNOME_DIALOG (dlg))) {
+	case -1:
+		destroy = FALSE;
+		break;
 	case 0:
 		retval = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry)));
 		break;
 	case 1:
 	default:
 	}
-	gtk_widget_destroy (dlg);
+	if (destroy)
+		gtk_widget_destroy (dlg);
+
 	return retval;	
 }

@ -527,7 +535,8 @@ gnome_external_panelize (GtkWidget *widget, WPanel *panel)
 	GtkWidget *hbox;
 	gint i;
 	gchar *row_data;
-
+	int destroy;
+	
 	data = g_new0 (ep_dlg_data, 1);
 	data->setting_text = FALSE;
 	data->selected = -1;
@ -576,6 +585,9 @@ gnome_external_panelize (GtkWidget *widget, WPanel *panel)
 	gtk_box_pack_start (GTK_BOX (hbox), data->entry, TRUE, TRUE, 0);
 	gtk_container_add (GTK_CONTAINER (frame), hbox);
 	gtk_widget_show_all (GNOME_DIALOG (data->ep_dlg)->vbox);
+
+	destroy = TRUE;
+	
 	switch (gnome_dialog_run (GNOME_DIALOG (data->ep_dlg))) {
 	case 0:
 		gtk_widget_hide (data->ep_dlg);
@ -586,6 +598,10 @@ gnome_external_panelize (GtkWidget *widget, WPanel *panel)
 		save_settings (GTK_CLIST (data->clist));
 		break;
 	case 1:
+		break;
+	case -1:
+		destroy = FALSE;
+		break;
 	default:
 	}
 	for (i = 0; i < GTK_CLIST (data->clist)->rows; i++) {
@ -593,7 +609,9 @@ gnome_external_panelize (GtkWidget *widget, WPanel *panel)
 		if (row_data)
 			g_free (row_data);
 	}
-	gtk_widget_destroy (GTK_WIDGET (data->ep_dlg));
+
+	if (destroy)
+		gtk_widget_destroy (GTK_WIDGET (data->ep_dlg));
 	g_free (data);
 }

@ -704,6 +722,9 @@ gnome_filter_cmd (GtkWidget *widget, WPanel *panel)
 		x_filter_changed (panel);
 		reread_cmd ();
 		break;
+
+	case -1:
+		return;
 	}
 	gtk_widget_destroy (filter_dlg);
 }
@ -815,6 +836,7 @@ gnome_select (GtkWidget *widget, WPanel *panel)
    GtkWidget *select_dialog;
    GtkWidget *entry;
    GtkWidget *label;
+    int run;
    
    select_dialog = gnome_dialog_new (_("Select File"), GNOME_STOCK_BUTTON_OK, 
 				      GNOME_STOCK_BUTTON_CANCEL, NULL);
@ -836,11 +858,14 @@ gnome_select (GtkWidget *widget, WPanel *panel)
    gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (select_dialog)->vbox), entry, FALSE, FALSE, 0);
    gtk_widget_show_all (GNOME_DIALOG (select_dialog)->vbox);
    reg_exp = NULL;
-    if (gnome_dialog_run (GNOME_DIALOG (select_dialog)) == 0) {
+    run = gnome_dialog_run (GNOME_DIALOG (select_dialog));
+    if (run == 0) {
 	    gtk_widget_hide (select_dialog);
 	    reg_exp = g_strdup (gtk_entry_get_text (GTK_ENTRY (gnome_entry_gtk_entry (GNOME_ENTRY (entry)))));
    }
-    gtk_widget_destroy (select_dialog);
+    if (run != -1)
+	    gtk_widget_destroy (select_dialog);
+    
    if ((reg_exp == NULL) || (*reg_exp == '\000')) {
 	    g_free (reg_exp);
 	    return;
--- a/gnome/gdialogs.c
+++ b/gnome/gdialogs.c
@ -557,7 +557,8 @@ file_mask_dialog (FileOpContext *ctx, FileOperation operation, char *text, char
        char *source_mask, *orig_mask, *dest_dir;
        const char *error;
        struct stat buf;
-
+        int run;
+        
        g_return_val_if_fail (ctx != NULL, NULL);

        ctx->stable_symlinks = 0;
@ -665,11 +666,16 @@ file_mask_dialog (FileOpContext *ctx, FileOperation operation, char *text, char
        gnome_dialog_close_hides (GNOME_DIALOG (fmd_win), TRUE);

        /* Off to the races!!! */
-        if (gnome_dialog_run (GNOME_DIALOG (fmd_win)) == 1) {
+        run = gnome_dialog_run (GNOME_DIALOG (fmd_win));
+        
+        if (run == 1) {
                gtk_widget_destroy (fmd_win);
                return NULL;
        }

+        if (run == -1)
+                return NULL;
+
        dest_dir = gnome_file_entry_get_full_path(GNOME_FILE_ENTRY (fentry), FALSE);
        gtk_widget_destroy (fmd_win);
        easy_patterns = 1;
@ -1062,5 +1068,6 @@ symlink_dialog (char *existing, char *new, char **ret_existing, char **ret_new)
                *ret_new = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry2)));
        }

-        gtk_widget_destroy (dialog);
+        if (ret != -1)
+                gtk_widget_destroy (dialog);
 }
--- a/gnome/gmain.c
+++ b/gnome/gmain.c
@ -558,5 +558,5 @@ gnome_check_super_user (void)
 		GNOME_MESSAGE_BOX_WARNING,
 		GNOME_STOCK_BUTTON_OK, NULL);

-	gnome_dialog_run (GNOME_DIALOG (warning_dlg));
+	gnome_dialog_run_and_close (GNOME_DIALOG (warning_dlg));
 }
--- a/gnome/gpopup.c
+++ b/gnome/gpopup.c
@ -94,15 +94,18 @@ dicon_properties (GtkWidget *widget, DesktopIconInfo *dii)
 	int retval = 1;
 	char *path;
 	GtkWidget *dlg;
+	int run;
 	
 	path = concat_dir_and_file (desktop_directory, dii->filename);
 /*	retval = item_properties (dii->dicon, path, dii);*/
 	dlg = gnome_file_property_dialog_new (path, TRUE);
 	gtk_widget_show_all (dlg);
-	if (gnome_dialog_run (GNOME_DIALOG (dlg)) == 0)
+	run = gnome_dialog_run (GNOME_DIALOG (dlg));
+	if (run == 0)
 		retval = gnome_file_property_dialog_make_changes (GNOME_FILE_PROPERTY_DIALOG (dlg));

-	gtk_widget_destroy (dlg);
+	if (run != -1)
+		gtk_widget_destroy (dlg);
 	g_free(path);

 	if (retval)
@ -151,13 +154,19 @@ panel_action_properties (GtkWidget *widget, WPanel *panel)
 	file_entry *fe = &panel->dir.list [panel->selected];
 	char *full_name = concat_dir_and_file (panel->cwd, fe->fname);
 	GtkWidget *dlg;
+	int run;

 /*	if (item_properties (GTK_WIDGET (CLIST_FROM_SW (panel->list)), full_name, NULL) != 0)
 	reread_cmd ();*/
 	dlg = gnome_file_property_dialog_new (full_name, we_can_afford_the_speed);
 	gnome_dialog_set_parent (GNOME_DIALOG (dlg), GTK_WINDOW (panel->xwindow));
-	if (gnome_dialog_run (GNOME_DIALOG (dlg)) == 0)
+
+	run = gnome_dialog_run (GNOME_DIALOG (dlg));
+	
+	if (run == 0)
 		retval = gnome_file_property_dialog_make_changes (GNOME_FILE_PROPERTY_DIALOG (dlg));
+
+	if (run != -1)
 		gtk_widget_destroy (dlg);
 	 g_free (full_name);
 	if (retval)
--- a/gnome/gpopup2.c
+++ b/gnome/gpopup2.c
@ -705,7 +705,8 @@ handle_properties (GtkWidget *widget, WPanel *panel)
 	gint retval = 0;
 	GtkWidget *dialog;
 	gchar *full_name = NULL;
-
+	int run;
+	
 	full_name = get_full_filename (panel);
 	dialog = gnome_file_property_dialog_new (full_name,
 						 (is_a_desktop_panel (panel)
@ -715,11 +716,14 @@ handle_properties (GtkWidget *widget, WPanel *panel)
 	if (!is_a_desktop_panel (panel))
 		gnome_dialog_set_parent (GNOME_DIALOG (dialog), GTK_WINDOW (panel->xwindow));

-	if (gnome_dialog_run (GNOME_DIALOG (dialog)) == 0)
+	run = gnome_dialog_run (GNOME_DIALOG (dialog));
+	if (run == 0)
 		retval = gnome_file_property_dialog_make_changes (
 			GNOME_FILE_PROPERTY_DIALOG (dialog));

-	gtk_widget_destroy (dialog);
+	if (run != -1)
+		gtk_widget_destroy (dialog);
+
 	g_free (full_name);
 	if (retval && !is_a_desktop_panel (panel))
 		reread_cmd ();