Revision: 4728 http://geany.svn.sourceforge.net/geany/?rev=4728&view=rev Author: eht16 Date: 2010-03-07 15:41:25 +0000 (Sun, 07 Mar 2010)

Log Message: ----------- Fix broken 'Save' action in 'Resave missing file' dialog.

Modified Paths: -------------- trunk/ChangeLog trunk/src/document.c

Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-03-07 15:32:34 UTC (rev 4727) +++ trunk/ChangeLog 2010-03-07 15:41:25 UTC (rev 4728) @@ -10,9 +10,10 @@ * src/dialogs.c: Fix crashes when using Save As with no open files (closes #2964406). * src/document.c: - Fix duplicate mnemonics on 'resave missing file' dialog, also + Fix duplicate mnemonics on 'Resave missing file' dialog, also move the question from the secondary to the main text to be more compatible with the Gnome HIG. + Fix broken 'Save' action in 'Resave missing file' dialog.

2010-03-05 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>

Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2010-03-07 15:32:34 UTC (rev 4727) +++ trunk/src/document.c 2010-03-07 15:41:25 UTC (rev 4728) @@ -2946,6 +2946,7 @@ static gboolean monitor_resave_missing_file(GeanyDocument *doc) { gboolean want_reload = FALSE; + gboolean file_saved = FALSE; gint ret;

ret = dialogs_show_prompt(NULL, @@ -2957,14 +2958,14 @@ doc->file_name); if (ret == GTK_RESPONSE_ACCEPT) { - dialogs_show_save_as(); + file_saved = dialogs_show_save_as(); want_reload = TRUE; } else if (ret == GTK_RESPONSE_CLOSE) { document_close(doc); } - if (ret != GTK_RESPONSE_CLOSE) + if (ret != GTK_RESPONSE_CLOSE && ! file_saved) { /* file is missing - set unsaved state */ document_set_text_changed(doc, TRUE);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.