[Xfce4-commits] <parole:master> Fixed unrefs, updated plugin doc.

[Sean Davis]

Updating branch refs/heads/master
         to 949d5e8567888610168f50e3168a49d9326bad05 (commit)
       from 8a81ce27765cdf695f90bfc7f04b4765a97e3694 (commit)

commit 949d5e8567888610168f50e3168a49d9326bad05
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Fri Nov 30 22:29:40 2012 -0500

    Fixed unrefs, updated plugin doc.

 docs/plugin-api/tmpl/parole-file.sgml |    5 +++++
 src/gst/parole-gst.c                  |    3 ---
 src/parole-player.c                   |   10 ++++++----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/docs/plugin-api/tmpl/parole-file.sgml b/docs/plugin-api/tmpl/parole-file.sgml
index 9e9392b..f1c69e1 100644
--- a/docs/plugin-api/tmpl/parole-file.sgml
+++ b/docs/plugin-api/tmpl/parole-file.sgml
@@ -31,6 +31,11 @@ Simple file handling.
 
 </para>
 
+<!-- ##### ARG ParoleFile:custom-subtitles ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG ParoleFile:directory ##### -->
 <para>
 
diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c
index 9ed1a1a..5d09e59 100644
--- a/src/gst/parole-gst.c
+++ b/src/gst/parole-gst.c
@@ -565,9 +565,6 @@ parole_gst_load_logo (ParoleGst *gst)
 
     path = g_strdup_printf ("%s/parole.png", PIXMAPS_DIR);
     
-    if ( gst->priv->logo )
-    g_object_unref (G_OBJECT(gst->priv->logo));
-    
     gst->priv->logo = gdk_pixbuf_new_from_file (path, NULL);
     g_free (path);
 }
diff --git a/src/parole-player.c b/src/parole-player.c
index d57c52d..b597716 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -1550,15 +1550,16 @@ parole_player_media_tag_cb (ParoleGst *gst, const ParoleStream *stream, ParolePl
 	if ( album )
 	{
 	    if (year)
-	    {
 	        gtk_label_set_markup(GTK_LABEL(player->priv->audiobox_album), g_markup_printf_escaped("<big><span color='#BBBBBB'><i>%s</i></span> <span color='#F4F4F4'>%s (%s)</span></big>", _("on"), album, year));
-		g_free (year);
-	    }
 	    else
 	        gtk_label_set_markup(GTK_LABEL(player->priv->audiobox_album), g_markup_printf_escaped("<big><span color='#BBBBBB'><i>%s</i></span> <span color='#F4F4F4'>%s</span></big>", _("on"), album));
 	        
 	    g_free (album);
 	}
+	
+	if (year)
+	    g_free (year);
+	
 	else
 	    gtk_label_set_markup(GTK_LABEL(player->priv->audiobox_album), g_strdup_printf("<big><span color='#BBBBBB'><i>%s</i></span> <span color='#F4F4F4'>%s</span></big>", _("on"), _("Unknown Album")));
 
@@ -2196,7 +2197,8 @@ static gboolean
 parole_player_handle_key_press (GdkEventKey *ev, ParolePlayer *player)
 {
     GtkWidget *focused;
-    gdouble seek_short = 10, seek_medium = 60, seek_long = 600;
+    gdouble seek_short = 10, seek_long = 600;
+    //gdouble seek_medium = 60;
     
     gboolean ret_val = FALSE;