Updating branch refs/heads/master to acc3fc53c611bda9c9a8d0c00fcff9ab38896036 (commit) from 7c7a8971e66cd810a82800a8ba91880a6f631579 (commit)
commit acc3fc53c611bda9c9a8d0c00fcff9ab38896036 Author: Ali Abdallah <al...@xfce.org> Date: Tue Dec 1 09:14:07 2009 +0100 Fix buffering info that was displayed in fullscreen mode Fix WriteReady handler, the browser plugin is getting usuable now. browser-plugin/media-plugin/parole-plugin-player.c | 1 + browser-plugin/plugin.cpp | 8 ++------ gst/parole-gst.c | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/browser-plugin/media-plugin/parole-plugin-player.c b/browser-plugin/media-plugin/parole-plugin-player.c index 103bdee..d9bb713 100644 --- a/browser-plugin/media-plugin/parole-plugin-player.c +++ b/browser-plugin/media-plugin/parole-plugin-player.c @@ -729,6 +729,7 @@ parole_plugin_player_construct (GObject *object) * buffering */ player->priv->buffering = gtk_label_new (NULL); + gtk_widget_set_no_show_all (player->priv->buffering, TRUE); gtk_widget_hide (player->priv->buffering); gtk_box_pack_start (GTK_BOX (vbox), player->priv->buffering, FALSE, FALSE, 0); diff --git a/browser-plugin/plugin.cpp b/browser-plugin/plugin.cpp index 185a82d..3b5526d 100644 --- a/browser-plugin/plugin.cpp +++ b/browser-plugin/plugin.cpp @@ -105,6 +105,8 @@ parole_plugin_player_ready_cb (DBusGProxy *proxy, gpointer data) { plugin->ping_id = g_timeout_add_seconds (10, (GSourceFunc) parole_plugin_ping, plugin); } + + } //////////////////////////////////////// @@ -413,12 +415,6 @@ int32_t CPlugin::WriteReady (NPStream * stream) { g_debug ("WriteReady url=%s", stream->url); - if (checked) - { - DestroyStream (stream, NPRES_DONE); - return -1; - } - return player_ready ? STREAMBUFSIZE : 0; } diff --git a/gst/parole-gst.c b/gst/parole-gst.c index 6e52df9..6c9acfe 100644 --- a/gst/parole-gst.c +++ b/gst/parole-gst.c @@ -1376,7 +1376,7 @@ parole_gst_button_press_event (GtkWidget *widget, GdkEventButton *ev) { nav = GST_NAVIGATION (gst->priv->video_sink); gst_navigation_send_mouse_event (nav, "mouse-button-press", ev->button, ev->x, ev->y); - ret = TRUE; + //ret = TRUE; } if (GTK_WIDGET_CLASS (parole_gst_parent_class)->button_press_event) _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits