Revision: 5190 http://geany.svn.sourceforge.net/geany/?rev=5190&view=rev Author: ntrel Date: 2010-08-23 15:16:39 +0000 (Mon, 23 Aug 2010)

Log Message: ----------- Only prompt for reloading if the document has unsaved changes (patch by Ji?\197?\153?\195?\173 Techet, thanks).

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

Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-08-23 12:37:17 UTC (rev 5189) +++ trunk/ChangeLog 2010-08-23 15:16:39 UTC (rev 5190) @@ -4,9 +4,12 @@ scintilla/include/SciLexer.h, scintilla/include/Scintilla.iface, scintilla/KeyWords.cxx, scintilla/Makefile.am, src/highlighting.c, data/filetypes.txt2tags, wscript: - Add lexer for Txt2Tags (patch by Forgeot Eric, #3020632). + Add lexer for Txt2Tags (patch by Forgeot Eric, thanks - #3020632). * m4, m4/intltool.m4, configure.ac, Makefile.am: Use AC_CONFIG_MACRO_DIR (patch by Erik de Castro Lopo, thanks). + * src/callbacks.c: + Only prompt for reloading if the document has unsaved changes + (patch by Jiří Techet, thanks).

2010-08-21 Frank Lanitz frank@frank.uvena.de

Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2010-08-23 12:37:17 UTC (rev 5189) +++ trunk/src/callbacks.c 2010-08-23 15:16:39 UTC (rev 5190) @@ -485,7 +485,8 @@ charset = doc->encoding;

base_name = g_path_get_basename(doc->file_name); - if (dialogs_show_question_full(NULL, _("_Reload"), GTK_STOCK_CANCEL, + if (!doc->changed || + dialogs_show_question_full(NULL, _("_Reload"), GTK_STOCK_CANCEL, _("Any unsaved changes will be lost."), _("Are you sure you want to reload '%s'?"), base_name)) {

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