diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | README | 1 | ||||
| -rw-r--r-- | src/backend/bacon-video-widget-xine.c | 9 | ||||
| -rw-r--r-- | src/bacon-video-widget-xine.c | 9 | ||||
| -rw-r--r-- | src/cd-drive.c | 2 | ||||
| -rw-r--r-- | src/egg-recent-util.c | 2 |
6 files changed, 28 insertions, 3 deletions
@@ -1,5 +1,13 @@ 2004-04-15 Bastien Nocera <hadess@hadess.net> + * README: upd + * src/bacon-video-widget-xine.c: (xine_event_message): + plan for the "permission denied" error in xine-lib + * src/cd-drive.c: (linux_bsd_media_type): + * src/egg-recent-util.c: upd from libbacon and libegg + +2004-04-15 Bastien Nocera <hadess@hadess.net> + * src/totem.c: (totem_action_error_and_exit), (on_properties1_activate): remove separators in the dialogs @@ -88,7 +88,6 @@ TODO collapse the errors on open, so the user only sees one message - support gxine, freevo, ypl playlist formats -- use xpath where possible in playlist parsing - write a widget more suitable for seeking in place of the current slider - check if there's a CD in the drive before trying to play anything - try to load optical media depending on what's in the drive diff --git a/src/backend/bacon-video-widget-xine.c b/src/backend/bacon-video-widget-xine.c index 93975c392..62c5a5ef3 100644 --- a/src/backend/bacon-video-widget-xine.c +++ b/src/backend/bacon-video-widget-xine.c @@ -1267,6 +1267,15 @@ xine_event_message (BaconVideoWidget *bvw, xine_ui_message_data_t *data) xine_stop (bvw->priv->stream); message = g_strdup (_("The audio device is busy. Is another application using it?")); break; +/* FIXME enable when xine-lib has been released */ +#if 0 + case XINE_MSG_PERMISSION_ERROR: + if (strncmp (bvw->priv->mrl, "file:", 5) == 0) + message = g_strdup (_("You are not allowed to open this file.")); + else + message = g_strdup (_("The server refused access to this file or stream.")); + break; +#endif } if (message == NULL) diff --git a/src/bacon-video-widget-xine.c b/src/bacon-video-widget-xine.c index 93975c392..62c5a5ef3 100644 --- a/src/bacon-video-widget-xine.c +++ b/src/bacon-video-widget-xine.c @@ -1267,6 +1267,15 @@ xine_event_message (BaconVideoWidget *bvw, xine_ui_message_data_t *data) xine_stop (bvw->priv->stream); message = g_strdup (_("The audio device is busy. Is another application using it?")); break; +/* FIXME enable when xine-lib has been released */ +#if 0 + case XINE_MSG_PERMISSION_ERROR: + if (strncmp (bvw->priv->mrl, "file:", 5) == 0) + message = g_strdup (_("You are not allowed to open this file.")); + else + message = g_strdup (_("The server refused access to this file or stream.")); + break; +#endif } if (message == NULL) diff --git a/src/cd-drive.c b/src/cd-drive.c index 321d3e3c3..6fb4b1c81 100644 --- a/src/cd-drive.c +++ b/src/cd-drive.c @@ -260,7 +260,7 @@ linux_bsd_media_type (const char *device) int fd; int mmc_profile; - fd = open (device, O_RDONLY|O_EXCL); + fd = open (device, O_RDONLY|O_EXCL|O_NONBLOCK); if (fd < 0) { if (errno == EBUSY) { return CD_MEDIA_TYPE_BUSY; diff --git a/src/egg-recent-util.c b/src/egg-recent-util.c index cb30e053f..bc5c5bafd 100644 --- a/src/egg-recent-util.c +++ b/src/egg-recent-util.c @@ -53,7 +53,6 @@ egg_recent_util_escape_underlines (const gchar* text) return g_string_free (str, FALSE); } -#ifndef USE_STABLE_LIBGNOMEUI static GdkPixbuf * scale_icon (GdkPixbuf *pixbuf, double *scale) @@ -69,6 +68,7 @@ scale_icon (GdkPixbuf *pixbuf, return gdk_pixbuf_scale_simple (pixbuf, width, height, GDK_INTERP_BILINEAR); } +#ifndef USE_STABLE_LIBGNOMEUI static GdkPixbuf * load_icon_file (char *filename, guint base_size, |