1999-08-08 David Martin <dmartina@usa.net>

* gtkedit/syntax.c (upgrade_syntax_file): Mark error strings for
	translation.

	* gtkedit/editmenu.c (edit_about_cmd): Mark text in "about" for
	translation as it used to be.

BUGS

@@ -1,7 +1,7 @@
 Bugzilla: 3436
 
 bugs.gnome.org:
-  Important: 1006, 1035, 1414, 1549, 1796
+  Important: 1006, 1414, 1549, 1796
   Major cosmetic: 272/875, 487, 825, 845, 1845, 899, 923, 1072/1336,
 		  1299, 1415, 1457, 1545, 1559, 1582, 1656, 1758, 1789
   Minor cosmetic: 55/208, 115, 308, 383, 398, 449, 479, 597, 781,

gnome/ChangeLog

@@ -1,3 +1,11 @@
+1999-08-12  Federico Mena Quintero  <federico@redhat.com>
+
+	* gdialogs.c (file_mask_dialog): Destroy the dialog if it was
+	closed by the window manager, as well.
+	(file_op_context_create_ui): Make the operation window modal so
+	that the user cannot fiddle with other windows while files are
+	being operated on.  BUGFIX: GNOME bug tracker #1035.
+
 1999-08-10  Federico Mena Quintero  <federico@nuclecu.unam.mx>
 
 	* gdialogs.c (file_mask_dialog): Sigh, disabled background

gnome/gdialogs.c

@@ -676,23 +676,20 @@ file_mask_dialog (FileOpContext *ctx, FileOperation operation, char *text, char
         }
 
         gtk_widget_show_all (GNOME_DIALOG (fmd_win)->vbox);
-        gtk_window_set_modal (GTK_WINDOW (fmd_win), FALSE);
         gnome_dialog_set_close (GNOME_DIALOG (fmd_win), TRUE);
         gnome_dialog_close_hides (GNOME_DIALOG (fmd_win), TRUE);
 
         /* Off to the races!!! */
         run = gnome_dialog_run (GNOME_DIALOG (fmd_win));
 
-        if (run == 1) {
+        if (run == 1 || 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;
         if (!dest_dir || !*dest_dir)
                 return NULL;
@@ -959,6 +956,7 @@ file_op_context_create_ui (FileOpContext *ctx, FileOperation op, int with_eta)
 
 	/* done with things */
         gtk_widget_show_all (GNOME_DIALOG (ui->op_win)->vbox);
+        gtk_window_set_modal (GTK_WINDOW (ui->op_win), TRUE);
         gtk_widget_show_now (ui->op_win);
 }