sync from upstream up to 22:14a375563e2b

This includes the following commits:

changeset:   22:14a375563e2b
summary:     chang "while" command to "type -P" in bash based configure

changeset:   21:c4bf7c0f33d2
summary:     updated codec paper for RS01 life cycle

changeset:   20:dbcaad8128aa
summary:     replaced build count with mercurial changeset

changeset:   19:fba258a6acfa
summary:     Added tag 0.79.10 for changeset 49950be5a2ef

changeset:   18:49950be5a2ef
summary:     merged some debian patches

changeset:   17:815be3929c41
summary:     merged "easy" patches from Stéphane Lesimple's version

changeset:   16:7d15f8a958cb
summary:     Made printf format strings 32/64bit safe as suggested by Stéphane;

changeset:   15:1055a53b8d6d
summary:     reorganized code for --with-gui=[yes|no] option

changeset:   14:fbe2ae12a32c
summary:     Added tag 0.79.9 for changeset f2fdd6d3a1f5

changeset:   13:f2fdd6d3a1f5
summary:     updated TODO and CHANGELOG

And other changes that were needed to resolve the (many) conflicts.

src/large-io.c

@@ -20,6 +20,8 @@
  *  along with dvdisaster. If not, see <http://www.gnu.org/licenses/>.
  */
 
+/*** src type: some GUI code ***/
+
 #include "dvdisaster.h"
 
 /***
@@ -211,7 +213,7 @@ ssize_t LargeRead(LargeFile *lf, void *buf, size_t count)
  * Writing large files
  */
 
-#ifndef WITH_CLI_ONLY_YES
+#ifdef WITH_GUI_YES
 static void insert_buttons(GtkDialog *dialog)
 {  
   gtk_dialog_add_buttons(dialog, 
@@ -226,9 +228,7 @@ static ssize_t xwrite(int fdes, void *buf_base, size_t count)
 
    /* Simply fail when going out of space in command line mode */
 
-#ifndef WITH_CLI_ONLY_YES
    if(!Closure->guiMode)
-#endif
    {  while(count)
       {  ssize_t n = write(fdes, buf, count);
       
@@ -243,7 +243,7 @@ static ssize_t xwrite(int fdes, void *buf_base, size_t count)
       return total;
    }
 
-#ifndef WITH_CLI_ONLY_YES
+#ifdef WITH_GUI_YES
    /* Give the user a chance to free more space in GUI mode.
       When running out of space, the last write() may complete
       with n<count but no error condition, so we try writing
@@ -257,10 +257,10 @@ static ssize_t xwrite(int fdes, void *buf_base, size_t count)
 
 	 if(errno != ENOSPC) return total;
 
-	 answer = ModalDialog(GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, insert_buttons,
-			      _("Error while writing the file:\n\n%s\n\n"
-				"You can redo this operation after freeing some space."),
-			      strerror(errno));
+	 answer = GuiModalDialog(GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, insert_buttons,
+				 _("Error while writing the file:\n\n%s\n\n"
+				   "You can redo this operation after freeing some space."),
+				 strerror(errno));
 
 	 if(!answer) return total; 
       }
@@ -271,9 +271,9 @@ static ssize_t xwrite(int fdes, void *buf_base, size_t count)
 	 buf   += n;
       }
    }
-
+#endif /* WITH_GUI_YES */
+   
    return total;
-#endif
 }
 
 ssize_t LargeWrite(LargeFile *lf, void *buf, size_t count)