Updating branch refs/heads/master to 52bc073e30f29b32fea574257ad61b6626638567 (commit) from ecdfdc33de4d432af56d71705f87ad836fb8abab (commit)
commit 52bc073e30f29b32fea574257ad61b6626638567 Author: Sean Davis <smd.seanda...@gmail.com> Date: Mon Oct 7 06:08:59 2013 -0400 Cleanup styles src/gst/parole-gst.c | 6 ++++-- src/parole-player.c | 13 +++++-------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c index 922f23e..878deff 100644 --- a/src/gst/parole-gst.c +++ b/src/gst/parole-gst.c @@ -2714,8 +2714,10 @@ parole_gst_set_cursor_visible (ParoleGst *gst, gboolean visible) { if ( visible ) { - gst->priv->target == gst->priv->state ? gdk_window_set_cursor (gtk_widget_get_window(GTK_WIDGET (gst)), NULL): - parole_window_busy_cursor (gtk_widget_get_window(GTK_WIDGET (gst))); + if (gst->priv->target == gst->priv->state) + gdk_window_set_cursor (gtk_widget_get_window(GTK_WIDGET (gst)), NULL); + else + parole_window_busy_cursor (gtk_widget_get_window(GTK_WIDGET (gst))); } else parole_window_invisible_cursor (gtk_widget_get_window(GTK_WIDGET (gst))); diff --git a/src/parole-player.c b/src/parole-player.c index ffe5c2e..643cfb4 100644 --- a/src/parole-player.c +++ b/src/parole-player.c @@ -1951,7 +1951,6 @@ void parole_player_reset_controls (ParolePlayer *player, gboolean fullscreen) { static gint current_page = 0; - GdkWindow *gdkwindow; gboolean show_playlist; @@ -1972,7 +1971,6 @@ parole_player_reset_controls (ParolePlayer *player, gboolean fullscreen) gtk_window_unfullscreen (GTK_WINDOW (player->priv->window)); gtk_notebook_set_current_page (GTK_NOTEBOOK (player->priv->playlist_nt), current_page); - gdkwindow = gtk_widget_get_window (player->priv->gst); parole_gst_set_cursor_visible (PAROLE_GST (player->priv->gst), FALSE); player->priv->full_screen = FALSE; } @@ -2139,16 +2137,15 @@ gboolean parole_player_hide_controls (gpointer data) GdkWindow *gdkwindow; GtkWidget *controls; + TRACE("start"); + player = PAROLE_PLAYER (data); controls = gtk_widget_get_parent(player->priv->control); - if ( gtk_widget_get_visible (controls) ) - { - gtk_widget_hide(controls); - gdkwindow = gtk_widget_get_window (GTK_WIDGET(player->priv->gst)); - parole_window_invisible_cursor (gdkwindow); - } + gtk_widget_hide(controls); + gdkwindow = gtk_widget_get_window (GTK_WIDGET(player->priv->gst)); + parole_window_invisible_cursor (gdkwindow); return FALSE; } _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits