diff options
| author | Bastien Nocera <hadess@hadess.net> | 2007-09-23 02:15:53 +0000 |
|---|---|---|
| committer | Bastien Nocera <hadess@src.gnome.org> | 2007-09-23 02:15:53 +0000 |
| commit | 0e4e1cdb3cedeef615c95386d6a30970671eb0df (patch) | |
| tree | 0e09ce52b14dde8ecff3e5d7eb58afbea470cfdc | |
| parent | 4d4c12d00b46569c6da3155b13fcc113926e16bc (diff) | |
| download | totem-0e4e1cdb3cedeef615c95386d6a30970671eb0df.tar.gz | |
When an error occurs and we dismiss the error dialogue, don't hide the
2007-09-23 Bastien Nocera <hadess@hadess.net>
* src/totem-fullscreen.c: (totem_fullscreen_parent_window_notify):
When an error occurs and we dismiss the error dialogue, don't hide
the cursor if we're not in fullscreen
* src/totem.c: (totem_action_seek), (seek_slider_released_cb):
When a seek error occurs, reset the seeking so that the interface
is ready to use again
svn path=/branches/gnome-2-20/; revision=4730
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | src/totem-fullscreen.c | 3 | ||||
| -rw-r--r-- | src/totem.c | 11 |
3 files changed, 20 insertions, 3 deletions
@@ -1,3 +1,12 @@ +2007-09-23 Bastien Nocera <hadess@hadess.net> + + * src/totem-fullscreen.c: (totem_fullscreen_parent_window_notify): + When an error occurs and we dismiss the error dialogue, don't hide + the cursor if we're not in fullscreen + * src/totem.c: (totem_action_seek), (seek_slider_released_cb): + When a seek error occurs, reset the seeking so that the interface + is ready to use again + 2007-09-19 Bastien Nocera <hadess@hadess.net> * src/totem-fullscreen.c: (totem_fullscreen_set_cursor), diff --git a/src/totem-fullscreen.c b/src/totem-fullscreen.c index d8cb5c551..02966c241 100644 --- a/src/totem-fullscreen.c +++ b/src/totem-fullscreen.c @@ -300,6 +300,9 @@ totem_fullscreen_parent_window_notify (GtkWidget *parent_window, GParamSpec *property, TotemFullscreen *fs) { + if (totem_fullscreen_is_fullscreen (fs) == FALSE) + return; + if (parent_window == fs->priv->parent_window && gtk_window_is_active (GTK_WINDOW (parent_window)) == FALSE) { totem_fullscreen_force_popup_hide (fs); diff --git a/src/totem.c b/src/totem.c index cc004cce6..0123e06d8 100644 --- a/src/totem.c +++ b/src/totem.c @@ -416,8 +416,15 @@ totem_action_seek (Totem *totem, double pos) msg = g_strdup_printf(_("Totem could not play '%s'."), disp); g_free (disp); - totem_action_error (msg, err->message, totem); + /* Release the lock and reset everything so that we + * avoid being "stuck" seeking */ + totem_statusbar_set_seeking (TOTEM_STATUSBAR (totem->statusbar), FALSE); + totem_time_label_set_seeking (TOTEM_TIME_LABEL (totem->fs->time_label), FALSE); + totem->seek_lock = FALSE; + bacon_video_widget_seek (totem->bvw, 0, NULL); totem_action_stop (totem); + + totem_action_error (msg, err->message, totem); g_free (msg); g_error_free (err); } @@ -1618,9 +1625,7 @@ seek_slider_released_cb (GtkWidget *widget, GdkEventButton *event, Totem *totem) val = gtk_adjustment_get_value (adj); if (bacon_video_widget_can_direct_seek (totem->bvw) == FALSE) - { totem_action_seek (totem, val / 65535.0); - } totem_statusbar_set_seeking (TOTEM_STATUSBAR (totem->statusbar), FALSE); totem_time_label_set_seeking (TOTEM_TIME_LABEL (totem->fs->time_label), |