[xine-cvs] CVS: gnome-xine/src key_events.c,1.16,1.17 mediamarks.c,1.24,1.25 playlist.c,1.69,1.70

[Darren S. <ds...@us...>]

Update of /cvsroot/xine/gnome-xine/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18538/src

Modified Files:
	key_events.c mediamarks.c playlist.c 
Log Message:
Don't complain about any of the user's keybindings, mediamarks or playlist
files being missing - we can live without them.


Index: key_events.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/key_events.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- key_events.c	14 Jul 2004 20:41:27 -0000	1.16
+++ key_events.c	25 Oct 2004 01:01:39 -0000	1.17
@@ -25,6 +25,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <errno.h>
 
 #include <glib.h>
 #include <gdk/gdk.h>
@@ -403,8 +404,9 @@
 
     free (kbfile);
   } else {
-    /*printf ("key_events: error, cannot open keybindings file %s\n",
-	    fname); */
+    if (errno != ENOENT)
+      printf ("key_events: error, cannot open keybindings file %s\n",
+	      fname);
     load_default_kb();
   }
 

Index: mediamarks.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/mediamarks.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- mediamarks.c	17 Jun 2004 08:37:19 -0000	1.24
+++ mediamarks.c	25 Oct 2004 01:01:39 -0000	1.25
@@ -29,6 +29,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <errno.h>
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
 #include <glib.h>
@@ -549,10 +550,10 @@
 
   if (fname) {
 
-    if (!load_mediamarks (fname))
+    if (!load_mediamarks (fname) && errno != ENOENT)
       display_error ("Mediamarks load failed",
 		     "Couldn't load mediamarks file"
-		     "%s", fname);
+		     "%s\n%s", fname, strerror (errno));
   }
 }
 

Index: playlist.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/playlist.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- playlist.c	9 Apr 2004 20:04:16 -0000	1.69
+++ playlist.c	25 Oct 2004 01:01:39 -0000	1.70
@@ -25,6 +25,7 @@
 
 #include <config.h>
 
+#include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -288,9 +289,10 @@
     }
 
   } else {
-    display_error ("Playlist load failed",
-		   "Loading of playlist file failed:\n"
-		   "Failed to open file '%s'", fname);
+    if (errno != ENOENT)
+      display_error ("Playlist load failed",
+		     "Loading of playlist file failed:\n"
+		     "Failed to open file '%s'\n%s", fname, strerror (errno));
     return 0;
   }
   return 1;