Updating branch refs/heads/master
to cd4e66c4b3724d905fd8accc0607ffad4f0da294 (commit)
from 898be529b0a71d0145844c54594579d67a329db8 (commit)
commit cd4e66c4b3724d905fd8accc0607ffad4f0da294
Author: Ali Abdallah <[email protected]>
Date: Tue Jan 26 11:10:52 2010 +0100
Changes that were not pushed in 0.2.0.2 tag, but thanksfully there are in
the release.
Fix a bug in the browser plugin about not handling NP_EMBED
Remove g_debug calles that were left.
browser-plugin/media-plugin/main.c | 4 ++--
browser-plugin/media-plugin/parole-plugin-player.c | 14 +++++++-------
browser-plugin/plugin.cpp | 2 +-
configure.ac.in | 2 +-
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/browser-plugin/media-plugin/main.c
b/browser-plugin/media-plugin/main.c
index 211ab86..2af83fb 100644
--- a/browser-plugin/media-plugin/main.c
+++ b/browser-plugin/media-plugin/main.c
@@ -44,7 +44,7 @@ static gulong exit_source_id = 0;
static void G_GNUC_NORETURN
force_exit (gpointer data)
{
- g_debug ("Forcing exit");
+ //g_debug ("Forcing exit");
exit (0);
}
@@ -135,7 +135,7 @@ int main (int argc, char **argv)
if ( exit_source_id != 0 )
g_source_remove (exit_source_id);
- g_debug ("Exiting");
+ //g_debug ("Exiting");
gst_deinit ();
return EXIT_SUCCESS;
diff --git a/browser-plugin/media-plugin/parole-plugin-player.c
b/browser-plugin/media-plugin/parole-plugin-player.c
index 77192b6..caacf71 100644
--- a/browser-plugin/media-plugin/parole-plugin-player.c
+++ b/browser-plugin/media-plugin/parole-plugin-player.c
@@ -355,7 +355,7 @@ parole_plugin_player_media_state_cb (ParoleGst *gst, const
ParoleStream *stream,
static gboolean
parole_plugin_player_terminate (GtkWidget *widget, GdkEvent *ev,
ParolePluginPlayer *player)
{
- g_debug ("Delete event");
+ //g_debug ("Delete event");
parole_gst_terminate (player->priv->gst);
g_signal_handler_disconnect (player->priv->plug, player->priv->sig);
player->priv->terminate = TRUE;
@@ -902,7 +902,7 @@ parole_plugin_player_finalize (GObject *object)
player = PAROLE_PLUGIN_PLAYER (object);
- g_debug ("Finalize...");
+ //g_debug ("Finalize...");
dbus_g_connection_unref (player->priv->bus);
@@ -1019,7 +1019,7 @@ static gboolean
parole_plugin_player_dbus_quit (ParolePluginPlayer *player,
GError **error)
{
- g_debug ("Quit message received");
+ //g_debug ("Quit message received");
player->priv->terminate = TRUE;
g_idle_add ((GSourceFunc) parole_plugin_player_quit_idle, player);
return TRUE;
@@ -1028,7 +1028,7 @@ parole_plugin_player_dbus_quit (ParolePluginPlayer
*player,
static gboolean
parole_plugin_player_dbus_stop (ParolePluginPlayer *player, GError **error)
{
- g_debug ("Stop message received");
+ //g_debug ("Stop message received");
player->priv->terminate = TRUE;
g_idle_add ((GSourceFunc)parole_plugin_player_stop_idle, player);
@@ -1038,7 +1038,7 @@ parole_plugin_player_dbus_stop (ParolePluginPlayer
*player, GError **error)
static gboolean parole_plugin_player_dbus_ping (ParolePluginPlayer *player,
GError **error)
{
- g_debug ("Ping");
+ // g_debug ("Ping");
if ( idle_timer )
g_timer_reset (idle_timer);
@@ -1051,7 +1051,7 @@ static gboolean parole_plugin_player_dbus_play_url
(ParolePluginPlayer *player,
GError **error)
{
player->priv->url = g_strdup (in_URL);
- g_debug ("Playing url=%s", in_URL);
+ //g_debug ("Playing url=%s", in_URL);
g_idle_add ((GSourceFunc) parole_plugin_player_play_idle, player);
return TRUE;
}
@@ -1068,7 +1068,7 @@ static gboolean parole_plugin_player_dbus_play_list
(ParolePluginPlayer *player,
file = g_slist_nth_data (player->priv->list, 0);
player->priv->url = g_strdup (parole_file_get_uri (file));
- g_debug ("Playing url=%s", player->priv->url);
+ //g_debug ("Playing url=%s", player->priv->url);
g_idle_add ((GSourceFunc) parole_plugin_player_play_idle, player);
}
diff --git a/browser-plugin/plugin.cpp b/browser-plugin/plugin.cpp
index 2caeea6..b71fa09 100644
--- a/browser-plugin/plugin.cpp
+++ b/browser-plugin/plugin.cpp
@@ -441,7 +441,7 @@ int32_t CPlugin::WriteReady (NPStream * stream)
{
//g_debug ("WriteReady url=%s", stream->url);
- if ( mode != NP_FULL )
+ if ( mode != NP_FULL || mode != NP_EMBED )
{
NPN_DestroyStream (mInstance, stream, NPRES_DONE);
return -1;
diff --git a/configure.ac.in b/configure.ac.in
index 8b731fb..02645e6 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -3,7 +3,7 @@ m4_define([parole_verinfo], [0:2:0])
m4_define([parole_version_api], [0])
m4_define([parole_version_major], [0])
m4_define([parole_version_minor], [2])
-m4_define([parole_version_micro], [0.1])
+m4_define([parole_version_micro], [0.2])
m4_define([parole_version_build], [])
m4_define([parole_version_tag], [])
m4_define([parole_version],
[parole_version_major().parole_version_minor().parole_version_micro()ifelse(parole_version_tag(),
[git], [parole_version_tag().parole_version_build()], [parole_version_tag()])])
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
