File grip-fixes-from-3.3.1.diff of Package grip

Fixes from grip-3.3.1, in order of hunks:

- fix track number being off by one when auto-naming empty tracks

- better error message if ripping is done with no disc in the drive
  (also for Invalid rip executable and Invalid encoder executable)

- removed stray debugging when editing disc titile

--- grip-3.2.0/src/rip.c	2004-04-15 20:21:15.000000000 +0200
+++ grip-3.3.1/src/rip.c	2005-06-25 20:00:55.000000000 +0200
@@ -1146,7 +1158,7 @@ char *TranslateSwitch(char switch_char,v
   case 'n':
     if(*(enc_track->song_name))
       g_snprintf(res,PATH_MAX,"%s",enc_track->song_name);
-    else g_snprintf(res,PATH_MAX,"Track%02d",enc_track->track_num);
+    else g_snprintf(res,PATH_MAX,"Track%02d",enc_track->track_num+1);
     break;
   case 'a':
     if(*(enc_track->song_artist))
@@ -1253,18 +1265,26 @@ void DoRip(GtkWidget *widget,gpointer da
 
   ginfo=(GripInfo *)data;
 
+  if(!ginfo->have_disc) {
+    gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
+                      _("No disc was detected in the drive. If you have a disc in your drive, please check your CDRom device setting under Config->CD."));
+    return;
+  }
+
   if(widget) ginfo->doencode=FALSE;
   else ginfo->doencode=TRUE;
 
   if(!ginfo->using_builtin_cdp&&!FileExists(ginfo->ripexename)) {
-    DisplayMsg(_("Invalid rip executable\nCheck your rip config"));
+    gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
+                      _("Invalid rip executable.\nCheck your rip config, and ensure it specifies the full path to the ripper executable."));
 
     ginfo->doencode=FALSE;
     return;
   }
 
   if(ginfo->doencode&&!FileExists(ginfo->mp3exename)) {
-    DisplayMsg(_("Invalid encoder executable\nCheck your encoder config"));
+    gnome_app_warning((GnomeApp *)ginfo->gui_info.app,
+                      _("Invalid encoder executable.\nCheck your encoder config, and ensure it specifies the full path to the encoder executable."));
 
     ginfo->doencode=FALSE;
     return;
--- grip-3.2.0/src/discedit.c	2004-04-15 20:23:46.000000000 +0200
+++ grip-3.3.1/src/discedit.c	2005-01-29 20:27:43.000000000 +0100
@@ -395,9 +399,6 @@ static void TitleEditChanged(GtkWidget *
 
   ginfo=(GripInfo *)data;
 
-  printf("title edit changed [%s]\n",
-         gtk_entry_get_text(GTK_ENTRY(ginfo->gui_info.title_edit_entry)));
-
   strcpy(ginfo->ddata.data_title,
          gtk_entry_get_text(GTK_ENTRY(ginfo->gui_info.title_edit_entry)));