X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Ffileref.c;h=24e96eb33cb39a21f625b0f75e5bb4c19543d562;hb=70f337d7209f9a26522b66f267b09658c60f4c17;hp=937933cedd914badf737bfba208d9d4d94151331;hpb=1d19cdbaca8b7cd239cd5d1e1f650bd48fa37bee;p=projects%2Fchimara%2Fchimara.git

diff --git a/libchimara/fileref.c b/libchimara/fileref.c
index 937933c..24e96eb 100644
--- a/libchimara/fileref.c
+++ b/libchimara/fileref.c
@@ -1,8 +1,10 @@
+#include <config.h>
 #include <errno.h>
 #include <unistd.h>
 #include <string.h>
 #include <gtk/gtk.h>
 #include <glib/gstdio.h>
+#include <glib/gi18n-lib.h>
 #include "fileref.h"
 #include "magic.h"
 #include "chimara-glk-private.h"
@@ -164,7 +166,7 @@ glk_fileref_create_temp(glui32 usage, glui32 rock)
  * <note><title>Chimara</title>
  * <para>
  * Chimara uses a <link 
- * linkend="gtk-GtkFileChooserDialog">GtkFileChooserDialog</link>. The default
+ * linkend="GtkFileChooserDialog">GtkFileChooserDialog</link>. The default
  * starting location for the dialog may be set with glkunix_set_base_file().
  * </para></note>
  *
@@ -196,10 +198,10 @@ glk_fileref_create_temp(glui32 usage, glui32 rock)
  * open the file.
  *
  * <note><para>
- *   It is possible that the prompt or file tool will have a 
- *   <quote>cancel</quote> option. If the player chooses this,
- *   glk_fileref_create_by_prompt() will return %NULL. This is a major reason
- *   why you should make sure the return value is valid before you use it.
+ *   It is likely that the prompt or file tool will have a <quote>cancel</quote>
+ *   option. If the player chooses this, glk_fileref_create_by_prompt() will
+ *   return %NULL. This is a major reason why you should make sure the return
+ *   value is valid before you use it.
  * </para></note>
  *
  * Returns: A new fileref, or #NULL if the fileref creation failed or the
@@ -233,7 +235,11 @@ glk_fileref_create_by_prompt(glui32 usage, glui32 fmode, glui32 rock)
 				GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
 				NULL);
 			gtk_file_chooser_set_action(GTK_FILE_CHOOSER(chooser), GTK_FILE_CHOOSER_ACTION_SAVE);
+
+			/* COMPAT: */
+#if GTK_CHECK_VERSION(2,8,0)
 			gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(chooser), TRUE);
+#endif
 			break;
 		case filemode_ReadWrite:
 		case filemode_WriteAppend:
@@ -407,14 +413,23 @@ glk_fileref_destroy(frefid_t fref)
  * @fref: A refrence to the file to delete.
  *
  * Deletes the file referred to by @fref. It does not destroy @fref itself.
+ *
+ * You should only call this with a fileref that refers to an existing file.
  */
 void
 glk_fileref_delete_file(frefid_t fref)
 {
 	VALID_FILEREF(fref, return);
 	if( glk_fileref_does_file_exist(fref) )
+	{
 		if(g_unlink(fref->filename) == -1)
 			IO_WARNING( "Error deleting file", fref->filename, g_strerror(errno) );
+	}
+	else
+	{
+		ILLEGAL(_("Tried to delete a fileref that does not refer to an existing file."));
+	}
+
 }
 
 /**