[Xfce4-commits] Fix wrong assertion in the browser plugin.

[Ali Abdallah]

Updating branch refs/heads/master
         to d5ca004977c7590d595d14c2d426119d091cc5cf (commit)
       from fb4d0ef40e2bd01cabecab1238374fe907748d72 (commit)

commit d5ca004977c7590d595d14c2d426119d091cc5cf
Author: Ali Abdallah <al...@xfce.org>
Date:   Mon Dec 7 13:08:37 2009 +0100

    Fix wrong assertion in the browser plugin.

 browser-plugin/media-plugin/parole-plugin-player.c |    2 +-
 browser-plugin/plugin.cpp                          |   11 ++++-------
 src/parole-player.c                                |    2 ++
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/browser-plugin/media-plugin/parole-plugin-player.c 
b/browser-plugin/media-plugin/parole-plugin-player.c
index f4f94b6..1144880 100644
--- a/browser-plugin/media-plugin/parole-plugin-player.c
+++ b/browser-plugin/media-plugin/parole-plugin-player.c
@@ -572,7 +572,7 @@ parole_plugin_player_error_cb (ParoleGst *gst, const gchar 
*error, ParolePluginP
     player->priv->finished = TRUE;
     parole_screen_saver_uninhibit (player->priv->saver);
     xfce_err ("%s", error);
-    parole_gst_stop (gst);
+    
 }
 
 static void
diff --git a/browser-plugin/plugin.cpp b/browser-plugin/plugin.cpp
index d02cfa2..365af6f 100644
--- a/browser-plugin/plugin.cpp
+++ b/browser-plugin/plugin.cpp
@@ -345,11 +345,8 @@ NPBool CPlugin::isInitialized()
 
 void CPlugin::StopPlayer ()
 {
-    g_return_if_fail (proxy != NULL);
-    
     if ( player_spawned )
     {
-    
        if ( player_ready )
        {
            gint num_tries = 0;
@@ -368,9 +365,9 @@ void CPlugin::StopPlayer ()
                 */
                if ( error )
                {
-    #ifdef DEBUG
+#ifdef DEBUG
                    g_debug ("Failed to stop the backend via D-Bus %s", 
error->message);
-    #endif
+#endif
                    if ( g_error_matches (error, DBUS_GERROR, 
DBUS_GERROR_NO_REPLY ) ||
                         g_error_matches (error, DBUS_GERROR, 
DBUS_GERROR_SERVICE_UNKNOWN) )
                    {
@@ -483,8 +480,8 @@ int32_t CPlugin::Write (NPStream * stream, int32_t offset, 
int32_t len, void *bu
     }
     else if ( player_ready && player_playing == FALSE  )
     {
-       SendPlay (stream->url);
-       return len;
+        SendPlay (stream->url);
+        return len;
     }
     
     return wrotebytes;
diff --git a/src/parole-player.c b/src/parole-player.c
index 8157f07..22ff70e 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -1664,6 +1664,8 @@ parole_player_window_notify_is_active (ParolePlayer 
*player)
  * Sets the _NET_WM_WINDOW_OPACITY_LOCKED wm hint 
  * so window manager keep us opaque.
  * 
+ * Currently it is only supported by xfwm.
+ * 
  * NOTE: The widget has to be realized first.
  **/
 static void
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits