[Xfce4-commits] <parole:master> Replace tabs with spaces, improve readability for remaining files and plugins*

Sean Davis noreply at xfce.org
Fri Oct 11 11:51:02 CEST 2013


Updating branch refs/heads/master
         to 0cc56610666e7773226b5b2d2bb07018a28b0d7f (commit)
       from 8f1e768dd3dee21d574c5f81c6dff3d99c9222ce (commit)

commit 0cc56610666e7773226b5b2d2bb07018a28b0d7f
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Sat Aug 24 12:35:00 2013 -0400

    Replace tabs with spaces, improve readability for remaining files and plugins*

 src/parole-about.c                   |   38 +-
 src/parole-about.h                   |    2 +-
 src/parole-builder.c                 |   10 +-
 src/parole-builder.h                 |    6 +-
 src/parole-button.c                  |   58 +-
 src/parole-button.h                  |   14 +-
 src/parole-conf-dialog.c             |  295 ++--
 src/parole-conf-dialog.h             |   14 +-
 src/parole-conf.c                    |  260 ++--
 src/parole-conf.h                    |   10 +-
 src/parole-disc.c                    |  228 +--
 src/parole-disc.h                    |   26 +-
 src/parole-mediachooser.c            |  100 +-
 src/parole-mediachooser.h            |    6 +-
 src/parole-medialist.c               | 1279 ++++++++--------
 src/parole-medialist.h               |  174 ++-
 src/parole-module.c                  |   76 +-
 src/parole-module.h                  |   42 +-
 src/parole-open-location.c           |   63 +-
 src/parole-open-location.h           |   14 +-
 src/parole-player.c                  | 2744 +++++++++++++++++-----------------
 src/parole-player.h                  |   37 +-
 src/parole-plugin-player.c           |   32 +-
 src/parole-plugin-player.h           |   10 +-
 src/parole-plugins-manager.h         |   22 +-
 src/parole-subtitle-encoding.h       |    4 +-
 src/parole-utils.c                   |  490 +++---
 src/parole-utils.h                   |   38 +-
 src/parole-vis.c                     |   16 +-
 src/parole-vis.h                     |    2 +-
 src/plugins/notify/notify-plugin.c   |    8 +-
 src/plugins/notify/notify-provider.c |  104 +-
 src/plugins/notify/notify-provider.h |    4 +-
 src/plugins/sample/sample-plugin.c   |    6 +-
 src/plugins/sample/sample-provider.c |   20 +-
 src/plugins/sample/sample-provider.h |    4 +-
 src/plugins/tray/tray-plugin.c       |    6 +-
 src/plugins/tray/tray-provider.c     |  129 +-
 src/plugins/tray/tray-provider.h     |    4 +-
 39 files changed, 3214 insertions(+), 3181 deletions(-)

diff --git a/src/parole-about.c b/src/parole-about.c
index 4f1ada2..f275b1e 100644
--- a/src/parole-about.c
+++ b/src/parole-about.c
@@ -47,17 +47,17 @@ void parole_about (GtkWindow *parent)
     /* List of authors */
     static const gchar *authors[] = 
     {
-	"Ali Abdallah <aliov at xfce.org>",
-	"Sean Davis <bluesabre at xfce.org>",
-	"Simon Steinbeiss <simon at xfce.org>",
-	NULL,
+        "Ali Abdallah <aliov at xfce.org>",
+        "Sean Davis <bluesabre at xfce.org>",
+        "Simon Steinbeiss <simon at xfce.org>",
+        NULL,
     };
 
     /* List of documentation writers */
     static const gchar *documenters[] =
     {
-	"Ali Abdallah <aliov at xfce.org>",
-	NULL,
+        "Ali Abdallah <aliov at xfce.org>",
+        NULL,
     };
     
     /* Copyright information */
@@ -65,17 +65,17 @@ void parole_about (GtkWindow *parent)
     "Copyright \302\251 2009-2011 Ali Abdallah\n"
     "Copyright \302\251 2012-2013 Sean Davis, Simon Steinbeiss";
     
-    gtk_show_about_dialog (parent,
-    "authors", authors,
-    "comments", _("Parole Media Player"),
-    "documenters", documenters,
-    "copyright", copyrights,
-    "license", XFCE_LICENSE_GPL,
-    "logo-icon-name", "parole",
-    "program-name", PACKAGE_NAME,
-    "translator-credits", _("translator-credits"),
-    "version", PACKAGE_VERSION,
-    "website", "http://goodies.xfce.org/projects/applications/parole",
-    "website-label", _("Visit Parole website"),
-    NULL);
+    gtk_show_about_dialog  (parent,
+        "authors", authors,
+        "comments", _("Parole Media Player"),
+        "documenters", documenters,
+        "copyright", copyrights,
+        "license", XFCE_LICENSE_GPL,
+        "logo-icon-name", "parole",
+        "program-name", PACKAGE_NAME,
+        "translator-credits", _("translator-credits"),
+        "version", PACKAGE_VERSION,
+        "website", "http://goodies.xfce.org/projects/applications/parole",
+        "website-label", _("Visit Parole website"),
+        NULL);
 }
diff --git a/src/parole-about.h b/src/parole-about.h
index 9dcb7f6..0df16c7 100644
--- a/src/parole-about.h
+++ b/src/parole-about.h
@@ -25,6 +25,6 @@
 
 #include <gtk/gtk.h>
 
-void 		parole_about	(GtkWindow *parent);
+void        parole_about    (GtkWindow *parent);
 
 #endif /* __PAROLE_ABOUT_H */
diff --git a/src/parole-builder.c b/src/parole-builder.c
index 6eecfb2..8034cfb 100644
--- a/src/parole-builder.c
+++ b/src/parole-builder.c
@@ -46,12 +46,12 @@ parole_builder_get_main_interface (void)
     
     if ( G_LIKELY (parole_builder_object != NULL) )
     {
-	g_object_ref (parole_builder_object);
+        g_object_ref (parole_builder_object);
     }
     else
     {
-	parole_builder_object = parole_builder_new_from_string (parole_ui, parole_ui_length);
-	g_object_add_weak_pointer (parole_builder_object, &parole_builder_object);
+        parole_builder_object = parole_builder_new_from_string (parole_ui, parole_ui_length);
+        g_object_add_weak_pointer (parole_builder_object, &parole_builder_object);
     }
     
     return GTK_BUILDER (parole_builder_object);
@@ -79,8 +79,8 @@ parole_builder_new_from_string (const gchar *ui, gsize length)
     
     if ( error )
     {
-	g_critical ("%s", error->message);
-	g_error_free (error);
+        g_critical ("%s", error->message);
+        g_error_free (error);
     }
     
     return builder;
diff --git a/src/parole-builder.h b/src/parole-builder.h
index 5e755d8..a12794a 100644
--- a/src/parole-builder.h
+++ b/src/parole-builder.h
@@ -28,10 +28,10 @@
 
 G_BEGIN_DECLS
 
-GtkBuilder       	       *parole_builder_get_main_interface       (void);
+GtkBuilder      *parole_builder_get_main_interface  (void);
 
-GtkBuilder		       *parole_builder_new_from_string 		(const gchar *ui,
-									 gsize length);
+GtkBuilder      *parole_builder_new_from_string     (const gchar *ui,
+                                                     gsize length);
 
 G_END_DECLS
 
diff --git a/src/parole-button.c b/src/parole-button.c
index 1c593ca..720c712 100644
--- a/src/parole-button.c
+++ b/src/parole-button.c
@@ -64,7 +64,7 @@ static struct
 
 struct ParoleButtonPrivate
 {
-    GdkScreen	*screen;
+    GdkScreen   *screen;
     GdkWindow   *window;
     
 };
@@ -96,8 +96,8 @@ parole_button_get_key (unsigned int keycode)
     
     for ( i = 0; i < G_N_ELEMENTS (parole_key_map); i++)
     {
-	if ( parole_key_map [i].key_code == keycode )
-	    key = parole_key_map [i].key;
+        if ( parole_key_map [i].key_code == keycode )
+            key = parole_key_map [i].key;
     }
     
     return key;
@@ -120,18 +120,18 @@ parole_button_filter_x_events (GdkXEvent *xevent, GdkEvent *ev, gpointer data)
     XEvent *xev = (XEvent *) xevent;
     
     if ( xev->type != KeyPress )
-    	return GDK_FILTER_CONTINUE;
+        return GDK_FILTER_CONTINUE;
     
     key = parole_button_get_key (xev->xkey.keycode);
     
     if ( key != PAROLE_KEY_UNKNOWN )
     {
-	button = (ParoleButton *) data;
-    
-	PAROLE_DEBUG_ENUM ("Key press", key, ENUM_GTYPE_BUTTON_KEY);
-    
-	g_signal_emit (G_OBJECT(button), signals[BUTTON_PRESSED], 0, key);
-	return GDK_FILTER_REMOVE;
+        button = (ParoleButton *) data;
+        
+        PAROLE_DEBUG_ENUM ("Key press", key, ENUM_GTYPE_BUTTON_KEY);
+        
+        g_signal_emit (G_OBJECT(button), signals[BUTTON_PRESSED], 0, key);
+        return GDK_FILTER_REMOVE;
     }
     
     return GDK_FILTER_CONTINUE;
@@ -158,25 +158,25 @@ parole_button_grab_keystring (ParoleButton *button, guint keycode)
     gdk_error_trap_push ();
 
     ret = XGrabKey (GDK_DISPLAY_XDISPLAY(display), keycode, modmask,
-		    gdk_x11_window_get_xid (button->priv->window), True,
-		    GrabModeAsync, GrabModeAsync);
-		    
+                    gdk_x11_window_get_xid (button->priv->window), True,
+                    GrabModeAsync, GrabModeAsync);
+            
     if ( ret == BadAccess )
     {
-	g_warning ("Failed to grab modmask=%u, keycode=%li",
-		    modmask, (long int) keycode);
-	return FALSE;
+    g_warning ("Failed to grab modmask=%u, keycode=%li",
+                modmask, (long int) keycode);
+    return FALSE;
     }
-	
+    
     ret = XGrabKey (GDK_DISPLAY_XDISPLAY(display), keycode, LockMask | modmask,
-            gdk_x11_window_get_xid (button->priv->window), True,
-		    GrabModeAsync, GrabModeAsync);
-			
+                    gdk_x11_window_get_xid (button->priv->window), True,
+                    GrabModeAsync, GrabModeAsync);
+            
     if (ret == BadAccess)
     {
-	g_warning ("Failed to grab modmask=%u, keycode=%li",
-		   LockMask | modmask, (long int) keycode);
-	return FALSE;
+        g_warning ("Failed to grab modmask=%u, keycode=%li",
+               LockMask | modmask, (long int) keycode);
+        return FALSE;
     }
 
     gdk_flush ();
@@ -201,14 +201,14 @@ parole_button_xevent_key (ParoleButton *button, guint keysym , ParoleButtonKey k
 
     if ( keycode == 0 )
     {
-	g_warning ("could not map keysym %x to keycode\n", keysym);
-	return FALSE;
+        g_warning ("could not map keysym %x to keycode\n", keysym);
+        return FALSE;
     }
     
     if ( !parole_button_grab_keystring(button, keycode)) 
     {
-    	g_warning ("Failed to grab %i\n", keycode);
-	return FALSE;
+        g_warning ("Failed to grab %i\n", keycode);
+        return FALSE;
     }
     
     PAROLE_DEBUG_ENUM_FULL (key, ENUM_GTYPE_BUTTON_KEY, "Grabbed key %li ", (long int) keycode);
@@ -236,8 +236,8 @@ parole_button_setup (ParoleButton *button)
     parole_button_xevent_key (button, XF86XK_AudioPrev, PAROLE_KEY_AUDIO_PREV);
     parole_button_xevent_key (button, XF86XK_AudioNext, PAROLE_KEY_AUDIO_NEXT);
 
-    gdk_window_add_filter (button->priv->window, 
-			   parole_button_filter_x_events, button);
+    gdk_window_add_filter  (button->priv->window, 
+                            parole_button_filter_x_events, button);
 }
 
 /**
diff --git a/src/parole-button.h b/src/parole-button.h
index 7284699..770473a 100644
--- a/src/parole-button.h
+++ b/src/parole-button.h
@@ -48,23 +48,23 @@ typedef struct ParoleButtonPrivate ParoleButtonPrivate;
 
 typedef struct
 {
-    GObject		  	parent;
-    ParoleButtonPrivate        *priv;
+    GObject                 parent;
+    ParoleButtonPrivate     *priv;
     
 } ParoleButton;
 
 typedef struct
 {
-    GObjectClass 		parent_class;
+    GObjectClass            parent_class;
      
-    void                 	(*button_pressed)		        (ParoleButton *button,
-								         ParoleButtonKey type);
+    void                    (*button_pressed)       (ParoleButton *button,
+                                                     ParoleButtonKey type);
     
 } ParoleButtonClass;
 
-GType                 		parole_button_get_type               	(void) G_GNUC_CONST;
+GType                       parole_button_get_type  (void) G_GNUC_CONST;
 
-ParoleButton       	       *parole_button_new             		(void);
+ParoleButton               *parole_button_new       (void);
 
 G_END_DECLS
 
diff --git a/src/parole-conf-dialog.c b/src/parole-conf-dialog.c
index 8ffbec4..1c0dae8 100644
--- a/src/parole-conf-dialog.c
+++ b/src/parole-conf-dialog.c
@@ -41,58 +41,63 @@
  * GtkBuilder Callbacks
  */
 
-void		parole_conf_dialog_response_cb		 	(GtkDialog *dialog, 
-								 gint response_id, 
-								 ParoleConfDialog *self);
-							  
-void		parole_conf_dialog_enable_vis_changed_cb 	(GtkToggleButton *widget,
-								 ParoleConfDialog *self);
-
-void		parole_conf_dialog_reset_saver_changed_cb	(GtkToggleButton *widget,
-								 ParoleConfDialog *self);
-
-void		parole_conf_dialog_vis_plugin_changed_cb 	(GtkComboBox *widget,
-								 ParoleConfDialog *self);
-
-void		parole_conf_dialog_font_set_cb		 	(GtkFontButton *button,
-								 ParoleConfDialog *self);
-
-void		parole_conf_dialog_enable_subtitle_changed_cb 	(GtkToggleButton *widget,
-							         ParoleConfDialog *self);
-	
-void		parole_conf_dialog_subtitle_encoding_changed_cb (GtkComboBox *widget,
-								 ParoleConfDialog *self);
-
-void		brightness_value_changed_cb			(GtkRange *range,
-								 ParoleConfDialog *self);
-
-void		contrast_value_changed_cb			(GtkRange *range,
-								 ParoleConfDialog *self);
-
-void		hue_value_changed_cb				(GtkRange *range,
-								 ParoleConfDialog *self);
-
-void		saturation_value_changed_cb			(GtkRange *range,
-								 ParoleConfDialog *self);
-
-void 	        reset_color_clicked_cb 			        (GtkButton *button, 
-								 ParoleConfDialog *self);
-								 
-void		replace_playlist_toggled_cb			(GtkToggleButton *widget,
-								 ParoleConfDialog *self);
-								 
-void		remove_duplicated_toggled_cb			(GtkToggleButton *widget,
-								 ParoleConfDialog *self);
-
-void		start_playing_opened_toggled_cb			(GtkToggleButton *widget,
-								 ParoleConfDialog *self);
-
-void		remember_playlist_toggled_cb			(GtkToggleButton *widget,
-								 ParoleConfDialog *self);
-								 
-void		multimedia_keys_toggled_cb			(GtkToggleButton *widget,
-								 ParoleConfDialog *self);
-								
+void        parole_conf_dialog_response_cb          (GtkDialog *dialog, 
+                                                     gint response_id, 
+                                                     ParoleConfDialog *self);
+                              
+void        
+parole_conf_dialog_enable_vis_changed_cb            (GtkToggleButton *widget,
+                                                     ParoleConfDialog *self);
+
+void        
+parole_conf_dialog_reset_saver_changed_cb           (GtkToggleButton *widget,
+                                                     ParoleConfDialog *self);
+
+void        
+parole_conf_dialog_vis_plugin_changed_cb            (GtkComboBox *widget,
+                                                     ParoleConfDialog *self);
+
+void        parole_conf_dialog_font_set_cb          (GtkFontButton *button,
+                                                     ParoleConfDialog *self);
+
+void        
+parole_conf_dialog_enable_subtitle_changed_cb       (GtkToggleButton *widget,
+                                                     ParoleConfDialog *self);
+    
+void        
+parole_conf_dialog_subtitle_encoding_changed_cb     (GtkComboBox *widget,
+                                                     ParoleConfDialog *self);
+
+void        brightness_value_changed_cb             (GtkRange *range,
+                                                     ParoleConfDialog *self);
+
+void        contrast_value_changed_cb               (GtkRange *range,
+                                                     ParoleConfDialog *self);
+
+void        hue_value_changed_cb                    (GtkRange *range,
+                                                     ParoleConfDialog *self);
+
+void        saturation_value_changed_cb             (GtkRange *range,
+                                                     ParoleConfDialog *self);
+
+void        reset_color_clicked_cb                  (GtkButton *button, 
+                                                     ParoleConfDialog *self);
+                                 
+void        replace_playlist_toggled_cb             (GtkToggleButton *widget,
+                                                     ParoleConfDialog *self);
+                                 
+void        remove_duplicated_toggled_cb            (GtkToggleButton *widget,
+                                                     ParoleConfDialog *self);
+
+void        start_playing_opened_toggled_cb         (GtkToggleButton *widget,
+                                                     ParoleConfDialog *self);
+
+void        remember_playlist_toggled_cb            (GtkToggleButton *widget,
+                                                     ParoleConfDialog *self);
+                                 
+void        multimedia_keys_toggled_cb              (GtkToggleButton *widget,
+                                                     ParoleConfDialog *self);
+                                
 /*
  * End of GtkBuilder callbacks
  */
@@ -131,39 +136,39 @@ parole_conf_dialog_destroy (GtkWidget *widget, ParoleConfDialog *self)
 void replace_playlist_toggled_cb (GtkToggleButton *widget, ParoleConfDialog *self)
 {
     g_object_set (G_OBJECT (self->priv->conf),
-		  "replace-playlist", gtk_toggle_button_get_active (widget),
-		  NULL);
+                  "replace-playlist", gtk_toggle_button_get_active (widget),
+                  NULL);
 }
-		
-/* Remove duplicate entries from the playlist FIXME */						 
+        
+/* Remove duplicate entries from the playlist FIXME */                       
 void remove_duplicated_toggled_cb (GtkToggleButton *widget, ParoleConfDialog *self)
 {
     g_object_set (G_OBJECT (self->priv->conf),
-		  "remove-duplicated", gtk_toggle_button_get_active (widget),
-		  NULL);
+                  "remove-duplicated", gtk_toggle_button_get_active (widget),
+                  NULL);
 }
 
 /* Automatically start playing opened files (vs. just adding them to the playlist) */
 void start_playing_opened_toggled_cb (GtkToggleButton *widget, ParoleConfDialog *self)
 {
     g_object_set (G_OBJECT (self->priv->conf),
-		  "play-opened-files", gtk_toggle_button_get_active (widget),
-		  NULL);
+                  "play-opened-files", gtk_toggle_button_get_active (widget),
+                  NULL);
 }
 
 /* Remember whether the playlist was visible in the previous session */
 void remember_playlist_toggled_cb (GtkToggleButton *widget, ParoleConfDialog *self)
 {
     g_object_set (G_OBJECT (self->priv->conf),
-		  "remember-playlist", gtk_toggle_button_get_active (widget),
-		  NULL);
+                  "remember-playlist", gtk_toggle_button_get_active (widget),
+                  NULL);
 }
 
 void multimedia_keys_toggled_cb (GtkToggleButton *widget, ParoleConfDialog *self)
 {
     g_object_set (G_OBJECT (self->priv->conf),
-		  "multimedia-keys", gtk_toggle_button_get_active (widget),
-		  NULL);
+                  "multimedia-keys", gtk_toggle_button_get_active (widget),
+                  NULL);
 }
 
 /* Change the various image properties */
@@ -179,11 +184,11 @@ void parole_conf_dialog_response_cb (GtkDialog *dialog, gint response_id, Parole
 {
     switch (response_id)
     {
-	case GTK_RESPONSE_HELP:
-	    break;
-	default:
-	    parole_conf_dialog_destroy (GTK_WIDGET (dialog), self);
-	    break;
+        case GTK_RESPONSE_HELP:
+            break;
+        default:
+            parole_conf_dialog_destroy (GTK_WIDGET (dialog), self);
+            break;
     }
 }
 
@@ -191,8 +196,8 @@ void parole_conf_dialog_response_cb (GtkDialog *dialog, gint response_id, Parole
 void parole_conf_dialog_subtitle_encoding_changed_cb (GtkComboBox *widget, ParoleConfDialog *self)
 {
     g_object_set (G_OBJECT (self->priv->conf), 
-		  "subtitle-encoding", parole_subtitle_encoding_get_selected (widget),
-		  NULL);
+                  "subtitle-encoding", parole_subtitle_encoding_get_selected (widget),
+                  NULL);
 }
 
 /* Enable visualisations */
@@ -203,8 +208,8 @@ void parole_conf_dialog_enable_vis_changed_cb (GtkToggleButton *widget, ParoleCo
     active = gtk_toggle_button_get_active (widget);
     
     g_object_set (G_OBJECT (self->priv->conf),
-		  "vis-enabled", active,
-		  NULL);
+                  "vis-enabled", active,
+                  NULL);
     
     gtk_widget_set_sensitive (self->priv->vis_combox, active);
 }
@@ -217,9 +222,9 @@ set_effect_value (ParoleConfDialog *self, GtkRange *range, const gchar *name)
     
     value = gtk_range_get_value (range);
     
-    g_object_set (G_OBJECT (self->priv->conf),	
-		  name, value,
-		  NULL);
+    g_object_set (G_OBJECT (self->priv->conf),  
+                  name, value,
+                  NULL);
 }
 
 /* Change brightness */
@@ -261,9 +266,9 @@ void parole_conf_dialog_vis_plugin_changed_cb (GtkComboBox *widget,  ParoleConfD
     
     if ( f )
     {
-	g_object_set (G_OBJECT (self->priv->conf),
-		      "vis-name", gst_object_get_name (GST_OBJECT (f)),
-		      NULL);
+        g_object_set (G_OBJECT (self->priv->conf),
+                      "vis-name", gst_object_get_name (GST_OBJECT (f)),
+                      NULL);
     }
     
     g_free (active);
@@ -272,16 +277,16 @@ void parole_conf_dialog_vis_plugin_changed_cb (GtkComboBox *widget,  ParoleConfD
 void parole_conf_dialog_reset_saver_changed_cb (GtkToggleButton *widget, ParoleConfDialog *self)
 {
     g_object_set (G_OBJECT (self->priv->conf),
-		  "reset-saver", gtk_toggle_button_get_active (widget),
-		  NULL);
+                  "reset-saver", gtk_toggle_button_get_active (widget),
+                  NULL);
 }
 
 /* Change subtitle font */
 void parole_conf_dialog_font_set_cb (GtkFontButton *button, ParoleConfDialog *self)
 {
     g_object_set (G_OBJECT (self->priv->conf), 
-		  "subtitle-font", gtk_font_button_get_font_name (button),
-		  NULL);
+                  "subtitle-font", gtk_font_button_get_font_name (button),
+                  NULL);
 }
 
 /* Enable subtitles by default */
@@ -292,8 +297,8 @@ void parole_conf_dialog_enable_subtitle_changed_cb (GtkToggleButton *widget, Par
     active = gtk_toggle_button_get_active (widget);
     
     g_object_set (G_OBJECT (self->priv->conf),
-		  "enable-subtitle", active,
-		  NULL);
+                  "enable-subtitle", active,
+                  NULL);
 }
 
 /* Finalize the dialog */
@@ -347,7 +352,7 @@ parole_conf_dialog_add_vis_plugins (gpointer key, gpointer value, GtkWidget *com
 /* Set the combobox to the default visualisation plugin */
 static gboolean 
 parole_conf_dialog_set_default_vis_plugin (GtkTreeModel *model, GtkTreePath *path,
-					   GtkTreeIter *iter, ParoleConfDialog *self)
+                       GtkTreeIter *iter, ParoleConfDialog *self)
 {
     GstElementFactory *f;
     gchar *vis_name;
@@ -355,27 +360,27 @@ parole_conf_dialog_set_default_vis_plugin (GtkTreeModel *model, GtkTreePath *pat
     gboolean ret = FALSE;
     
     g_object_get (G_OBJECT (self->priv->conf),
-		  "vis-name", &vis_name,
-		  NULL);
+                  "vis-name", &vis_name,
+                  NULL);
 
     gtk_tree_model_get (model, iter, 
-			0, &combox_text,
-			-1);
+                        0, &combox_text,
+                        -1);
 
     f = g_hash_table_lookup (self->priv->vis_plugins, combox_text);
     
     if ( !g_strcmp0 (vis_name, "none") )
     {
-	if ( !g_strcmp0 (gst_object_get_name (GST_OBJECT (f)), "Goom") )
-	    ret = TRUE;
+        if ( !g_strcmp0 (gst_object_get_name (GST_OBJECT (f)), "Goom") )
+            ret = TRUE;
     }
     else if ( !g_strcmp0 (gst_object_get_name (GST_OBJECT (f)), vis_name) )
     {
-	ret = TRUE;
+        ret = TRUE;
     }
     
     if ( ret == TRUE )
-	gtk_combo_box_set_active_iter (GTK_COMBO_BOX (self->priv->vis_combox), iter);
+        gtk_combo_box_set_active_iter (GTK_COMBO_BOX (self->priv->vis_combox), iter);
     
     return ret;
 }
@@ -393,9 +398,9 @@ parole_conf_dialog_set_defaults_playlist (ParoleConfDialog  *self, GtkBuilder *b
     widget = GTK_WIDGET (gtk_builder_get_object (builder, "replace-playlist"));
     
     g_object_get (G_OBJECT (self->priv->conf),
-		  "replace-playlist", &option,
-		  NULL);
-		  
+                  "replace-playlist", &option,
+                  NULL);
+          
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), option);
     
      /**
@@ -404,9 +409,9 @@ parole_conf_dialog_set_defaults_playlist (ParoleConfDialog  *self, GtkBuilder *b
     widget = GTK_WIDGET (gtk_builder_get_object (builder, "start-playing-opened"));
     
     g_object_get (G_OBJECT (self->priv->conf),
-		  "play-opened-files", &option,
-		  NULL);
-		  
+                  "play-opened-files", &option,
+                  NULL);
+          
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), option);
     
      /**
@@ -415,9 +420,9 @@ parole_conf_dialog_set_defaults_playlist (ParoleConfDialog  *self, GtkBuilder *b
     widget = GTK_WIDGET (gtk_builder_get_object (builder, "remove-duplicated"));
     
     g_object_get (G_OBJECT (self->priv->conf),
-		  "remove-duplicated", &option,
-		  NULL);
-		  
+                  "remove-duplicated", &option,
+                  NULL);
+          
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), option);
 }
 
@@ -434,9 +439,9 @@ parole_conf_dialog_set_defaults_general (ParoleConfDialog *self, GtkBuilder *bui
     widget = GTK_WIDGET (gtk_builder_get_object (builder, "multimedia-keys"));
     
     g_object_get (G_OBJECT (self->priv->conf),
-		  "multimedia-keys", &option,
-		  NULL);
-		  
+                  "multimedia-keys", &option,
+                  NULL);
+          
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), option);
     
 }
@@ -452,11 +457,11 @@ parole_conf_dialog_set_defaults (ParoleConfDialog *self)
     gchar *subtitle_encoding;
     
     g_object_get (G_OBJECT (self->priv->conf),
-		  "vis-enabled", &vis_enabled,
-		  "enable-subtitle", &subtitle,
-		  "subtitle-font", &subtitle_font,
-		  "subtitle-encoding", &subtitle_encoding,
-		  NULL);
+                  "vis-enabled", &vis_enabled,
+                  "enable-subtitle", &subtitle,
+                  "subtitle-font", &subtitle_font,
+                  "subtitle-encoding", &subtitle_encoding,
+                  NULL);
 
     /* Update widget-states according to settings */
     gtk_widget_set_sensitive (self->priv->vis_combox, vis_enabled);
@@ -468,9 +473,9 @@ parole_conf_dialog_set_defaults (ParoleConfDialog *self)
     model = gtk_combo_box_get_model (GTK_COMBO_BOX (self->priv->vis_combox));
 
     gtk_tree_model_foreach (model, 
-			    (GtkTreeModelForeachFunc) parole_conf_dialog_set_default_vis_plugin,
-			    self);
-			    
+                            (GtkTreeModelForeachFunc) parole_conf_dialog_set_default_vis_plugin,
+                            self);
+                
     parole_subtitle_encoding_set (GTK_COMBO_BOX (self->priv->encoding), subtitle_encoding);
     
     gtk_font_button_set_font_name (GTK_FONT_BUTTON (self->priv->font_button), subtitle_font);
@@ -518,47 +523,47 @@ void parole_conf_dialog_open (ParoleConfDialog *self, GtkWidget *parent)
     parole_conf_dialog_set_defaults_playlist (self, builder);
     
     g_object_get (G_OBJECT (self->priv->conf),
-		  "reset-saver", &reset_saver,
-		  NULL);
+                  "reset-saver", &reset_saver,
+                  NULL);
     
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (builder, "reset-saver")),
-				  reset_saver);
+                  reset_saver);
     
     with_display = parole_gst_get_is_xvimage_sink (PAROLE_GST (parole_gst_get ()));
     
     if ( !with_display )
     {
-	gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (builder, "frame-display")));
+        gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (builder, "frame-display")));
     }
     else
     {
-	gint brightness_value;
-	gint contrast_value;
-	gint hue_value;
-	gint saturation_value;
-	
-	self->priv->brightness = GTK_WIDGET (gtk_builder_get_object (builder, "brightness"));
-	self->priv->contrast = GTK_WIDGET (gtk_builder_get_object (builder, "contrast"));
-	self->priv->hue = GTK_WIDGET (gtk_builder_get_object (builder, "hue"));
-	self->priv->saturation = GTK_WIDGET (gtk_builder_get_object (builder, "saturation"));
-	
-	gtk_range_set_range (GTK_RANGE (self->priv->brightness), -1000, 1000);
-	gtk_range_set_range (GTK_RANGE (self->priv->contrast), -1000, 1000);
-	gtk_range_set_range (GTK_RANGE (self->priv->saturation), -1000, 1000);
-	gtk_range_set_range (GTK_RANGE (self->priv->hue), -1000, 1000);
-
-	g_object_get (G_OBJECT (self->priv->conf),
-		      "brightness", &brightness_value,
-		      "contrast", &contrast_value,
-		      "hue", &hue_value,
-		      "saturation", &saturation_value,
-		      NULL);
-	
-	gtk_range_set_value (GTK_RANGE (self->priv->brightness), brightness_value);
-	gtk_range_set_value (GTK_RANGE (self->priv->contrast), contrast_value);
-	gtk_range_set_value (GTK_RANGE (self->priv->hue), hue_value);
-	gtk_range_set_value (GTK_RANGE (self->priv->saturation), saturation_value);
-	
+        gint brightness_value;
+        gint contrast_value;
+        gint hue_value;
+        gint saturation_value;
+        
+        self->priv->brightness = GTK_WIDGET (gtk_builder_get_object (builder, "brightness"));
+        self->priv->contrast = GTK_WIDGET (gtk_builder_get_object (builder, "contrast"));
+        self->priv->hue = GTK_WIDGET (gtk_builder_get_object (builder, "hue"));
+        self->priv->saturation = GTK_WIDGET (gtk_builder_get_object (builder, "saturation"));
+        
+        gtk_range_set_range (GTK_RANGE (self->priv->brightness), -1000, 1000);
+        gtk_range_set_range (GTK_RANGE (self->priv->contrast), -1000, 1000);
+        gtk_range_set_range (GTK_RANGE (self->priv->saturation), -1000, 1000);
+        gtk_range_set_range (GTK_RANGE (self->priv->hue), -1000, 1000);
+
+        g_object_get (G_OBJECT (self->priv->conf),
+                      "brightness", &brightness_value,
+                      "contrast", &contrast_value,
+                      "hue", &hue_value,
+                      "saturation", &saturation_value,
+                      NULL);
+        
+        gtk_range_set_value (GTK_RANGE (self->priv->brightness), brightness_value);
+        gtk_range_set_value (GTK_RANGE (self->priv->contrast), contrast_value);
+        gtk_range_set_value (GTK_RANGE (self->priv->hue), hue_value);
+        gtk_range_set_value (GTK_RANGE (self->priv->saturation), saturation_value);
+    
     }
     
     gtk_builder_connect_signals (builder, self);
diff --git a/src/parole-conf-dialog.h b/src/parole-conf-dialog.h
index 564fc92..ee1ec49 100644
--- a/src/parole-conf-dialog.h
+++ b/src/parole-conf-dialog.h
@@ -36,22 +36,22 @@ typedef struct ParoleConfDialogPrivate ParoleConfDialogPrivate;
 
 typedef struct
 {
-    GObject         		 parent;
-    ParoleConfDialogPrivate     *priv;
+    GObject                     parent;
+    ParoleConfDialogPrivate    *priv;
     
 } ParoleConfDialog;
 
 typedef struct
 {
-    GObjectClass 		 parent_class;
+    GObjectClass                parent_class;
     
 } ParoleConfDialogClass;
 
-GType        			 parole_conf_dialog_get_type        (void) G_GNUC_CONST;
-ParoleConfDialog       		*parole_conf_dialog_new             (void);
+GType                   parole_conf_dialog_get_type     (void) G_GNUC_CONST;
+ParoleConfDialog       *parole_conf_dialog_new          (void);
 
-void				 parole_conf_dialog_open	    (ParoleConfDialog *self,
-								     GtkWidget *parent);
+void                    parole_conf_dialog_open         (ParoleConfDialog *self,
+                                                         GtkWidget *parent);
 
 G_END_DECLS
 
diff --git a/src/parole-conf.c b/src/parole-conf.c
index 84a6cec..d6c9163 100644
--- a/src/parole-conf.c
+++ b/src/parole-conf.c
@@ -150,7 +150,7 @@ static void parole_conf_set_property (GObject *object,
 
     /* leave if the channel is not set */
     if (G_UNLIKELY (conf->channel == NULL))
-    return;
+        return;
 
     /* build property name */
     g_snprintf (prop_name, sizeof (prop_name), "/%s", g_param_spec_get_name (pspec));
@@ -348,13 +348,13 @@ parole_conf_class_init (ParoleConfClass *klass)
     object_class->set_property = parole_conf_set_property;
 
     if (!g_value_type_transformable (G_TYPE_STRING, G_TYPE_INT))
-    g_value_register_transform_func (G_TYPE_STRING, G_TYPE_INT, transform_string_to_int);
+        g_value_register_transform_func (G_TYPE_STRING, G_TYPE_INT, transform_string_to_int);
 
     if (!g_value_type_transformable (G_TYPE_STRING, G_TYPE_BOOLEAN))
-    g_value_register_transform_func (G_TYPE_STRING, G_TYPE_BOOLEAN, transform_string_to_boolean);
+        g_value_register_transform_func (G_TYPE_STRING, G_TYPE_BOOLEAN, transform_string_to_boolean);
     
     if (!g_value_type_transformable (G_TYPE_STRING, GST_ENUM_TYPE_ASPECT_RATIO))
-    g_value_register_transform_func (G_TYPE_STRING, GST_ENUM_TYPE_ASPECT_RATIO, transform_string_to_enum);
+        g_value_register_transform_func (G_TYPE_STRING, GST_ENUM_TYPE_ASPECT_RATIO, transform_string_to_enum);
 
     /**
      * ParoleConf:vis-enabled:
@@ -381,10 +381,10 @@ parole_conf_class_init (ParoleConfClass *klass)
     g_object_class_install_property (object_class,
                                      PROP_VIS_NAME,
                                      g_param_spec_string  ("vis-name",
-                                                           "/audio/visualization-name", 
-                                                           NULL,
-                                                           "none",
-                                                           G_PARAM_READWRITE));
+                                            "/audio/visualization-name", 
+                                            NULL,
+                                            "none",
+                                            G_PARAM_READWRITE));
 
     /**
      * ParoleConf:volume:
@@ -396,12 +396,12 @@ parole_conf_class_init (ParoleConfClass *klass)
     g_object_class_install_property (object_class,
                                      PROP_VOLUME,
                                      g_param_spec_int ("volume",
-                                                       "/audio/volume", 
-                                                       NULL,
-                                                       0,
-                                                       100,
-                                                       50,
-                                                       G_PARAM_READWRITE));
+                                            "/audio/volume", 
+                                            NULL,
+                                            0,
+                                            100,
+                                            50,
+                                            G_PARAM_READWRITE));
 
     /**
      * ParoleConf:iso-image-folder:
@@ -413,10 +413,10 @@ parole_conf_class_init (ParoleConfClass *klass)
     g_object_class_install_property (object_class,
                                      PROP_ISO_IMAGE_FOLDER,
                                      g_param_spec_string  ("iso-image-folder",
-                                                           "/folders/last-used-iso", 
-                                                           NULL,
-                                                           "none",
-                                                           G_PARAM_READWRITE));
+                                            "/folders/last-used-iso", 
+                                            NULL,
+                                            "none",
+                                            G_PARAM_READWRITE));
 
     /**
      * ParoleConf:media-chooser-folder:
@@ -428,10 +428,10 @@ parole_conf_class_init (ParoleConfClass *klass)
     g_object_class_install_property (object_class,
                                      PROP_MEDIA_CHOOSER_FOLDER,
                                      g_param_spec_string  ("media-chooser-folder",
-                                                           "/folders/last-used-media", 
-                                                           NULL,
-                                                           "none",
-                                                           G_PARAM_READWRITE));
+                                            "/folders/last-used-media", 
+                                            NULL,
+                                            "none",
+                                            G_PARAM_READWRITE));
 
     /**
      * ParoleConf:multimedia-keys:
@@ -443,10 +443,10 @@ parole_conf_class_init (ParoleConfClass *klass)
     g_object_class_install_property (object_class,
                                      PROP_MULTIMEDIA_KEYS,
                                      g_param_spec_boolean ("multimedia-keys",
-                                                           "/parole/multimedia-keys", 
-                                                           NULL,
-                                                           TRUE,
-                                                           G_PARAM_READWRITE));
+                                            "/parole/multimedia-keys", 
+                                            NULL,
+                                            TRUE,
+                                            G_PARAM_READWRITE));
 
     /**
      * ParoleConf:plugins:
@@ -458,10 +458,10 @@ parole_conf_class_init (ParoleConfClass *klass)
     g_object_class_install_property (object_class,
                                      PROP_PLUGINS,
                                      g_param_spec_string  ("plugins",
-                                                           "/parole/plugins", 
-                                                           NULL,
-                                                           "none",
-                                                           G_PARAM_READWRITE));
+                                            "/parole/plugins", 
+                                            NULL,
+                                            "none",
+                                            G_PARAM_READWRITE));
 
     /**
      * ParoleConf:scan-recursive:
@@ -473,10 +473,10 @@ parole_conf_class_init (ParoleConfClass *klass)
     g_object_class_install_property (object_class,
                                      PROP_SCAN_FOLDER_RECURSIVELY,
                                      g_param_spec_boolean ("scan-recursive",
-                                                           "/parole/scan-recursive", 
-                                                           NULL,
-                                                           TRUE,
-                                                           G_PARAM_READWRITE));
+                                            "/parole/scan-recursive", 
+                                            NULL,
+                                            TRUE,
+                                            G_PARAM_READWRITE));
 
     /**
      * ParoleConf:remember-playlist:
@@ -488,10 +488,10 @@ parole_conf_class_init (ParoleConfClass *klass)
     g_object_class_install_property (object_class,
                                      PROP_REMEMBER_PLAYLIST,
                                      g_param_spec_boolean ("remember-playlist",
-                                                           "/playlist/remember-playlist", 
-                                                           NULL,
-                                                           FALSE,
-                                                           G_PARAM_READWRITE));
+                                            "/playlist/remember-playlist", 
+                                            NULL,
+                                            FALSE,
+                                            G_PARAM_READWRITE));
 
     /**
      * ParoleConf:remove-duplicated:
@@ -503,10 +503,10 @@ parole_conf_class_init (ParoleConfClass *klass)
     g_object_class_install_property (object_class,
                                      PROP_REMOVE_DUPLICATED_PLAYLIST_ENTRIES,
                                      g_param_spec_boolean ("remove-duplicated",
-                                                           "/playlist/remove-duplicates", 
-                                                           NULL,
-                                                           FALSE,
-                                                           G_PARAM_READWRITE));
+                                            "/playlist/remove-duplicates", 
+                                            NULL,
+                                            FALSE,
+                                            G_PARAM_READWRITE));
 
     /**
      * ParoleConf:repeat:
@@ -518,10 +518,10 @@ parole_conf_class_init (ParoleConfClass *klass)
     g_object_class_install_property (object_class,
                                      PROP_REPEAT,
                                      g_param_spec_boolean ("repeat",
-                                                           "/playlist/repeat", 
-                                                           NULL,
-                                                           FALSE,
-                                                           G_PARAM_READWRITE));
+                                            "/playlist/repeat", 
+                                            NULL,
+                                            FALSE,
+                                            G_PARAM_READWRITE));
 
     /**
      * ParoleConf:replace-playlist:
@@ -534,10 +534,10 @@ parole_conf_class_init (ParoleConfClass *klass)
     g_object_class_install_property (object_class,
                                      PROP_REPLACE_PLAYLIST,
                                      g_param_spec_boolean ("replace-playlist",
-                                                           "/playlist/replace-playlist", 
-                                                           NULL,
-                                                           FALSE,
-                                                           G_PARAM_READWRITE));
+                                            "/playlist/replace-playlist", 
+                                            NULL,
+                                            FALSE,
+                                            G_PARAM_READWRITE));
 
     /**
      * ParoleConf:showhide-playlist:
@@ -549,10 +549,10 @@ parole_conf_class_init (ParoleConfClass *klass)
     g_object_class_install_property (object_class,
                                      PROP_SHOWHIDE_PLAYLIST,
                                      g_param_spec_boolean ("showhide-playlist",
-                                                           "/playlist/show-playlist", 
-                                                           NULL,
-                                                           FALSE,
-                                                           G_PARAM_READWRITE));
+                                            "/playlist/show-playlist", 
+                                            NULL,
+                                            FALSE,
+                                            G_PARAM_READWRITE));
 
     /**
      * ParoleConf:shuffle:
@@ -564,10 +564,10 @@ parole_conf_class_init (ParoleConfClass *klass)
     g_object_class_install_property (object_class,
                                      PROP_SHUFFLE,
                                      g_param_spec_boolean ("shuffle",
-                                                           "/playlist/shuffle", 
-                                                           NULL,
-                                                           FALSE,
-                                                           G_PARAM_READWRITE));
+                                            "/playlist/shuffle", 
+                                            NULL,
+                                            FALSE,
+                                            G_PARAM_READWRITE));
 
     /**
      * ParoleConf:play-opened-files:
@@ -580,10 +580,10 @@ parole_conf_class_init (ParoleConfClass *klass)
     g_object_class_install_property (object_class,
                                      PROP_START_PLAYING_OPENED_FILES,
                                      g_param_spec_boolean ("play-opened-files",
-                                                           "/playlist/play-opened-files", 
-                                                           NULL,
-                                                           TRUE,
-                                                           G_PARAM_READWRITE));
+                                            "/playlist/play-opened-files", 
+                                            NULL,
+                                            TRUE,
+                                            G_PARAM_READWRITE));
 
     /**
      * ParoleConf:enable-subtitle:
@@ -595,10 +595,10 @@ parole_conf_class_init (ParoleConfClass *klass)
     g_object_class_install_property (object_class,
                                      PROP_SUBTITLE_ENABLED,
                                      g_param_spec_boolean ("enable-subtitle",
-                                                           "/subtitles/enabled", 
-                                                           NULL,
-                                                           TRUE,
-                                                           G_PARAM_READWRITE));
+                                            "/subtitles/enabled", 
+                                            NULL,
+                                            TRUE,
+                                            G_PARAM_READWRITE));
 
     /**
      * ParoleConf:subtitle-encoding:
@@ -610,10 +610,10 @@ parole_conf_class_init (ParoleConfClass *klass)
     g_object_class_install_property (object_class,
                                      PROP_SUBTITLE_ENCODING,
                                      g_param_spec_string  ("subtitle-encoding",
-                                                           "/subtitles/encoding", 
-                                                           NULL,
-                                                           "UTF-8",
-                                                           G_PARAM_READWRITE));
+                                            "/subtitles/encoding", 
+                                            NULL,
+                                            "UTF-8",
+                                            G_PARAM_READWRITE));
     
     /**
      * ParoleConf:subtitle-font:
@@ -625,10 +625,10 @@ parole_conf_class_init (ParoleConfClass *klass)
     g_object_class_install_property (object_class,
                                      PROP_SUBTITLE_FONT,
                                      g_param_spec_string  ("subtitle-font",
-                                                           "/subtitles/font", 
-                                                           NULL,
-                                                           "Sans Bold 20",
-                                                           G_PARAM_READWRITE));
+                                            "/subtitles/font", 
+                                            NULL,
+                                            "Sans Bold 20",
+                                            G_PARAM_READWRITE));
 
     /**
      * ParoleConf:aspect-ratio:
@@ -640,11 +640,11 @@ parole_conf_class_init (ParoleConfClass *klass)
     g_object_class_install_property (object_class,
                                      PROP_ASPECT_RATIO,
                                      g_param_spec_enum ("aspect-ratio",
-                                                        "/video/aspect-ratio", 
-                                                        NULL,
-                                                        GST_ENUM_TYPE_ASPECT_RATIO,
-                                                        PAROLE_ASPECT_RATIO_AUTO,
-                                                        G_PARAM_READWRITE));
+                                            "/video/aspect-ratio", 
+                                            NULL,
+                                            GST_ENUM_TYPE_ASPECT_RATIO,
+                                            PAROLE_ASPECT_RATIO_AUTO,
+                                            G_PARAM_READWRITE));
 
     /**
      * ParoleConf:brightness:
@@ -656,12 +656,12 @@ parole_conf_class_init (ParoleConfClass *klass)
     g_object_class_install_property (object_class,
                                      PROP_BRIGHTNESS,
                                      g_param_spec_int ("brightness",
-                                                       "/video/brightness", 
-                                                       NULL,
-                                                       -1000,
-                                                       1000,
-                                                       0,
-                                                       G_PARAM_READWRITE));
+                                            "/video/brightness", 
+                                            NULL,
+                                            -1000,
+                                            1000,
+                                            0,
+                                            G_PARAM_READWRITE));
 
     /**
      * ParoleConf:contrast:
@@ -673,12 +673,12 @@ parole_conf_class_init (ParoleConfClass *klass)
     g_object_class_install_property (object_class,
                                      PROP_CONTRAST,
                                      g_param_spec_int ("contrast",
-                                                       "/video/contrast", 
-                                                       NULL,
-                                                       -1000,
-                                                       1000,
-                                                       0,
-                                                       G_PARAM_READWRITE));
+                                            "/video/contrast", 
+                                            NULL,
+                                            -1000,
+                                            1000,
+                                            0,
+                                            G_PARAM_READWRITE));
 
     /**
      * ParoleConf:reset-saver:
@@ -690,10 +690,10 @@ parole_conf_class_init (ParoleConfClass *klass)
     g_object_class_install_property (object_class,
                                      PROP_DISABLE_SCREEN_SAVER,
                                      g_param_spec_boolean ("reset-saver",
-                                                           "/video/disable-screensaver",
-                                                           NULL,
-                                                           TRUE,
-                                                           G_PARAM_READWRITE));
+                                            "/video/disable-screensaver",
+                                            NULL,
+                                            TRUE,
+                                            G_PARAM_READWRITE));
 
     /**
      * ParoleConf:enable-xv:
@@ -705,10 +705,10 @@ parole_conf_class_init (ParoleConfClass *klass)
     g_object_class_install_property (object_class,
                                      PROP_ENABLE_XV,
                                      g_param_spec_boolean ("enable-xv",
-                                                           "/video/enable-xv", 
-                                                           NULL,
-                                                           TRUE,
-                                                           G_PARAM_READWRITE));
+                                            "/video/enable-xv", 
+                                            NULL,
+                                            TRUE,
+                                            G_PARAM_READWRITE));
 
     /**
      * ParoleConf:hue:
@@ -720,12 +720,12 @@ parole_conf_class_init (ParoleConfClass *klass)
     g_object_class_install_property (object_class,
                                      PROP_HUE,
                                      g_param_spec_int ("hue",
-                                                       "/video/hue", 
-                                                       NULL,
-                                                       -1000,
-                                                       1000,
-                                                       0,
-                                                       G_PARAM_READWRITE));
+                                            "/video/hue", 
+                                            NULL,
+                                            -1000,
+                                            1000,
+                                            0,
+                                            G_PARAM_READWRITE));
 
     /**
      * ParoleConf:saturation:
@@ -737,12 +737,12 @@ parole_conf_class_init (ParoleConfClass *klass)
     g_object_class_install_property (object_class,
                                      PROP_SATURATION,
                                      g_param_spec_int ("saturation",
-                                                       "/video/saturation", 
-                                                       NULL,
-                                                       -1000,
-                                                       1000,
-                                                       0,
-                                                       G_PARAM_READWRITE));
+                                            "/video/saturation", 
+                                            NULL,
+                                            -1000,
+                                            1000,
+                                            0,
+                                            G_PARAM_READWRITE));
 
     /**
      * ParoleConf:window-height:
@@ -754,12 +754,12 @@ parole_conf_class_init (ParoleConfClass *klass)
     g_object_class_install_property (object_class,
                                      PROP_WINDOW_HEIGHT,
                                      g_param_spec_int ("window-height",
-                                                       "/window/height", 
-                                                       NULL,
-                                                       1,
-                                                       G_MAXINT16,
-                                                       420,
-                                                       G_PARAM_READWRITE));
+                                            "/window/height", 
+                                            NULL,
+                                            1,
+                                            G_MAXINT16,
+                                            420,
+                                            G_PARAM_READWRITE));
 
     /**
      * ParoleConf:minimized:
@@ -771,10 +771,10 @@ parole_conf_class_init (ParoleConfClass *klass)
     g_object_class_install_property (object_class,
                                      PROP_MINIMIZED,
                                      g_param_spec_boolean ("minimized",
-                                                           "/window/minimized", 
-                                                           NULL,
-                                                           FALSE,
-                                                           G_PARAM_READWRITE));
+                                            "/window/minimized", 
+                                            NULL,
+                                            FALSE,
+                                            G_PARAM_READWRITE));
 
     /**
      * ParoleConf:window-width:
@@ -786,12 +786,12 @@ parole_conf_class_init (ParoleConfClass *klass)
     g_object_class_install_property (object_class,
                                      PROP_WINDOW_WIDTH,
                                      g_param_spec_int ("window-width",
-                                                       "/window/width", 
-                                                       NULL,
-                                                       1,
-                                                       G_MAXINT16,
-                                                       760,
-                                                       G_PARAM_READWRITE));
+                                            "/window/width", 
+                                            NULL,
+                                            1,
+                                            G_MAXINT16,
+                                            760,
+                                            G_PARAM_READWRITE));
 
 }
 
@@ -908,7 +908,7 @@ parole_conf_init (ParoleConf *conf)
 
         /* set the string we check */
         if (!xfconf_channel_has_property (conf->channel, check_prop))
-        xfconf_channel_set_string (conf->channel, check_prop, "Sans Bold 20");
+            xfconf_channel_set_string (conf->channel, check_prop, "Sans Bold 20");
     }
 
     conf->property_changed_id =
@@ -971,9 +971,9 @@ parole_conf_write_entry_list (ParoleConf *conf, const gchar *name, gchar **value
         if (value[i] && g_strcmp0(value[i], "") != 0 && g_strcmp0(value[i], "none") != 0 )
         {
             if (count == 0)
-            value_string = g_strdup(value[i]);
+                value_string = g_strdup(value[i]);
             else
-            value_string = g_strconcat (value_string, ";", value[i], NULL);
+                value_string = g_strconcat (value_string, ";", value[i], NULL);
             count++;
         }
     }
diff --git a/src/parole-conf.h b/src/parole-conf.h
index 1913c61..2035bf3 100644
--- a/src/parole-conf.h
+++ b/src/parole-conf.h
@@ -44,12 +44,12 @@ ParoleConf              *parole_conf_new                (void);
 gboolean                 parole_conf_get_property_bool  (ParoleConf *conf,
                                                          const gchar *name);
                                                          
-gchar	       	       **parole_conf_read_entry_list	(ParoleConf *conf,
+gchar                  **parole_conf_read_entry_list    (ParoleConf *conf,
                                                          const gchar *name);
-							                             
-void 			         parole_conf_write_entry_list	(ParoleConf *conf, 
-							                             const gchar *name,
-							                             gchar **value);	                             
+                                                         
+void                     parole_conf_write_entry_list   (ParoleConf *conf, 
+                                                         const gchar *name,
+                                                         gchar **value);                                 
                      
 void                     parole_conf_xfconf_init_failed (void);
 
diff --git a/src/parole-disc.c b/src/parole-disc.c
index de70051..e85104d 100644
--- a/src/parole-disc.c
+++ b/src/parole-disc.c
@@ -95,10 +95,10 @@ free_mount_data (gpointer data)
     mount = (MountData *) data;
     
     if ( mount->uri )
-	g_free (mount->uri);
+	    g_free (mount->uri);
 	
     if ( mount->device )
-	g_free (mount->device);
+	    g_free (mount->device);
 	
     g_free (mount);
 }
@@ -111,13 +111,13 @@ parole_disc_set_label(ParoleDisc *disc, const gchar *label)
     
     if ( g_strcmp0(label, _("Insert Disc")) != 0 )
     {
-    menu_label = g_strdup_printf ("%s '%s'", _("Play Disc"), label);
-    g_signal_emit (G_OBJECT (disc), signals [LABEL_CHANGED], 0, label);
+        menu_label = g_strdup_printf ("%s '%s'", _("Play Disc"), label);
+        g_signal_emit (G_OBJECT (disc), signals [LABEL_CHANGED], 0, label);
     }
     else
     {
-    menu_label = g_strdup(label);
-    g_signal_emit (G_OBJECT (disc), signals [LABEL_CHANGED], 0, label);
+        menu_label = g_strdup(label);
+        g_signal_emit (G_OBJECT (disc), signals [LABEL_CHANGED], 0, label);
     }
     
     gtk_menu_item_set_label( GTK_MENU_ITEM (disc->priv->disc_menu_item), menu_label );
@@ -201,8 +201,8 @@ parole_disc_show_menu_item (ParoleDisc *disc, MountData *data, const gchar *labe
 	{
 	    data->mi = disc->priv->disc_menu_item;
 	    
-        g_object_set_data (G_OBJECT (data->mi),
-		          "mount-data", data);
+        g_object_set_data  (G_OBJECT (data->mi),
+		                    "mount-data", data);
 		          
 	    g_signal_connect (data->mi, "activate",
 		          G_CALLBACK (parole_disc_media_activate_cb), disc);
@@ -257,16 +257,16 @@ parole_disc_add_mount_to_menu (ParoleDisc *disc, GMount *mount, const gchar *dev
     
     if ( g_file_has_uri_scheme (file, "cdda") )
     {
-	kind = PAROLE_DISC_CDDA;
-	uri = g_strdup ("cdda://");
-	goto got_cdda;
+	    kind = PAROLE_DISC_CDDA;
+	    uri = g_strdup ("cdda://");
+	    goto got_cdda;
     }
     
     if ( g_file_has_uri_scheme (file, "dvd") )
     {
-	kind = PAROLE_DISC_DVD;
-	uri = g_strdup ("dvd:/");
-	goto got_cdda;
+	    kind = PAROLE_DISC_DVD;
+	    uri = g_strdup ("dvd:/");
+	    goto got_cdda;
     }
 	
     content_type = g_content_type_guess_for_tree (file);
@@ -274,53 +274,53 @@ parole_disc_add_mount_to_menu (ParoleDisc *disc, GMount *mount, const gchar *dev
     /* Determine the type of disc */
     for ( i = 0; content_type && content_type[i]; i++)
     {
-	TRACE ("Checking disc content type : %s", content_type[i]);
-	    
-	if ( !g_strcmp0 (content_type[i], "x-content/video-dvd") )
-	{
-	    kind = PAROLE_DISC_DVD;
-	    uri = g_strdup ("dvd:/");
-	    break;
-	}
-	else if ( !g_strcmp0 (content_type[i], "x-content/video-vcd") )
-	{
-	    kind = PAROLE_DISC_VCD;
-	    uri = g_strdup ("vcd:/");
-	    break;
-	}
-	else if ( !g_strcmp0 (content_type[i], "x-content/video-svcd") )
-	{
-	    kind = PAROLE_DISC_SVCD;
-	    uri = g_strdup ("svcd:/");
-	    break;
-	}
-	else if ( !g_strcmp0 (content_type[i], "x-content/audio-cdda") )
-	{
-	    kind = PAROLE_DISC_CDDA;
-	    uri = g_strdup ("cdda://");
-	    break;
-	}
+	    TRACE ("Checking disc content type : %s", content_type[i]);
+	        
+	    if ( !g_strcmp0 (content_type[i], "x-content/video-dvd") )
+	    {
+	        kind = PAROLE_DISC_DVD;
+	        uri = g_strdup ("dvd:/");
+	        break;
+	    }
+	    else if ( !g_strcmp0 (content_type[i], "x-content/video-vcd") )
+	    {
+	        kind = PAROLE_DISC_VCD;
+	        uri = g_strdup ("vcd:/");
+	        break;
+	    }
+	    else if ( !g_strcmp0 (content_type[i], "x-content/video-svcd") )
+	    {
+	        kind = PAROLE_DISC_SVCD;
+	        uri = g_strdup ("svcd:/");
+	        break;
+	    }
+	    else if ( !g_strcmp0 (content_type[i], "x-content/audio-cdda") )
+	    {
+	        kind = PAROLE_DISC_CDDA;
+	        uri = g_strdup ("cdda://");
+	        break;
+	    }
     }
     
     if ( content_type )
-	g_strfreev (content_type);
+	    g_strfreev (content_type);
 
 got_cdda:
     if ( kind != PAROLE_DISC_UNKNOWN )
     {
-	MountData *data;
-	gchar *name;
+	    MountData *data;
+	    gchar *name;
 	
-	name = g_mount_get_name (mount);
+	    name = g_mount_get_name (mount);
 	
-	data = parole_disc_get_mount_data (disc, uri, device, kind);
-	parole_disc_show_menu_item (disc, data, name);
+	    data = parole_disc_get_mount_data (disc, uri, device, kind);
+	    parole_disc_show_menu_item (disc, data, name);
 	
-	if ( uri )
-	    g_free (uri);
+	    if ( uri )
+	        g_free (uri);
 	
-	g_ptr_array_add (disc->priv->array, data);
-	g_free (name);
+	    g_ptr_array_add (disc->priv->array, data);
+	    g_free (name);
     }
     
     g_object_unref (file);
@@ -349,33 +349,33 @@ parole_disc_check_cdrom (ParoleDisc *disc, GVolume *volume, const gchar *device)
     
     if ( (fd = open (device, O_RDONLY)) < 0 )
     {
-	g_debug ("Failed to open device : %s", device);
-	disc->priv->needs_update = TRUE;
-	goto out;
+	    g_debug ("Failed to open device : %s", device);
+	    disc->priv->needs_update = TRUE;
+	    goto out;
     }
     
     if ( (drive = ioctl (fd, CDROM_DRIVE_STATUS, NULL)) )
     {
-	if ( drive == CDS_DRIVE_NOT_READY )
-	{
-	    g_print ("Drive :%s is not yet ready\n", device);
-	    disc->priv->needs_update = TRUE;
-	}
-	else if ( drive == CDS_DISC_OK )
-	{
-	    if ( (drive = ioctl (fd, CDROM_DISC_STATUS, NULL)) > 0 )
+	    if ( drive == CDS_DRIVE_NOT_READY )
+	    {
+	        g_print ("Drive :%s is not yet ready\n", device);
+	        disc->priv->needs_update = TRUE;
+	    }
+	    else if ( drive == CDS_DISC_OK )
 	    {
-		if ( drive == CDS_AUDIO || drive == CDS_MIXED )
-		{
-		    data = parole_disc_get_mount_data (disc, "cdda://", device, PAROLE_DISC_CDDA);
+	        if ( (drive = ioctl (fd, CDROM_DISC_STATUS, NULL)) > 0 )
+	        {
+		        if ( drive == CDS_AUDIO || drive == CDS_MIXED )
+		        {
+		            data = parole_disc_get_mount_data (disc, "cdda://", device, PAROLE_DISC_CDDA);
 	
-			name = g_volume_get_name (volume);
-		    
-		    parole_disc_show_menu_item (disc, data, name);
-		    g_ptr_array_add (disc->priv->array, data);
-		}
+			        name = g_volume_get_name (volume);
+		            
+		            parole_disc_show_menu_item (disc, data, name);
+		            g_ptr_array_add (disc->priv->array, data);
+		        }
+	        }
 	    }
-	}
     }
     
     close (fd);
@@ -404,24 +404,24 @@ parole_disc_add_drive (ParoleDisc *disc, GDrive *drive, const gchar *device)
     
     for ( i = 0; i < len; i++)
     {
-	GVolume *volume;
-	GMount *mount;
+	    GVolume *volume;
+	    GMount *mount;
 	
-	volume = g_list_nth_data (list, i);
-	TRACE ("Volume name %s", g_volume_get_name (volume));
+	    volume = g_list_nth_data (list, i);
+	    TRACE ("Volume name %s", g_volume_get_name (volume));
 	
-	mount = g_volume_get_mount (volume);
-	if ( mount )
-	{
-	    TRACE ("Mount name : %s", g_mount_get_name (mount));
-	    parole_disc_add_mount_to_menu (disc, mount, device);
-	    g_object_unref (mount);
-	}
-	else
-	{
-	    /* Could be a cdda?*/
-	    parole_disc_check_cdrom (disc, volume, device);
-	}
+	    mount = g_volume_get_mount (volume);
+	    if ( mount )
+	    {
+	        TRACE ("Mount name : %s", g_mount_get_name (mount));
+	        parole_disc_add_mount_to_menu (disc, mount, device);
+	        g_object_unref (mount);
+	    }
+	    else
+	    {
+	        /* Could be a cdda?*/
+	        parole_disc_check_cdrom (disc, volume, device);
+	    }
     }
     
     g_list_foreach (list, (GFunc) g_object_unref, NULL);
@@ -453,19 +453,19 @@ parole_disc_get_drives (ParoleDisc *disc)
     
     for ( i = 0; i < len; i++)
     {
-	GDrive *drive;
-	gchar *device = NULL;
+	    GDrive *drive;
+	    gchar *device = NULL;
 	
-	drive = g_list_nth_data (list, i);
+	    drive = g_list_nth_data (list, i);
 	
-	/* FIXME what happens if there is more than one disc drive? */
-	if ( g_drive_can_eject (drive) && g_drive_has_media (drive) )
-	{
-	    device = g_drive_get_identifier (drive, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE);
-	    parole_disc_add_drive (disc, drive, device);
-	    if ( device )
-		g_free (device);
-	}
+	    /* FIXME what happens if there is more than one disc drive? */
+	    if ( g_drive_can_eject (drive) && g_drive_has_media (drive) )
+	    {
+	        device = g_drive_get_identifier (drive, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE);
+	        parole_disc_add_drive (disc, drive, device);
+	        if ( device )
+		        g_free (device);
+	    }
     }
     
     g_list_foreach (list, (GFunc) g_object_unref, NULL);
@@ -484,7 +484,7 @@ static void
 parole_disc_select_cb (GtkMenuItem *item, ParoleDisc *disc)
 {
     if ( disc->priv->needs_update )
-	parole_disc_get_drives (disc);
+	    parole_disc_get_drives (disc);
 }
 
 /**
@@ -516,23 +516,23 @@ parole_disc_class_init (ParoleDiscClass *klass)
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
     
     signals[DISC_SELECTED] = 
-        g_signal_new ("disc-selected",
-                      PAROLE_TYPE_DISC,
-                      G_SIGNAL_RUN_LAST,
-                      G_STRUCT_OFFSET (ParoleDiscClass, disc_selected),
-                      NULL, NULL,
-		      _gmarshal_VOID__STRING_STRING,
-                      G_TYPE_NONE, 2, 
-		      G_TYPE_STRING, G_TYPE_STRING);
+        g_signal_new   ("disc-selected",
+                        PAROLE_TYPE_DISC,
+                        G_SIGNAL_RUN_LAST,
+                        G_STRUCT_OFFSET (ParoleDiscClass, disc_selected),
+                        NULL, NULL,
+                        _gmarshal_VOID__STRING_STRING,
+                        G_TYPE_NONE, 2, 
+                        G_TYPE_STRING, G_TYPE_STRING);
 
     signals[LABEL_CHANGED] = 
-        g_signal_new ("label-changed",
-                      PAROLE_TYPE_DISC,
-                      G_SIGNAL_RUN_LAST,
-                      G_STRUCT_OFFSET (ParoleDiscClass, label_changed),
-                      NULL, NULL,
-                      g_cclosure_marshal_VOID__STRING,
-                      G_TYPE_NONE, 1, G_TYPE_STRING);
+        g_signal_new   ("label-changed",
+                        PAROLE_TYPE_DISC,
+                        G_SIGNAL_RUN_LAST,
+                        G_STRUCT_OFFSET (ParoleDiscClass, label_changed),
+                        NULL, NULL,
+                        g_cclosure_marshal_VOID__STRING,
+                        G_TYPE_NONE, 1, G_TYPE_STRING);
 		      
     object_class->finalize = parole_disc_finalize;
 
@@ -581,7 +581,7 @@ parole_disc_init (ParoleDisc *disc)
     disc->priv->disc_menu_item = GTK_WIDGET (gtk_builder_get_object (builder, "menu-open-disc"));
     
     g_signal_connect (gtk_builder_get_object (builder, "media-menu"), "select",
-	              G_CALLBACK (parole_disc_select_cb), disc);
+              G_CALLBACK (parole_disc_select_cb), disc);
 		      
     g_object_unref (builder);
 }
diff --git a/src/parole-disc.h b/src/parole-disc.h
index 838a421..2cf20ed 100644
--- a/src/parole-disc.h
+++ b/src/parole-disc.h
@@ -45,30 +45,30 @@ typedef enum
 
 typedef struct
 {
-    GObject         	   parent;
+    GObject                parent;
     ParoleDiscPrivate     *priv;
     
 } ParoleDisc;
 
 typedef struct
 {
-    GObjectClass 	   parent_class;
+    GObjectClass       parent_class;
     
-    void		   (*disc_selected)	       (ParoleDisc *disc,
-							const gchar *uri,
-							const gchar *device);
-							
-    void			(*label_changed)			    (ParoleDisc *disc,
-								     const gchar *label_changed);
-								     
-	void			(*dvd_enabled)		    (ParoleDisc *disc,
-								     gboolean dvd_enabled);
+    void            (*disc_selected)            (ParoleDisc *disc,
+                                                 const gchar *uri,
+                                                 const gchar *device);
+                            
+    void            (*label_changed)            (ParoleDisc *disc,
+                                                 const gchar *label_changed);
+                                     
+    void            (*dvd_enabled)              (ParoleDisc *disc,
+                                                 gboolean dvd_enabled);
     
 } ParoleDiscClass;
 
-GType                      parole_disc_get_type        (void) G_GNUC_CONST;
+GType               parole_disc_get_type        (void) G_GNUC_CONST;
 
-ParoleDisc                *parole_disc_new             (void);
+ParoleDisc         *parole_disc_new             (void);
 
 G_END_DECLS
 
diff --git a/src/parole-mediachooser.c b/src/parole-mediachooser.c
index 74e958e..649ebaf 100644
--- a/src/parole-mediachooser.c
+++ b/src/parole-mediachooser.c
@@ -46,37 +46,37 @@
 /*
  * GtkBuilder Callbacks
  */
-void    parole_media_chooser_add_clicked (GtkWidget *widget,
-					  ParoleMediaChooser *chooser);
+void    parole_media_chooser_add_clicked    (GtkWidget *widget,
+                                             ParoleMediaChooser *chooser);
 
-void    parole_media_chooser_close_clicked (GtkWidget *widget,
-					    ParoleMediaChooser *chooser);
+void    parole_media_chooser_close_clicked  (GtkWidget *widget,
+                                             ParoleMediaChooser *chooser);
 
-void	parole_media_chooser_destroy_cb (GtkWidget *widget,
-					 ParoleMediaChooser *chooser);
-					 
-void	media_chooser_folder_changed_cb (GtkWidget *widget, 
-					 ParoleMediaChooser *chooser);
+void    parole_media_chooser_destroy_cb     (GtkWidget *widget,
+                                             ParoleMediaChooser *chooser);
+                     
+void    media_chooser_folder_changed_cb     (GtkWidget *widget, 
+                                             ParoleMediaChooser *chooser);
 
-void	media_chooser_file_activate_cb  (GtkFileChooser *filechooser,
-					 ParoleMediaChooser *chooser);
+void    media_chooser_file_activate_cb      (GtkFileChooser *filechooser,
+                                             ParoleMediaChooser *chooser);
 
 struct ParoleMediaChooser
 {
     GObject             parent;
     
-    ParoleConf          *conf;
-    GtkWidget			*window;
-    GtkWidget 			*spinner;
+    ParoleConf         *conf;
+    GtkWidget          *window;
+    GtkWidget          *spinner;
     
 };
 
 struct ParoleMediaChooserClass
 {
-    GObjectClass 		 parent_class;
+    GObjectClass        parent_class;
     
-    void			 (*media_files_opened)		    (ParoleMediaChooser *chooser,
-								     GSList *list);
+    void                (*media_files_opened)   (ParoleMediaChooser *chooser,
+                                                 GSList *list);
 };
 
 enum
@@ -97,10 +97,10 @@ media_chooser_folder_changed_cb (GtkWidget *widget, ParoleMediaChooser *chooser)
     
     if ( folder )
     {
-    g_object_set (G_OBJECT (chooser->conf),
-		  "media-chooser-folder", folder,
-		  NULL);
-	g_free (folder);
+        g_object_set (G_OBJECT (chooser->conf),
+                      "media-chooser-folder", folder,
+                      NULL);
+        g_free (folder);
     }
 }
 
@@ -120,18 +120,18 @@ parole_media_chooser_add (ParoleMediaChooser *chooser, GtkWidget *file_chooser)
     filter = gtk_file_chooser_get_filter (GTK_FILE_CHOOSER (file_chooser));
     
     if ( G_UNLIKELY (files == NULL) )
-	return;
-	
-	g_object_get (G_OBJECT (chooser->conf),
-		  "scan-recursive", &scan_recursive,
-		  NULL);
+        return;
+    
+    g_object_get (G_OBJECT (chooser->conf),
+                  "scan-recursive", &scan_recursive,
+                  NULL);
     
     len = g_slist_length (files);
     
     for ( i = 0; i < len; i++)
     {
-	file = g_slist_nth_data (files, i);
-	parole_get_media_files (filter, file, scan_recursive, &media_files);
+        file = g_slist_nth_data (files, i);
+        parole_get_media_files (filter, file, scan_recursive, &media_files);
     }
     
     g_signal_emit (G_OBJECT (chooser), signals [MEDIA_FILES_OPENED], 0, media_files);
@@ -192,10 +192,10 @@ void media_chooser_file_activate_cb (GtkFileChooser *filechooser, ParoleMediaCho
 static void
 parole_media_chooser_open_internal (ParoleMediaChooser *media_chooser)
 {
-    GtkWidget       *file_chooser;
-    GtkBuilder      *builder;
-    GtkWidget       *recursive;
-    GtkFileFilter   *filter, *all_files;
+    GtkWidget      *file_chooser;
+    GtkBuilder     *builder;
+    GtkWidget      *recursive;
+    GtkFileFilter  *filter, *all_files;
     gboolean        scan_recursive;
     gboolean        replace_playlist;
     gboolean        play;
@@ -224,20 +224,20 @@ parole_media_chooser_open_internal (ParoleMediaChooser *media_chooser)
 
     /* Set the folder that is shown */
     g_object_get (G_OBJECT (media_chooser->conf),
-		  "media-chooser-folder", &folder,
-		  NULL);
+                  "media-chooser-folder", &folder,
+                  NULL);
     
     if ( folder )
-	gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (file_chooser), folder);
+        gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (file_chooser), folder);
     
     gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (file_chooser), TRUE);
 
     /* Get playlist-properties to load files accordingly */
     g_object_get (G_OBJECT (media_chooser->conf),
-		  "scan-recursive", &scan_recursive,
-		  "replace-playlist", &replace_playlist,
-		  "play-opened-files", &play,
-		  NULL);
+                  "scan-recursive", &scan_recursive,
+                  "replace-playlist", &replace_playlist,
+                  "play-opened-files", &play,
+                  NULL);
     
     recursive = GTK_WIDGET (gtk_builder_get_object (builder, "recursive"));
     
@@ -259,7 +259,7 @@ parole_media_chooser_finalize (GObject *object)
     g_object_unref (chooser->conf);
     
     if ( chooser->window )
-	gtk_widget_destroy (chooser->window);
+        gtk_widget_destroy (chooser->window);
     
     G_OBJECT_CLASS (parole_media_chooser_parent_class)->finalize (object);
 }
@@ -270,14 +270,14 @@ parole_media_chooser_class_init (ParoleMediaChooserClass *klass)
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
     signals[MEDIA_FILES_OPENED] = 
-        g_signal_new("media-files-opened",
-                      PAROLE_TYPE_MEDIA_CHOOSER,
-                      G_SIGNAL_RUN_LAST,
-                      G_STRUCT_OFFSET (ParoleMediaChooserClass, media_files_opened),
-                      NULL, NULL,
-		      g_cclosure_marshal_VOID__POINTER,
-                      G_TYPE_NONE, 1, 
-		      G_TYPE_POINTER);
+        g_signal_new   ("media-files-opened",
+                        PAROLE_TYPE_MEDIA_CHOOSER,
+                        G_SIGNAL_RUN_LAST,
+                        G_STRUCT_OFFSET (ParoleMediaChooserClass, media_files_opened),
+                        NULL, NULL,
+                        g_cclosure_marshal_VOID__POINTER,
+                        G_TYPE_NONE, 1, 
+                        G_TYPE_POINTER);
 
     object_class->finalize = parole_media_chooser_finalize;
 }
@@ -299,8 +299,8 @@ ParoleMediaChooser *parole_media_chooser_open_local (GtkWidget *parent)
     gtk_window_set_modal (GTK_WINDOW (chooser->window), TRUE);
     
     if ( parent )
-	gtk_window_set_transient_for (GTK_WINDOW (chooser->window), GTK_WINDOW (parent));
-	
+        gtk_window_set_transient_for (GTK_WINDOW (chooser->window), GTK_WINDOW (parent));
+    
     gtk_window_set_position (GTK_WINDOW (chooser->window), GTK_WIN_POS_CENTER_ON_PARENT);
 
     gtk_widget_show_all (chooser->window);
diff --git a/src/parole-mediachooser.h b/src/parole-mediachooser.h
index b04bb22..17f0b32 100644
--- a/src/parole-mediachooser.h
+++ b/src/parole-mediachooser.h
@@ -37,10 +37,10 @@ G_BEGIN_DECLS
 typedef struct ParoleMediaChooser ParoleMediaChooser;
 typedef struct ParoleMediaChooserClass ParoleMediaChooserClass;
 
-GType        			 parole_media_chooser_get_type      (void) G_GNUC_CONST;
+GType                    parole_media_chooser_get_type      (void) G_GNUC_CONST;
 
-ParoleMediaChooser		*parole_media_chooser_open_local    (GtkWidget *parent);
-								     
+ParoleMediaChooser      *parole_media_chooser_open_local    (GtkWidget *parent);
+                                     
 G_END_DECLS
 
 #endif /* __PAROLE_MEDIA_CHOOSER_H */
diff --git a/src/parole-medialist.c b/src/parole-medialist.c
index acf6762..9f09a6c 100644
--- a/src/parole-medialist.c
+++ b/src/parole-medialist.c
@@ -57,7 +57,7 @@
 
 #include "common/parole-common.h"
 
-#define PAROLE_AUTO_SAVED_PLAYLIST 	"xfce4/parole/auto-saved-playlist.m3u"
+#define PAROLE_AUTO_SAVED_PLAYLIST  "xfce4/parole/auto-saved-playlist.m3u"
 
 typedef struct
 {
@@ -86,88 +86,104 @@ static GtkTargetEntry target_entry[] =
     { "text/uri-list", 0, 1 },
 };
 
-static void 	parole_media_list_dbus_class_init (ParoleMediaListClass *klass);
-static void 	parole_media_list_dbus_init 	  (ParoleMediaList      *list);
+static void     parole_media_list_dbus_class_init   (ParoleMediaListClass *klass);
+static void     parole_media_list_dbus_init         (ParoleMediaList      *list);
 
 static GtkTreeRowReference * 
-    parole_media_list_get_row_reference_from_iter (ParoleMediaList *list, 
-						   GtkTreeIter *iter, 
-						   gboolean select_path);
+parole_media_list_get_row_reference_from_iter       (ParoleMediaList *list, 
+                                                     GtkTreeIter *iter, 
+                                                     gboolean select_path);
 
-static void 	parole_media_list_select_path 	  (ParoleMediaList *list, gboolean disc,
-						   GtkTreePath *path);
+static void     parole_media_list_select_path       (ParoleMediaList *list, 
+                                                     gboolean disc,
+                                                     GtkTreePath *path);
 
 /*
  * Callbacks for GtkBuilder
  */
-void		parole_media_list_add_clicked_cb 	(GtkButton *button, 
-							 ParoleMediaList *list);
-							 
-void		parole_media_list_remove_clicked_cb 	(GtkButton *button, 
-							 ParoleMediaList *list);
-
-void		parole_media_list_clear_clicked_cb 	(GtkButton *button, 
-							 ParoleMediaList *list);
-
-void		parole_media_list_repeat_toggled_cb	(GtkToggleToolButton *button,
-							 ParoleMediaList *list);
-
-void		parole_media_list_shuffle_toggled_cb	(GtkToggleToolButton *button,
-							 ParoleMediaList *list);
-
-void		parole_media_list_row_activated_cb 	(GtkTreeView *view, 
-							 GtkTreePath *path,
-							 GtkTreeViewColumn *col,
-							 ParoleMediaList *list);
-
-gboolean	parole_media_list_button_release_event  (GtkWidget *widget, 
-							 GdkEventButton *ev, 
-							 ParoleMediaList *list);
-							 
-void		parole_media_list_drag_data_received_cb (GtkWidget *widget,
-							 GdkDragContext *drag_context,
-							 gint x,
-							 gint y,
-							 GtkSelectionData *data,
-							 guint info,
-							 guint drag_time,
-							 ParoleMediaList *list);
-
-gboolean	parole_media_list_key_press		(GtkWidget *widget, 
-							 GdkEventKey *ev, 
-							 ParoleMediaList *list);
-
-void		parole_media_list_format_cursor_changed_cb (GtkTreeView *view,
-							    ParolePlaylistSave *data);
-							    
-void		parole_media_list_close_save_dialog_cb (GtkButton *button,
-						        ParolePlaylistSave *data);
-						    
-void		parole_media_list_save_playlist_cb     (GtkButton *button,
-						        ParolePlaylistSave *data);
-
-gboolean	parole_media_list_query_tooltip		(GtkWidget *widget,
-							 gint x,
-							 gint y,
-							 gboolean keyboard_mode,
-							 GtkTooltip *tooltip,
-							 ParoleMediaList *list);
-							 
-void		parole_media_list_menu_pos (GtkMenu *menu, 
-							gint *px, gint *py, gboolean *push_in, gpointer data);
-
-void parole_media_list_send_dvd_menu_navigation (ParoleMediaList *list, gint msg_id);
-
-void parole_media_list_dvd_menu_activated (GtkMenuItem *widget, ParoleMediaList *list);
-
-void parole_media_list_dvd_title_activated (GtkMenuItem *widget, ParoleMediaList *list);
-
-void parole_media_list_dvd_audio_activated (GtkMenuItem *widget, ParoleMediaList *list);
-
-void parole_media_list_dvd_angle_activated (GtkMenuItem *widget, ParoleMediaList *list);
-
-void parole_media_list_dvd_chapter_activated (GtkMenuItem *widget, ParoleMediaList *list);
-							 
+void        parole_media_list_add_clicked_cb        (GtkButton *button, 
+                                                     ParoleMediaList *list);
+                             
+void        parole_media_list_remove_clicked_cb     (GtkButton *button, 
+                                                     ParoleMediaList *list);
+
+void        parole_media_list_clear_clicked_cb      (GtkButton *button, 
+                                                     ParoleMediaList *list);
+
+void        parole_media_list_repeat_toggled_cb     (GtkToggleToolButton *button,
+                                                     ParoleMediaList *list);
+
+void        parole_media_list_shuffle_toggled_cb    (GtkToggleToolButton *button,
+                                                     ParoleMediaList *list);
+
+void        parole_media_list_row_activated_cb      (GtkTreeView *view, 
+                                                     GtkTreePath *path,
+                                                     GtkTreeViewColumn *col,
+                                                     ParoleMediaList *list);
+
+gboolean    parole_media_list_button_release_event  (GtkWidget *widget, 
+                                                     GdkEventButton *ev, 
+                                                     ParoleMediaList *list);
+                             
+void        parole_media_list_drag_data_received_cb (GtkWidget *widget,
+                                                     GdkDragContext *drag_context,
+                                                     gint x,
+                                                     gint y,
+                                                     GtkSelectionData *data,
+                                                     guint info,
+                                                     guint drag_time,
+                                                     ParoleMediaList *list);
+
+gboolean    parole_media_list_key_press             (GtkWidget *widget, 
+                                                     GdkEventKey *ev, 
+                                                     ParoleMediaList *list);
+
+void        
+parole_media_list_format_cursor_changed_cb          (GtkTreeView *view,
+                                                     ParolePlaylistSave *data);
+                                
+void        parole_media_list_close_save_dialog_cb (GtkButton *button,
+                                                    ParolePlaylistSave *data);
+                            
+void        parole_media_list_save_playlist_cb     (GtkButton *button,
+                                                    ParolePlaylistSave *data);
+
+gboolean    parole_media_list_query_tooltip        (GtkWidget *widget,
+                                                    gint x,
+                                                    gint y,
+                                                    gboolean keyboard_mode,
+                                                    GtkTooltip *tooltip,
+                                                    ParoleMediaList *list);
+                             
+void        parole_media_list_menu_pos             (GtkMenu *menu, 
+                                                    gint *px, gint *py, 
+                                                    gboolean *push_in, 
+                                                    gpointer data);
+
+void 
+parole_media_list_send_dvd_menu_navigation         (ParoleMediaList *list, 
+                                                    gint msg_id);
+
+void 
+parole_media_list_dvd_menu_activated               (GtkMenuItem *widget, 
+                                                    ParoleMediaList *list);
+
+void 
+parole_media_list_dvd_title_activated              (GtkMenuItem *widget, 
+                                                    ParoleMediaList *list);
+
+void 
+parole_media_list_dvd_audio_activated              (GtkMenuItem *widget, 
+                                                    ParoleMediaList *list);
+
+void 
+parole_media_list_dvd_angle_activated              (GtkMenuItem *widget, 
+                                                    ParoleMediaList *list);
+
+void 
+parole_media_list_dvd_chapter_activated            (GtkMenuItem *widget, 
+                                                    ParoleMediaList *list);
+                             
 /*
  * End of GtkBuilder callbacks
  */
@@ -179,11 +195,11 @@ struct ParoleMediaListPrivate
 {
     DBusGConnection     *bus;
     ParoleConf          *conf;
-    GtkWidget 	  	    *view;
+    GtkWidget           *view;
     GtkWidget           *disc_view;
-    GtkWidget		    *box;
-    GtkListStore	    *store;
-    GtkListStore	    *disc_store;
+    GtkWidget           *box;
+    GtkListStore        *store;
+    GtkListStore        *disc_store;
     GtkTreeSelection    *sel;
     GtkTreeSelection    *disc_sel;
     
@@ -198,10 +214,10 @@ struct ParoleMediaListPrivate
     GtkWidget *clear_button;
     GtkWidget *repeat_button;
     GtkWidget *shuffle_button;
-	GtkWidget *settings_button;
-	GtkWidget *n_items;
-	
-	char *history[3];
+    GtkWidget *settings_button;
+    GtkWidget *n_items;
+    
+    char *history[3];
 };
 
 enum
@@ -265,23 +281,23 @@ parole_media_list_add (ParoleMediaList *list, ParoleFile *file, gboolean disc, g
     gtk_list_store_append (list_store, &iter);
     
     gtk_list_store_set (list_store, 
-			&iter, 
-			NAME_COL, parole_file_get_display_name (file),
-			DATA_COL, file,
-			LENGTH_COL, parole_taglibc_get_media_length (file),
-			PIXBUF_COL, NULL,
-			-1);
+                        &iter, 
+                        NAME_COL, parole_file_get_display_name (file),
+                        DATA_COL, file,
+                        LENGTH_COL, parole_taglibc_get_media_length (file),
+                        PIXBUF_COL, NULL,
+                        -1);
     
     if ( emit || select_row )
     {
-	path = gtk_tree_model_get_path (GTK_TREE_MODEL (list_store), &iter);
-	row = gtk_tree_row_reference_new (GTK_TREE_MODEL (list_store), path);
-	if ( select_row )
-	    parole_media_list_select_path (list, disc, path);
-	gtk_tree_path_free (path);
-	if ( emit )
-	    g_signal_emit (G_OBJECT (list), signals [MEDIA_ACTIVATED], 0, row);
-	gtk_tree_row_reference_free (row);
+        path = gtk_tree_model_get_path (GTK_TREE_MODEL (list_store), &iter);
+        row = gtk_tree_row_reference_new (GTK_TREE_MODEL (list_store), path);
+        if ( select_row )
+            parole_media_list_select_path (list, disc, path);
+        gtk_tree_path_free (path);
+        if ( emit )
+            g_signal_emit (G_OBJECT (list), signals [MEDIA_ACTIVATED], 0, row);
+        gtk_tree_row_reference_free (row);
     }
   
     /*
@@ -291,38 +307,38 @@ parole_media_list_add (ParoleMediaList *list, ParoleFile *file, gboolean disc, g
     g_object_unref (file);
     
     if (disc)
-    nch = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (list->priv->disc_store), NULL); 
+        nch = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (list->priv->disc_store), NULL); 
     else
-    nch = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (list->priv->store), NULL); 
+        nch = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (list->priv->store), NULL); 
     
     if ( nch == 1 )
     {
-	gtk_widget_set_sensitive (list->priv->remove_button, TRUE);
-	gtk_widget_set_sensitive (list->priv->clear_button, TRUE);
-	if (gtk_notebook_get_current_page(GTK_NOTEBOOK(list->priv->playlist_notebook)) == 0)
-	{
-	gtk_label_set_text (GTK_LABEL(list->priv->n_items),g_strdup_printf (_("%i item"),nch));
-	}
-	else
-	{
-	gtk_label_set_text (GTK_LABEL(list->priv->n_items),g_strdup_printf (_("%i chapter"),nch));
-	}
+        gtk_widget_set_sensitive (list->priv->remove_button, TRUE);
+        gtk_widget_set_sensitive (list->priv->clear_button, TRUE);
+        if (gtk_notebook_get_current_page(GTK_NOTEBOOK(list->priv->playlist_notebook)) == 0)
+        {
+            gtk_label_set_text (GTK_LABEL(list->priv->n_items),g_strdup_printf (_("%i item"),nch));
+        }
+        else
+        {
+            gtk_label_set_text (GTK_LABEL(list->priv->n_items),g_strdup_printf (_("%i chapter"),nch));
+        }
     }
     else
     {
-	parole_media_list_set_widget_sensitive (list, TRUE);
-	if (gtk_notebook_get_current_page(GTK_NOTEBOOK(list->priv->playlist_notebook)) == 0)
-	{
-	gtk_label_set_text (GTK_LABEL(list->priv->n_items),g_strdup_printf (_("%i items"),nch));
-	}
-	else
-	{
-	gtk_label_set_text (GTK_LABEL(list->priv->n_items),g_strdup_printf (_("%i chapters"),nch));
-	}
+        parole_media_list_set_widget_sensitive (list, TRUE);
+        if (gtk_notebook_get_current_page(GTK_NOTEBOOK(list->priv->playlist_notebook)) == 0)
+        {
+            gtk_label_set_text (GTK_LABEL(list->priv->n_items),g_strdup_printf (_("%i items"),nch));
+        }
+        else
+        {
+            gtk_label_set_text (GTK_LABEL(list->priv->n_items),g_strdup_printf (_("%i chapters"),nch));
+        }
     }
     gtk_widget_show (list->priv->n_items);
     if ( nch == 0 )
-	    gtk_widget_hide (list->priv->n_items);
+        gtk_widget_hide (list->priv->n_items);
 }
 
 /**
@@ -342,8 +358,8 @@ parole_media_list_files_open (ParoleMediaList *list, GSList *files, gboolean dis
     guint i;
     
     g_object_get (G_OBJECT (list->priv->conf),
-		  "replace-playlist", &replace,
-		  NULL);
+                  "replace-playlist", &replace,
+                  NULL);
     
     len = g_slist_length (files);
     TRACE ("Adding %i files", len);
@@ -353,16 +369,16 @@ parole_media_list_files_open (ParoleMediaList *list, GSList *files, gboolean dis
     
     if ( len != 0 )
     {
-	if ( replace )
-	    parole_media_list_clear_list (list);
-	file = g_slist_nth_data (files, 0);
-	parole_media_list_add (list, file, disc, emit, TRUE);
+        if ( replace )
+            parole_media_list_clear_list (list);
+        file = g_slist_nth_data (files, 0);
+        parole_media_list_add (list, file, disc, emit, TRUE);
     }
     
     for ( i = 1; i < len; i++)
     {
-	file = g_slist_nth_data (files, i);
-	parole_media_list_add (list, file, disc, FALSE, FALSE);
+        file = g_slist_nth_data (files, i);
+        parole_media_list_add (list, file, disc, FALSE, FALSE);
     }
 }
 
@@ -402,14 +418,14 @@ parole_media_list_add_dvd_chapters (ParoleMediaList *list, gint n_chapters)
 /* Callback to determine whether opened files should start playing immediately */
 static void
 parole_media_list_files_opened_cb (ParoleMediaChooser *chooser, 
-				   GSList *files, 
-				   ParoleMediaList *list)
+                   GSList *files, 
+                   ParoleMediaList *list)
 {
     gboolean play;
     
     g_object_get (G_OBJECT (list->priv->conf),
-		  "play-opened-files", &play,
-		  NULL);
+                  "play-opened-files", &play,
+                  NULL);
     
     parole_media_list_files_open (list, files, FALSE, play);
 }
@@ -421,12 +437,12 @@ parole_media_list_location_opened_cb (ParoleOpenLocation *obj, const gchar *loca
     
     if ( parole_is_uri_disc (location) )
     {
-	g_signal_emit (G_OBJECT (list), signals [URI_OPENED], 0, location);
+        g_signal_emit (G_OBJECT (list), signals [URI_OPENED], 0, location);
     }
     else
     {
-	file = parole_file_new (location);
-	parole_media_list_add (list, file, FALSE, TRUE, TRUE);
+        file = parole_file_new (location);
+        parole_media_list_add (list, file, FALSE, TRUE, TRUE);
     }
 }
 
@@ -438,9 +454,9 @@ parole_media_list_open_internal (ParoleMediaList *list)
     TRACE ("start");
     
     chooser = parole_media_chooser_open_local (gtk_widget_get_toplevel (GTK_WIDGET (list)));
-					       
+                           
     g_signal_connect (G_OBJECT (chooser), "media_files_opened",
-		      G_CALLBACK (parole_media_list_files_opened_cb), list);
+                      G_CALLBACK (parole_media_list_files_opened_cb), list);
 }
 
 static void
@@ -449,9 +465,9 @@ parole_media_list_open_location_internal (ParoleMediaList *list)
     ParoleOpenLocation *location;
     
     location = parole_open_location (gtk_widget_get_toplevel (GTK_WIDGET (list)));
-					       
+                           
     g_signal_connect (G_OBJECT (location), "location-opened",
-		      G_CALLBACK (parole_media_list_location_opened_cb), list);
+                      G_CALLBACK (parole_media_list_location_opened_cb), list);
 }
 
 /**
@@ -473,28 +489,28 @@ parole_media_list_get_files (ParoleMediaList *list)
     GSList *files_list = NULL;
     
     for ( valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list->priv->store), &iter);
-	  valid;
-	  valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (list->priv->store), &iter))
+        valid;
+        valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (list->priv->store), &iter))
     {
-	gtk_tree_model_get (GTK_TREE_MODEL (list->priv->store), &iter,
-			    DATA_COL, &file,
-			    -1);
-	
-	files_list = g_slist_append (files_list, file);
+        gtk_tree_model_get (GTK_TREE_MODEL (list->priv->store), &iter,
+                            DATA_COL, &file,
+                            -1);
+        
+        files_list = g_slist_append (files_list, file);
     }
     
     return files_list;
 }
 
 /* Callback when an item is dragged on the playlist-widget */
-void	parole_media_list_drag_data_received_cb (GtkWidget *widget,
-						 GdkDragContext *drag_context,
-						 gint x,
-						 gint y,
-						 GtkSelectionData *data,
-						 guint info,
-						 guint drag_time,
-						 ParoleMediaList *list)
+void    parole_media_list_drag_data_received_cb (GtkWidget *widget,
+                                                 GdkDragContext *drag_context,
+                                                 gint x,
+                                                 gint y,
+                                                 GtkSelectionData *data,
+                                                 guint info,
+                                                 guint drag_time,
+                                                 ParoleMediaList *list)
 {
     gchar **uri_list;
     gchar *path;
@@ -505,17 +521,17 @@ void	parole_media_list_drag_data_received_cb (GtkWidget *widget,
     parole_window_busy_cursor (gtk_widget_get_window(GTK_WIDGET (list)));
     
     g_object_get (G_OBJECT (list->priv->conf),
-		  "play-opened-files", &play,
-		  NULL);
+                  "play-opened-files", &play,
+                  NULL);
     
     uri_list = g_uri_list_extract_uris ((const gchar *)gtk_selection_data_get_data(data));
     
     for ( i = 0; uri_list[i] != NULL; i++)
     {
-	path = g_filename_from_uri (uri_list[i], NULL, NULL);
-	added += parole_media_list_add_by_path (list, path, i == 0 ? play : FALSE);
+        path = g_filename_from_uri (uri_list[i], NULL, NULL);
+        added += parole_media_list_add_by_path (list, path, i == 0 ? play : FALSE);
 
-	g_free (path);
+        g_free (path);
     }
 
     g_strfreev (uri_list);
@@ -538,6 +554,7 @@ gboolean parole_media_list_key_press (GtkWidget *widget, GdkEventKey *ev, Parole
         case GDK_KEY_Page_Down:
         case GDK_KEY_Page_Up:
         case GDK_KEY_Escape:
+            // FIXME: There has got to be a better way.
             vbox_player = GTK_WIDGET(gtk_container_get_children( GTK_CONTAINER(gtk_widget_get_parent(gtk_widget_get_parent(gtk_widget_get_parent(gtk_widget_get_parent(gtk_widget_get_parent(gtk_widget_get_parent(widget))))))) )[0].data);
             gtk_widget_grab_focus(vbox_player);
             return TRUE;
@@ -559,14 +576,14 @@ parole_media_list_add_clicked_cb (GtkButton *button, ParoleMediaList *list)
 void 
 parole_media_list_clear_clicked_cb (GtkButton *button, ParoleMediaList *list)
 {
-	parole_media_list_clear_list (list);
+    parole_media_list_clear_list (list);
 }
 
 /* Callback for the repeat togglebutton */
 void
 parole_media_list_repeat_toggled_cb (GtkToggleToolButton *button, ParoleMediaList *list)
 {
-	gboolean toggled;
+    gboolean toggled;
     
     toggled = gtk_toggle_tool_button_get_active (button);
     
@@ -577,7 +594,7 @@ parole_media_list_repeat_toggled_cb (GtkToggleToolButton *button, ParoleMediaLis
 void
 parole_media_list_shuffle_toggled_cb (GtkToggleToolButton *button, ParoleMediaList *list)
 {
-	gboolean toggled;
+    gboolean toggled;
     
     toggled = gtk_toggle_tool_button_get_active (button);
     
@@ -597,7 +614,7 @@ void parole_media_list_close_save_dialog_cb (GtkButton *button, ParolePlaylistSa
  * Gets the first selected row in the media list view.
  * 
  * Returns: a #GtkTreeRowReference for the selected row, or NULL if no one is 
- * 	    currently selected.
+ *      currently selected.
  * 
  **/
 static GtkTreeRowReference *
@@ -612,13 +629,13 @@ parole_media_list_get_first_selected_row (ParoleMediaList *list)
     
     if ( g_list_length (path_list) > 0 )
     {
-	GtkTreePath *path;
-	path = g_list_nth_data (path_list, 0);
-	
-	if ( G_LIKELY (gtk_tree_model_get_iter (model, &iter, path) == TRUE ))
-	{
-	    row = parole_media_list_get_row_reference_from_iter (list, &iter, FALSE);
-	}
+        GtkTreePath *path;
+        path = g_list_nth_data (path_list, 0);
+        
+        if ( G_LIKELY (gtk_tree_model_get_iter (model, &iter, path) == TRUE ))
+        {
+            row = parole_media_list_get_row_reference_from_iter (list, &iter, FALSE);
+        }
     }
     
     g_list_foreach (path_list, (GFunc)gtk_tree_path_free, NULL);
@@ -648,7 +665,7 @@ parole_media_list_get_first_selected_file (ParoleMediaList *list)
                                   &iter, 
                                   gtk_tree_row_reference_get_path (row)) )
     {
-	    gtk_tree_model_get (GTK_TREE_MODEL (list->priv->store), &iter, DATA_COL, &file, -1);
+        gtk_tree_model_get (GTK_TREE_MODEL (list->priv->store), &iter, DATA_COL, &file, -1);
     }
     
     return file;
@@ -669,30 +686,30 @@ void parole_media_list_save_playlist_cb (GtkButton *button, ParolePlaylistSave *
     
     if ( gtk_tree_selection_get_selected (data->sel, &model, &iter ) )
     {
-	gtk_tree_model_get (model, &iter, 2, &format, -1);
+        gtk_tree_model_get (model, &iter, 2, &format, -1);
     }
     
     if ( g_access (dirname, W_OK) == -1 )
     {
-	gchar *msg;
-	msg = g_strdup_printf ("%s %s", dirname, _("Permission denied"));
-	parole_dialog_error (GTK_WINDOW (gtk_widget_get_toplevel (data->list->priv->view)),
-			     _("Error saving playlist file"),
-			     msg);
-	g_free (msg);
-	goto out;
+        gchar *msg;
+        msg = g_strdup_printf ("%s %s", dirname, _("Permission denied"));
+        parole_dialog_error (GTK_WINDOW (gtk_widget_get_toplevel (data->list->priv->view)),
+                             _("Error saving playlist file"),
+                             msg);
+        g_free (msg);
+        goto out;
     }
     
     if ( format == PAROLE_PL_FORMAT_UNKNOWN )
     {
-	format = parole_pl_parser_guess_format_from_extension (filename);
-	if ( format == PAROLE_PL_FORMAT_UNKNOWN )
-	{
-	    parole_dialog_info (GTK_WINDOW (gtk_widget_get_toplevel (data->list->priv->view)),
-				_("Unknown playlist format"),
-				_("Please chooser a supported playlist format"));
-	    goto out;
-	}
+        format = parole_pl_parser_guess_format_from_extension (filename);
+        if ( format == PAROLE_PL_FORMAT_UNKNOWN )
+        {
+            parole_dialog_info (GTK_WINDOW (gtk_widget_get_toplevel (data->list->priv->view)),
+                                _("Unknown playlist format"),
+                                _("Please chooser a supported playlist format"));
+            goto out;
+        }
     }
     
     list = parole_media_list_get_files (data->list);
@@ -707,60 +724,59 @@ out:
 }
 
 /* Query to get the data to populate the tooltip */
-gboolean	parole_media_list_query_tooltip		(GtkWidget *widget,
-							 gint x,
-							 gint y,
-							 gboolean keyboard_mode,
-							 GtkTooltip *tooltip,
-							 ParoleMediaList *list)
-
+gboolean    parole_media_list_query_tooltip     (GtkWidget *widget,
+                                                 gint x,
+                                                 gint y,
+                                                 gboolean keyboard_mode,
+                                                 GtkTooltip *tooltip,
+                                                 ParoleMediaList *list)
 {
     GtkTreePath *path;
     
     if (gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (list->priv->view),
-				       x,
-				       y,
-				       &path,
-				       NULL,
-				       NULL,
-				       NULL))
+            x,
+            y,
+            &path,
+            NULL,
+            NULL,
+            NULL))
     {
-	GtkTreeIter iter;
-	
-	if ( path && gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store), &iter, path))
+        GtkTreeIter iter;
+        
+        if ( path && gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store), &iter, path))
         {
-	    ParoleFile *file;
-	    gchar *tip;
-	    gchar *name;
-	    gchar *len;
-	    
-	    gtk_tree_model_get (GTK_TREE_MODEL (list->priv->store), &iter,
-				DATA_COL, &file,
-				NAME_COL, &name,
-				LENGTH_COL, &len,
-				-1);
-	    
-	    if (!len)
-	    {
-		len = g_strdup (_("Unknown"));
-	    }
-	    
-	    tip = g_strdup_printf ("File: %s\nName: %s\nLength: %s", 
-				   parole_file_get_file_name (file),
-				   name,
-				   len);
-	    
-	    gtk_tooltip_set_text (tooltip, tip);
-	    g_free (tip);
-	    g_free (name);
-	    g_free (len);
-	    gtk_tree_path_free (path);
-	
-	    return TRUE;
-	}
+            ParoleFile *file;
+            gchar *tip;
+            gchar *name;
+            gchar *len;
+            
+            gtk_tree_model_get (GTK_TREE_MODEL (list->priv->store), &iter,
+                                DATA_COL, &file,
+                                NAME_COL, &name,
+                                LENGTH_COL, &len,
+                                -1);
+            
+            if (!len)
+            {
+                len = g_strdup (_("Unknown"));
+            }
+            
+            tip = g_strdup_printf ("File: %s\nName: %s\nLength: %s", 
+                                   parole_file_get_file_name (file),
+                                   name,
+                                   len);
+            
+            gtk_tooltip_set_text (tooltip, tip);
+            g_free (tip);
+            g_free (name);
+            g_free (len);
+            gtk_tree_path_free (path);
+        
+            return TRUE;
+        }
     }
-				   
-				   
+                   
+                   
     return FALSE;
 }
 
@@ -783,16 +799,16 @@ void parole_media_list_format_cursor_changed_cb (GtkTreeView *view, ParolePlayli
     
     if ( gtk_tree_selection_get_selected (data->sel, &model, &iter ) )
     {
-	gtk_tree_model_get (model, &iter, 2, &format, -1);
-	if ( format != PAROLE_PL_FORMAT_UNKNOWN )
-	{
-	    gchar *name, *new_name;
-	    name = parole_get_name_without_extension (fbasename);
-	    new_name = g_strdup_printf ("%s%s", name, playlist_format_map[format].ext);
-	    gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (data->chooser), new_name);
-	    g_free (new_name);
-	    g_free (name);
-	}
+        gtk_tree_model_get (model, &iter, 2, &format, -1);
+        if ( format != PAROLE_PL_FORMAT_UNKNOWN )
+        {
+            gchar *name, *new_name;
+            name = parole_get_name_without_extension (fbasename);
+            new_name = g_strdup_printf ("%s%s", name, playlist_format_map[format].ext);
+            gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (data->chooser), new_name);
+            g_free (new_name);
+            g_free (name);
+        }
     }
     g_free (fbasename);
     
@@ -817,45 +833,45 @@ void parole_media_list_save_cb (GtkWidget *widget, ParoleMediaList *list)
     store = GTK_LIST_STORE (gtk_builder_get_object (builder, "liststore"));
 
     gtk_window_set_transient_for (GTK_WINDOW (chooser), 
-				  GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (list))));
-				  
+                                  GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (list))));
+                  
     gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (chooser), TRUE);
-	
+    
     filename = g_strconcat (_("Playlist"), ".m3u", NULL);
     gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (chooser), filename);
     g_free (filename);
     
     gtk_list_store_append (store, &iter);
     gtk_list_store_set (store, 
-			&iter, 
-			0, _("M3U Playlists"),
-			1, "m3u",
-			2, PAROLE_PL_FORMAT_M3U,
-			-1);
-			
+                        &iter, 
+                        0, _("M3U Playlists"),
+                        1, "m3u",
+                        2, PAROLE_PL_FORMAT_M3U,
+                        -1);
+            
     gtk_list_store_append (store, &iter);
     gtk_list_store_set (store, 
-			&iter, 
-			0, _("PLS Playlists"),
-			1, "pls",
-			2, PAROLE_PL_FORMAT_PLS,
-			-1);
-			
+                        &iter, 
+                        0, _("PLS Playlists"),
+                        1, "pls",
+                        2, PAROLE_PL_FORMAT_PLS,
+                        -1);
+            
     gtk_list_store_append (store, &iter);
     gtk_list_store_set (store, 
-			&iter, 
-			0, _("Advanced Stream Redirector"),
-			1, "asx",
-			2, PAROLE_PL_FORMAT_ASX,
-			-1);
-			
+                        &iter, 
+                        0, _("Advanced Stream Redirector"),
+                        1, "asx",
+                        2, PAROLE_PL_FORMAT_ASX,
+                        -1);
+            
     gtk_list_store_append (store, &iter);
     gtk_list_store_set (store, 
-			&iter, 
-			0, _("Shareable Playlist"),
-			1, "xspf",
-			2, PAROLE_PL_FORMAT_XSPF,
-			-1);
+                        &iter, 
+                        0, _("Shareable Playlist"),
+                        1, "xspf",
+                        2, PAROLE_PL_FORMAT_XSPF,
+                        -1);
 
     view = GTK_WIDGET (gtk_builder_get_object (builder, "treeview"));
     
@@ -884,7 +900,7 @@ parole_media_list_get_first_path (GtkTreeModel *model)
     
     if (gtk_tree_model_get_iter_first (model, &iter) )
     {
-	path = gtk_tree_model_get_path (GTK_TREE_MODEL (model), &iter);
+        path = gtk_tree_model_get_path (GTK_TREE_MODEL (model), &iter);
     }
     
     return path;
@@ -912,14 +928,14 @@ parole_media_list_paths_to_row_list (GList *path_list, GtkTreeModel *model)
     
     for ( i = 0; i < len; i++)
     {
-	GtkTreePath *path;
-	GtkTreeRowReference *row;
-	
-	path = g_list_nth_data (path_list, i);
-	
-	row = gtk_tree_row_reference_new (model, path);
-	path = gtk_tree_row_reference_get_path (row);
-	row_list = g_list_append (row_list, row);
+        GtkTreePath *path;
+        GtkTreeRowReference *row;
+        
+        path = g_list_nth_data (path_list, i);
+        
+        row = gtk_tree_row_reference_new (model, path);
+        path = gtk_tree_row_reference_get_path (row);
+        row_list = g_list_append (row_list, row);
     }
     
     return row_list;
@@ -939,7 +955,7 @@ parole_media_list_remove_clicked_cb (GtkButton *button, ParoleMediaList *list)
 
     /* Get the GtkTreePath GList of all selected rows */
     path_list = gtk_tree_selection_get_selected_rows (list->priv->sel, &model);
-	
+    
     /**
      * Convert them to row references so when we remove one the others always points
      * to the correct node.
@@ -952,20 +968,20 @@ parole_media_list_remove_clicked_cb (GtkButton *button, ParoleMediaList *list)
      **/
     if (g_list_length (path_list) != 0)
     {
-	GtkTreePath *path, *prev;
-	
-	/* Get first item */
-	path = g_list_nth_data (path_list, 0);
-	
-	/* copy it as we don't mess with the list*/
-	prev = gtk_tree_path_copy (path);
-	
-	if ( gtk_tree_path_prev (prev) )
-	{
-	    parole_media_list_select_path (list, FALSE, prev);
-	    row_selected = TRUE;
-	}
-	gtk_tree_path_free (prev);
+        GtkTreePath *path, *prev;
+        
+        /* Get first item */
+        path = g_list_nth_data (path_list, 0);
+        
+        /* copy it as we don't mess with the list*/
+        prev = gtk_tree_path_copy (path);
+        
+        if ( gtk_tree_path_prev (prev) )
+        {
+            parole_media_list_select_path (list, FALSE, prev);
+            row_selected = TRUE;
+        }
+        gtk_tree_path_free (prev);
     }
     
     g_list_foreach (path_list, (GFunc) gtk_tree_path_free, NULL);
@@ -975,16 +991,16 @@ parole_media_list_remove_clicked_cb (GtkButton *button, ParoleMediaList *list)
     
     for ( i = 0; i < len; i++)
     {
-	GtkTreePath *path;
-	GtkTreeRowReference *row;
-	row = g_list_nth_data (row_list, i);
-	path = gtk_tree_row_reference_get_path (row);
-    
-	if ( G_LIKELY (gtk_tree_model_get_iter (model, &iter, path) == TRUE ) )
-	{
-	    gtk_list_store_remove (GTK_LIST_STORE (model),
-				   &iter);
-	}
+        GtkTreePath *path;
+        GtkTreeRowReference *row;
+        row = g_list_nth_data (row_list, i);
+        path = gtk_tree_row_reference_get_path (row);
+        
+        if ( G_LIKELY (gtk_tree_model_get_iter (model, &iter, path) == TRUE ) )
+        {
+            gtk_list_store_remove (GTK_LIST_STORE (model),
+                       &iter);
+        }
     }
     
     g_list_foreach (row_list, (GFunc) gtk_tree_row_reference_free, NULL);
@@ -993,10 +1009,10 @@ parole_media_list_remove_clicked_cb (GtkButton *button, ParoleMediaList *list)
     /* No row was selected, then select the first one*/
     if (!row_selected)
     {
-	GtkTreePath *path;
-	path = parole_media_list_get_first_path (model);
-	parole_media_list_select_path (list, FALSE, path);
-	gtk_tree_path_free (path);
+        GtkTreePath *path;
+        path = parole_media_list_get_first_path (model);
+        parole_media_list_select_path (list, FALSE, path);
+        gtk_tree_path_free (path);
     }
     
     /*
@@ -1008,19 +1024,19 @@ parole_media_list_remove_clicked_cb (GtkButton *button, ParoleMediaList *list)
     
     if ( nch == 0)
     {
-	parole_media_list_set_widget_sensitive (list, FALSE);
-	gtk_label_set_text (GTK_LABEL(list->priv->n_items),_("Playlist empty"));
-	gtk_widget_hide (list->priv->n_items);
-	/*
-	 * Will emit the signal media_cursor_changed with FALSE because there is no any 
-	 * row remaining, so the player can disable click on the play button.
-	 */
-	g_signal_emit (G_OBJECT (list), signals [MEDIA_CURSOR_CHANGED], 0, FALSE);
+        parole_media_list_set_widget_sensitive (list, FALSE);
+        gtk_label_set_text (GTK_LABEL(list->priv->n_items),_("Playlist empty"));
+        gtk_widget_hide (list->priv->n_items);
+        /*
+         * Will emit the signal media_cursor_changed with FALSE because there is no any 
+         * row remaining, so the player can disable click on the play button.
+         */
+        g_signal_emit (G_OBJECT (list), signals [MEDIA_CURSOR_CHANGED], 0, FALSE);
     }
     else if ( nch == 1 )
-	gtk_label_set_text (GTK_LABEL(list->priv->n_items),g_strdup_printf (_("%i item"),nch));
+        gtk_label_set_text (GTK_LABEL(list->priv->n_items),g_strdup_printf (_("%i item"),nch));
     else
-	gtk_label_set_text (GTK_LABEL(list->priv->n_items),g_strdup_printf (_("%i items"),nch));
+        gtk_label_set_text (GTK_LABEL(list->priv->n_items),g_strdup_printf (_("%i items"),nch));
 }
 
 /**
@@ -1030,25 +1046,23 @@ parole_media_list_remove_clicked_cb (GtkButton *button, ParoleMediaList *list)
  **/
 void
 parole_media_list_row_activated_cb (GtkTreeView *view, GtkTreePath *path, 
-				    GtkTreeViewColumn *col, ParoleMediaList *list)
+                    GtkTreeViewColumn *col, ParoleMediaList *list)
 {
     GtkTreeRowReference *row;
     
     if (gtk_notebook_get_current_page(GTK_NOTEBOOK(list->priv->playlist_notebook)) == 0)
-    row = gtk_tree_row_reference_new (gtk_tree_view_get_model (GTK_TREE_VIEW (list->priv->view)), 
-				      path);
+        row = gtk_tree_row_reference_new (gtk_tree_view_get_model (GTK_TREE_VIEW (list->priv->view)), path);
     else
-    row = gtk_tree_row_reference_new (gtk_tree_view_get_model (GTK_TREE_VIEW (list->priv->disc_view)), 
-				      path);
-				      
+        row = gtk_tree_row_reference_new (gtk_tree_view_get_model (GTK_TREE_VIEW (list->priv->disc_view)), path);
+                      
     g_signal_emit (G_OBJECT (list), signals [MEDIA_ACTIVATED], 0, row);
 }
 
 static void
 parole_media_list_selection_changed_cb (GtkTreeSelection *sel, ParoleMediaList *list)
 {
-    g_signal_emit (G_OBJECT (list), signals [MEDIA_CURSOR_CHANGED], 0,
-		   gtk_tree_selection_count_selected_rows (sel) > 0); 
+    g_signal_emit  (G_OBJECT (list), signals [MEDIA_CURSOR_CHANGED], 0,
+                    gtk_tree_selection_count_selected_rows (sel) > 0); 
 }
 
 static void
@@ -1060,23 +1074,22 @@ parole_media_list_open_folder (GtkWidget *menu)
     
     if (dirname)
     {
-	gchar *uri;
-	uri = g_filename_to_uri (dirname, NULL, NULL);
-	TRACE ("Opening %s", dirname);
-	gtk_show_uri (gtk_widget_get_screen (menu),  uri, GDK_CURRENT_TIME, NULL);
-	
-	g_free (uri);
+        gchar *uri;
+        uri = g_filename_to_uri (dirname, NULL, NULL);
+        TRACE ("Opening %s", dirname);
+        gtk_show_uri (gtk_widget_get_screen (menu),  uri, GDK_CURRENT_TIME, NULL);
+        
+        g_free (uri);
     }
 }
 
 static void
 parole_media_list_add_open_containing_folder (ParoleMediaList *list, GtkWidget *menu,
-					      gint x, gint y)
+                          gint x, gint y)
 {
     
     GtkTreePath *path;
     
-    
     if (gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (list->priv->view),
                                        x,
                                        y,
@@ -1085,52 +1098,50 @@ parole_media_list_add_open_containing_folder (ParoleMediaList *list, GtkWidget *
                                        NULL,
                                        NULL))
     {
-	
-	GtkTreeIter iter;
-	
-	if ( path && gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store), &iter, path))
+    
+    GtkTreeIter iter;
+    
+    if ( path && gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store), &iter, path))
+    {
+        ParoleFile *file;
+        const gchar *filename;
+        const gchar *uri;
+        
+        gtk_tree_model_get (GTK_TREE_MODEL (list->priv->store), &iter,
+                            DATA_COL, &file,
+                            -1);
+                
+        filename = parole_file_get_file_name (file);
+        uri = parole_file_get_uri (file);
+        
+        if (g_str_has_prefix (uri, "file:///"))
         {
-	    ParoleFile *file;
-	    const gchar *filename;
-	    const gchar *uri;
-	    
-	    gtk_tree_model_get (GTK_TREE_MODEL (list->priv->store), &iter,
-				DATA_COL, &file,
-				-1);
-			    
-	    filename = parole_file_get_file_name (file);
-	    uri = parole_file_get_uri (file);
-	    
-	    if (g_str_has_prefix (uri, "file:///"))
-	    {
-		GtkWidget *mi, *img;
-		gchar *dirname;
-	    
-		dirname = g_path_get_dirname (filename);
-		
-		/* Clear */
-		mi = gtk_image_menu_item_new_with_label (_("Open Containing Folder"));
-		img = gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU);
-		gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi), img);
-		gtk_widget_set_sensitive (mi, TRUE);
-		gtk_widget_show (mi);
-		g_signal_connect_swapped (mi, "activate",
-					  G_CALLBACK (parole_media_list_open_folder), menu);
-		
-		g_object_set_data (G_OBJECT (menu), "folder", dirname);
-		
-		gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
-		
-		
-		mi = gtk_separator_menu_item_new ();
-		gtk_widget_show (mi);
-		gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
-		
-		
-	    }
-	    
-	    gtk_tree_path_free (path);
-	}
+            GtkWidget *mi, *img;
+            gchar *dirname;
+            
+            dirname = g_path_get_dirname (filename);
+            
+            /* Clear */
+            mi = gtk_image_menu_item_new_with_label (_("Open Containing Folder"));
+            img = gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU);
+            gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi), img);
+            gtk_widget_set_sensitive (mi, TRUE);
+            gtk_widget_show (mi);
+            g_signal_connect_swapped   (mi, "activate",
+                                        G_CALLBACK (parole_media_list_open_folder), menu);
+            
+            g_object_set_data (G_OBJECT (menu), "folder", dirname);
+            
+            gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
+            
+            
+            mi = gtk_separator_menu_item_new ();
+            gtk_widget_show (mi);
+            gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
+        }
+        
+        gtk_tree_path_free (path);
+    }
     }
 }
 
@@ -1162,17 +1173,17 @@ static void
 replace_list_activated_cb (GtkWidget *mi, ParoleConf *conf)
 {
     g_object_set (G_OBJECT (conf),
-		  "replace-playlist", gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (mi)),
-		  NULL);
+                  "replace-playlist", gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (mi)),
+                  NULL);
 }
 
 static void
 play_opened_files_activated_cb (GtkWidget *mi, ParoleConf *conf)
 {
     g_object_set (G_OBJECT (conf),
-		  "play-opened-files", gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (mi)),
-		  NULL);
-		
+                  "play-opened-files", gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (mi)),
+                  NULL);
+        
 }
 
 static void
@@ -1181,12 +1192,12 @@ remember_playlist_activated_cb (GtkWidget *mi, ParoleConf *conf)
     gchar *playlist_filename;
     GFile *playlist_file;
     g_object_set (G_OBJECT (conf),
-		  "remember-playlist", gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (mi)),
-		  NULL);
+                  "remember-playlist", gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (mi)),
+                  NULL);
     if (!gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (mi))) {
         playlist_filename = xfce_resource_save_location (XFCE_RESOURCE_DATA, 
-                                                     PAROLE_AUTO_SAVED_PLAYLIST, 
-                                                     FALSE);
+                                                         PAROLE_AUTO_SAVED_PLAYLIST, 
+                                                         FALSE);
         playlist_file = g_file_new_for_path(playlist_filename);
         g_file_delete(playlist_file, NULL, NULL);
         g_free(playlist_filename);
@@ -1196,36 +1207,36 @@ remember_playlist_activated_cb (GtkWidget *mi, ParoleConf *conf)
 static void
 repeat_activated_cb (GtkWidget *mi, ParoleMediaList *list)
 {
-	gboolean active = gtk_check_menu_item_get_active( GTK_CHECK_MENU_ITEM( mi ) );
+    gboolean active = gtk_check_menu_item_get_active( GTK_CHECK_MENU_ITEM( mi ) );
     gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON( list->priv->repeat_button ), active);
 }
 
 static void
 shuffle_activated_cb (GtkWidget *mi, ParoleMediaList *list)
 {
-	gboolean active = gtk_check_menu_item_get_active( GTK_CHECK_MENU_ITEM( mi ) );
+    gboolean active = gtk_check_menu_item_get_active( GTK_CHECK_MENU_ITEM( mi ) );
     gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON( list->priv->shuffle_button ), active);
 }
 
 void
 parole_media_list_menu_pos (GtkMenu *menu, gint *px, gint *py, gboolean *push_in, gpointer data)
 {
-	gint x, y;
-	GtkAllocation widget_allocation, menu_allocation;
-	GtkWidget *widget = gtk_menu_get_attach_widget( menu );
-	GdkWindow *window;
+    gint x, y;
+    GtkAllocation widget_allocation, menu_allocation;
+    GtkWidget *widget = gtk_menu_get_attach_widget( menu );
+    GdkWindow *window;
 
     *push_in = TRUE;
-	
-	gtk_widget_get_allocation( widget, &widget_allocation );
-	gtk_widget_get_allocation( GTK_WIDGET(menu), &menu_allocation );
-	
-	window = gtk_widget_get_window( widget );
-	gdk_window_get_position( window, &x, &y );
-	
-	if (widget_allocation.width > 100)
-	gtk_widget_set_size_request(GTK_WIDGET(menu), widget_allocation.width, -1);
-	
+    
+    gtk_widget_get_allocation( widget, &widget_allocation );
+    gtk_widget_get_allocation( GTK_WIDGET(menu), &menu_allocation );
+    
+    window = gtk_widget_get_window( widget );
+    gdk_window_get_position( window, &x, &y );
+    
+    if (widget_allocation.width > 100)
+        gtk_widget_set_size_request(GTK_WIDGET(menu), widget_allocation.width, -1);
+    
     *px = x + widget_allocation.x;
     *py = y + widget_allocation.y + widget_allocation.height;
 }
@@ -1233,7 +1244,7 @@ parole_media_list_menu_pos (GtkMenu *menu, gint *px, gint *py, gboolean *push_in
 static void
 parole_media_list_hide_menu (GtkWidget *widget)
 {
-	gtk_toggle_tool_button_set_active( GTK_TOGGLE_TOOL_BUTTON( widget ), FALSE );
+    gtk_toggle_tool_button_set_active( GTK_TOGGLE_TOOL_BUTTON( widget ), FALSE );
 }
 
 static void
@@ -1245,7 +1256,7 @@ parole_media_list_destroy_menu (GtkWidget *menu)
     
     if (dirname)
     {
-	g_free (dirname);
+        g_free (dirname);
     }
     
     gtk_widget_destroy (menu);
@@ -1254,7 +1265,7 @@ parole_media_list_destroy_menu (GtkWidget *menu)
 static void
 menu_detach( GtkMenu *menu )
 {
-	//gtk_menu_detach (menu);
+    //gtk_menu_detach (menu);
 }
 
 void
@@ -1307,13 +1318,13 @@ parole_media_list_show_dvd_menu (GtkToggleButton *button, ParoleMediaList *list)
 {
     gboolean toggled = gtk_toggle_button_get_active( button );
     GtkBuilder *builder;
-	GtkMenu *menu;
-	GtkMenuItem *dvd_menu, *title_menu, *audio_menu, *angle_menu, *chapter_menu;
-	
-	if (!toggled)
-	return;
-	
-	builder = parole_builder_new_from_string (playlist_ui, playlist_ui_length);
+    GtkMenu *menu;
+    GtkMenuItem *dvd_menu, *title_menu, *audio_menu, *angle_menu, *chapter_menu;
+    
+    if (!toggled)
+        return;
+    
+    builder = parole_builder_new_from_string (playlist_ui, playlist_ui_length);
     
     menu = GTK_MENU (gtk_builder_get_object (builder, "dvd-menu"));
     
@@ -1342,7 +1353,7 @@ parole_media_list_show_dvd_menu (GtkToggleButton *button, ParoleMediaList *list)
     g_signal_connect_swapped (menu, "selection-done",
                               G_CALLBACK (parole_media_list_destroy_menu), menu);
                               
-	g_signal_connect_swapped (menu, "destroy",
+    g_signal_connect_swapped (menu, "destroy",
                               G_CALLBACK (parole_media_list_hide_menu), list->priv->dvd_menu_button);
     
     gtk_menu_popup (GTK_MENU (menu), 
@@ -1354,16 +1365,16 @@ parole_media_list_show_dvd_menu (GtkToggleButton *button, ParoleMediaList *list)
 static void
 parole_media_list_show_button_menu (GtkToggleToolButton *button, ParoleMediaList *list)
 {
-	gboolean toggled = gtk_toggle_tool_button_get_active( button );
-	gboolean val;
-	GtkBuilder *builder;
-	GtkMenu *menu;
-	GtkMenuItem *clear;
-	GtkCheckMenuItem *repeat_menu, *shuffle_menu, *replace, *play_opened;
-	GtkCheckMenuItem *remember;
-	
-	if (!toggled)
-	return;
+    gboolean toggled = gtk_toggle_tool_button_get_active( button );
+    gboolean val;
+    GtkBuilder *builder;
+    GtkMenu *menu;
+    GtkMenuItem *clear;
+    GtkCheckMenuItem *repeat_menu, *shuffle_menu, *replace, *play_opened;
+    GtkCheckMenuItem *remember;
+    
+    if (!toggled)
+        return;
     
     builder = parole_builder_new_from_string (playlist_ui, playlist_ui_length);
     
@@ -1378,38 +1389,38 @@ parole_media_list_show_button_menu (GtkToggleToolButton *button, ParoleMediaList
     gtk_menu_attach_to_widget( GTK_MENU(menu), list->priv->settings_button, (GtkMenuDetachFunc) menu_detach );
 
     g_object_get (G_OBJECT (list->priv->conf),
-		  "repeat", &val,
-		  NULL);
+                  "repeat", &val,
+                  NULL);
     gtk_check_menu_item_set_active (repeat_menu, val);
     g_signal_connect (repeat_menu, "activate",
                       G_CALLBACK (repeat_activated_cb), list);
 
     g_object_get (G_OBJECT (list->priv->conf),
-		  "shuffle", &val,
-		  NULL);
+                  "shuffle", &val,
+                  NULL);
 
     gtk_check_menu_item_set_active (shuffle_menu, val);
     g_signal_connect (shuffle_menu, "activate",
                       G_CALLBACK (shuffle_activated_cb), list);
-			      
+                  
     g_object_get (G_OBJECT (list->priv->conf),
-		  "replace-playlist", &val,
-		  NULL);
+                  "replace-playlist", &val,
+                  NULL);
 
     gtk_check_menu_item_set_active (replace, val);
     g_signal_connect (replace, "activate",
                       G_CALLBACK (replace_list_activated_cb), list->priv->conf);
-			      
+                  
     g_object_get (G_OBJECT (list->priv->conf),
-		  "play-opened-files", &val,
-		  NULL);
+                  "play-opened-files", &val,
+                  NULL);
     gtk_check_menu_item_set_active (play_opened, val);
     g_signal_connect (play_opened, "activate",
                       G_CALLBACK (play_opened_files_activated_cb), list->priv->conf);
 
     g_object_get (G_OBJECT (list->priv->conf),
-		  "remember-playlist", &val,
-		  NULL);
+                  "remember-playlist", &val,
+                  NULL);
     gtk_check_menu_item_set_active (remember, val);
     g_signal_connect (remember, "activate",
                       G_CALLBACK (remember_playlist_activated_cb), list->priv->conf);
@@ -1420,7 +1431,7 @@ parole_media_list_show_button_menu (GtkToggleToolButton *button, ParoleMediaList
     g_signal_connect_swapped (menu, "selection-done",
                               G_CALLBACK (parole_media_list_destroy_menu), menu);
                               
-	g_signal_connect_swapped (menu, "destroy",
+    g_signal_connect_swapped (menu, "destroy",
                               G_CALLBACK (parole_media_list_hide_menu), list->priv->settings_button);
     
     gtk_menu_popup (GTK_MENU (menu), 
@@ -1439,9 +1450,9 @@ parole_media_list_show_menu (ParoleMediaList *list, GdkEventButton *ev)
     GtkBuilder *builder;
     
     GtkMenu *menu;
-	GtkMenuItem *clear;
-	GtkCheckMenuItem *repeat_menu, *shuffle_menu, *replace, *play_opened;
-	GtkCheckMenuItem *remember;
+    GtkMenuItem *clear;
+    GtkCheckMenuItem *repeat_menu, *shuffle_menu, *replace, *play_opened;
+    GtkCheckMenuItem *remember;
     
     builder = parole_builder_new_from_string (playlist_ui, playlist_ui_length);
     
@@ -1456,38 +1467,38 @@ parole_media_list_show_menu (ParoleMediaList *list, GdkEventButton *ev)
     parole_media_list_add_open_containing_folder (list, GTK_WIDGET(menu), (gint)ev->x, (gint)ev->y);
 
     g_object_get (G_OBJECT (list->priv->conf),
-		  "repeat", &val,
-		  NULL);
+                  "repeat", &val,
+                  NULL);
     gtk_check_menu_item_set_active (repeat_menu, val);
     g_signal_connect (repeat_menu, "activate",
                       G_CALLBACK (repeat_activated_cb), list);
 
     g_object_get (G_OBJECT (list->priv->conf),
-		  "shuffle", &val,
-		  NULL);
+                  "shuffle", &val,
+                  NULL);
 
     gtk_check_menu_item_set_active (shuffle_menu, val);
     g_signal_connect (shuffle_menu, "activate",
                       G_CALLBACK (shuffle_activated_cb), list);
-			      
+                  
     g_object_get (G_OBJECT (list->priv->conf),
-		  "replace-playlist", &val,
-		  NULL);
+                  "replace-playlist", &val,
+                  NULL);
 
     gtk_check_menu_item_set_active (replace, val);
     g_signal_connect (replace, "activate",
                       G_CALLBACK (replace_list_activated_cb), list->priv->conf);
-			      
+                  
     g_object_get (G_OBJECT (list->priv->conf),
-		  "play-opened-files", &val,
-		  NULL);
+                  "play-opened-files", &val,
+                  NULL);
     gtk_check_menu_item_set_active (play_opened, val);
     g_signal_connect (play_opened, "activate",
                       G_CALLBACK (play_opened_files_activated_cb), list->priv->conf);
 
     g_object_get (G_OBJECT (list->priv->conf),
-		  "remember-playlist", &val,
-		  NULL);
+                  "remember-playlist", &val,
+                  NULL);
     gtk_check_menu_item_set_active (remember, val);
     g_signal_connect (remember, "activate",
                       G_CALLBACK (remember_playlist_activated_cb), list->priv->conf);
@@ -1509,8 +1520,8 @@ parole_media_list_button_release_event (GtkWidget *widget, GdkEventButton *ev, P
 {
     if ( ev->button == 3 )
     {
-	parole_media_list_show_menu (list, ev);
-	return TRUE;
+        parole_media_list_show_menu (list, ev);
+        return TRUE;
     }
     
     return FALSE;
@@ -1521,13 +1532,13 @@ parole_media_list_select_path (ParoleMediaList *list, gboolean disc, GtkTreePath
 {
     if (disc)
     {
-    gtk_tree_selection_select_path (list->priv->disc_sel, path);
-    gtk_tree_view_set_cursor (GTK_TREE_VIEW (list->priv->disc_view), path, NULL, FALSE);
+        gtk_tree_selection_select_path (list->priv->disc_sel, path);
+        gtk_tree_view_set_cursor (GTK_TREE_VIEW (list->priv->disc_view), path, NULL, FALSE);
     }
     else
     {
-    gtk_tree_selection_select_path (list->priv->sel, path);
-    gtk_tree_view_set_cursor (GTK_TREE_VIEW (list->priv->view), path, NULL, FALSE);
+        gtk_tree_selection_select_path (list->priv->sel, path);
+        gtk_tree_view_set_cursor (GTK_TREE_VIEW (list->priv->view), path, NULL, FALSE);
     }
 }
 
@@ -1541,7 +1552,7 @@ parole_media_list_get_row_reference_from_iter (ParoleMediaList *list, GtkTreeIte
     row = gtk_tree_row_reference_new (GTK_TREE_MODEL (list->priv->store), path);
     
     if ( select_path)
-	parole_media_list_select_path (list, FALSE, path);
+        parole_media_list_select_path (list, FALSE, path);
     
     gtk_tree_path_free (path);
     
@@ -1594,7 +1605,7 @@ parole_media_list_class_init (ParoleMediaListClass *klass)
                       g_cclosure_marshal_VOID__STRING,
                       G_TYPE_NONE, 1, G_TYPE_STRING);
                       
-	signals[SHUFFLE_TOGGLED] = 
+    signals[SHUFFLE_TOGGLED] = 
         g_signal_new ("shuffle-toggled",
                       PAROLE_TYPE_MEDIA_LIST,
                       G_SIGNAL_RUN_LAST,
@@ -1603,7 +1614,7 @@ parole_media_list_class_init (ParoleMediaListClass *klass)
                       g_cclosure_marshal_VOID__BOOLEAN,
                       G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
                       
-	signals[REPEAT_TOGGLED] = 
+    signals[REPEAT_TOGGLED] = 
         g_signal_new ("repeat-toggled",
                       PAROLE_TYPE_MEDIA_LIST,
                       G_SIGNAL_RUN_LAST,
@@ -1672,14 +1683,14 @@ parole_media_list_setup_view (ParoleMediaList *list)
     gtk_tree_view_column_pack_start (col, renderer, TRUE);
     gtk_tree_view_column_set_attributes (col, renderer, "text", NAME_COL, NULL);
     g_object_set (renderer, 
-		  "ellipsize", PANGO_ELLIPSIZE_END, 
-		  NULL);
-		  
+                  "ellipsize", PANGO_ELLIPSIZE_END, 
+                  NULL);
+          
     gtk_tree_view_column_pack_start (disc_col, disc_renderer, TRUE);
     gtk_tree_view_column_set_attributes (disc_col, disc_renderer, "text", NAME_COL, NULL);
     g_object_set (disc_renderer, 
-		  "ellipsize", PANGO_ELLIPSIZE_END, 
-		  NULL);
+                  "ellipsize", PANGO_ELLIPSIZE_END, 
+                  NULL);
     
     /**
      * Media length
@@ -1706,9 +1717,9 @@ parole_media_list_setup_view (ParoleMediaList *list)
     gtk_tree_selection_set_mode (sel, GTK_SELECTION_MULTIPLE);
     
     g_signal_connect (sel, "changed",
-		      G_CALLBACK (parole_media_list_selection_changed_cb), list);
+              G_CALLBACK (parole_media_list_selection_changed_cb), list);
     g_signal_connect (disc_sel, "changed",
-		      G_CALLBACK (parole_media_list_selection_changed_cb), list);
+              G_CALLBACK (parole_media_list_selection_changed_cb), list);
     
     list->priv->store = list_store;
     list->priv->disc_store = disc_list_store;
@@ -1735,7 +1746,7 @@ parole_media_list_init (ParoleMediaList *list)
     list->priv->playlist_notebook = GTK_WIDGET (gtk_builder_get_object(builder, "playlist_notebook"));
     
     g_signal_connect (GTK_TOGGLE_BUTTON(list->priv->dvd_menu_button), "toggled",
-		      G_CALLBACK (parole_media_list_show_dvd_menu), list);
+              G_CALLBACK (parole_media_list_show_dvd_menu), list);
     
     list->priv->view = GTK_WIDGET (gtk_builder_get_object (builder, "media-list"));
     list->priv->disc_view = GTK_WIDGET (gtk_builder_get_object (builder, "disc-list"));
@@ -1754,7 +1765,7 @@ parole_media_list_init (ParoleMediaList *list)
     list->priv->n_items = GTK_WIDGET (gtk_builder_get_object (builder, "n_items"));
     
     g_signal_connect (GTK_TOGGLE_TOOL_BUTTON(list->priv->settings_button), "toggled",
-		      G_CALLBACK (parole_media_list_show_button_menu), list);
+              G_CALLBACK (parole_media_list_show_button_menu), list);
 
     gtk_builder_connect_signals (builder, list);
 
@@ -1772,12 +1783,12 @@ parole_media_list_get (void)
     
     if ( G_LIKELY (list != NULL ) )
     {
-	g_object_ref (list);
+        g_object_ref (list);
     }
     else
     {
-	list = g_object_new (PAROLE_TYPE_MEDIA_LIST, NULL);
-	g_object_add_weak_pointer (list, &list);
+        list = g_object_new (PAROLE_TYPE_MEDIA_LIST, NULL);
+        g_object_add_weak_pointer (list, &list);
     }
     
     return GTK_WIDGET (list);
@@ -1790,25 +1801,25 @@ void parole_media_list_load (ParoleMediaList *list)
     GSList     *fileslist = NULL;
     
     g_object_get (G_OBJECT (list->priv->conf),
-		  "play-opened-files", &play,
-		  "remember-playlist", &load_saved_list,
-		  NULL);
+                  "play-opened-files", &play,
+                  "remember-playlist", &load_saved_list,
+                  NULL);
     
     if ( load_saved_list )
     {
-	gchar *playlist_file;
-	
-	playlist_file = xfce_resource_save_location (XFCE_RESOURCE_DATA, 
-			 		             PAROLE_AUTO_SAVED_PLAYLIST, 
-						     FALSE);
-	if ( playlist_file )
-	{
-	    fileslist = parole_pl_parser_parse_from_file_by_extension (playlist_file);
-	    g_free (playlist_file);
-	    
-	    parole_media_list_files_open (list, fileslist, FALSE, play);
-	    g_slist_free (fileslist);
-	}
+        gchar *playlist_file;
+        
+        playlist_file = xfce_resource_save_location (XFCE_RESOURCE_DATA, 
+                                     PAROLE_AUTO_SAVED_PLAYLIST, 
+                                 FALSE);
+        if ( playlist_file )
+        {
+            fileslist = parole_pl_parser_parse_from_file_by_extension (playlist_file);
+            g_free (playlist_file);
+            
+            parole_media_list_files_open (list, fileslist, FALSE, play);
+            g_slist_free (fileslist);
+        }
     }
     
 }
@@ -1856,8 +1867,8 @@ parole_media_list_add_by_path (ParoleMediaList *list, const gchar *path, gboolea
 }
 
 GtkTreeRowReference *parole_media_list_get_next_row (ParoleMediaList *list, 
-						     GtkTreeRowReference *row,
-						     gboolean repeat)
+                             GtkTreeRowReference *row,
+                             gboolean repeat)
 {
     GtkTreeRowReference *next = NULL;
     GtkTreePath *path;
@@ -1866,7 +1877,7 @@ GtkTreeRowReference *parole_media_list_get_next_row (ParoleMediaList *list,
     g_return_val_if_fail (row != NULL, NULL);
 
     if ( !gtk_tree_row_reference_valid (row) )
-	return NULL;
+        return NULL;
     
     path = gtk_tree_row_reference_get_path (row);
     
@@ -1874,15 +1885,15 @@ GtkTreeRowReference *parole_media_list_get_next_row (ParoleMediaList *list,
     
     if ( gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store), &iter, path))
     {
-	next = gtk_tree_row_reference_new (GTK_TREE_MODEL (list->priv->store), path);
-	//parole_media_list_select_path (list, path);
+        next = gtk_tree_row_reference_new (GTK_TREE_MODEL (list->priv->store), path);
+        //parole_media_list_select_path (list, path);
     }
     else if ( repeat ) /* Repeat playing ?*/
     {
-	if ( gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list->priv->store), &iter))
-	{
-	    next =  parole_media_list_get_row_reference_from_iter (list, &iter, TRUE);
-	}
+        if ( gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list->priv->store), &iter))
+        {
+            next =  parole_media_list_get_row_reference_from_iter (list, &iter, TRUE);
+        }
     }
     
     gtk_tree_path_free (path);
@@ -1891,7 +1902,7 @@ GtkTreeRowReference *parole_media_list_get_next_row (ParoleMediaList *list,
 }
 
 GtkTreeRowReference *parole_media_list_get_prev_row (ParoleMediaList *list,
-						     GtkTreeRowReference *row)
+                             GtkTreeRowReference *row)
 {
     GtkTreeRowReference *prev = NULL;
     GtkTreePath *path;
@@ -1900,7 +1911,7 @@ GtkTreeRowReference *parole_media_list_get_prev_row (ParoleMediaList *list,
     g_return_val_if_fail (row != NULL, NULL);
 
     if ( !gtk_tree_row_reference_valid (row) )
-	return NULL;
+        return NULL;
     
     path = gtk_tree_row_reference_get_path (row);
     
@@ -1908,11 +1919,11 @@ GtkTreeRowReference *parole_media_list_get_prev_row (ParoleMediaList *list,
     
     if ( gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store), &iter, path))
     {
-	prev = gtk_tree_row_reference_new (GTK_TREE_MODEL (list->priv->store), path);
-	//parole_media_list_select_path (list, path);
+        prev = gtk_tree_row_reference_new (GTK_TREE_MODEL (list->priv->store), path);
+        //parole_media_list_select_path (list, path);
     }
     else
-	prev = row;
+        prev = row;
     
     gtk_tree_path_free (path);
     
@@ -1920,7 +1931,7 @@ GtkTreeRowReference *parole_media_list_get_prev_row (ParoleMediaList *list,
 }
 
 GtkTreeRowReference *parole_media_list_get_row_n (ParoleMediaList *list, 
-						                          gint wanted_row)
+                                                  gint wanted_row)
 {
     GtkTreeRowReference *row = NULL;
     GtkTreePath *path;
@@ -1934,18 +1945,18 @@ GtkTreeRowReference *parole_media_list_get_row_n (ParoleMediaList *list,
     if (gtk_notebook_get_current_page(GTK_NOTEBOOK(list->priv->playlist_notebook)) == 0)
     {
         if ( gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store), &iter, path))
-        	row = gtk_tree_row_reference_new (GTK_TREE_MODEL (list->priv->store), path);
+            row = gtk_tree_row_reference_new (GTK_TREE_MODEL (list->priv->store), path);
     }
     else
     {
         if ( gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->disc_store), &iter, path))
-        	row = gtk_tree_row_reference_new (GTK_TREE_MODEL (list->priv->disc_store), path);
+            row = gtk_tree_row_reference_new (GTK_TREE_MODEL (list->priv->disc_store), path);
     }
     
     gtk_tree_path_free (path);
     
     if ( !gtk_tree_row_reference_valid (row) )
-	return NULL;
+        return NULL;
     
     return row;
 }
@@ -1964,7 +1975,7 @@ GtkTreeRowReference *parole_media_list_get_row_random (ParoleMediaList *list)
     
     if ( nch == 1 || nch == 0 )
     {
-	return  NULL;
+        return  NULL;
     }
     
     current_path = gtk_tree_path_to_string(gtk_tree_row_reference_get_path(parole_media_list_get_selected_row(list)));
@@ -1990,7 +2001,7 @@ GtkTreeRowReference *parole_media_list_get_row_random (ParoleMediaList *list)
     
     if ( gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store), &iter, path))
     {
-    row  = gtk_tree_row_reference_new (GTK_TREE_MODEL (list->priv->store), path);
+        row  = gtk_tree_row_reference_new (GTK_TREE_MODEL (list->priv->store), path);
     }
 
     gtk_tree_path_free (path);
@@ -2001,9 +2012,9 @@ GtkTreeRowReference *parole_media_list_get_row_random (ParoleMediaList *list)
 gboolean parole_media_list_is_selected_row  (ParoleMediaList *list)
 {   
     if (gtk_notebook_get_current_page(GTK_NOTEBOOK(list->priv->playlist_notebook)) == 0)
-    return gtk_tree_selection_count_selected_rows (list->priv->sel) > 0;
+        return gtk_tree_selection_count_selected_rows (list->priv->sel) > 0;
     else
-    return gtk_tree_selection_count_selected_rows (list->priv->disc_sel) > 0;
+        return gtk_tree_selection_count_selected_rows (list->priv->disc_sel) > 0;
 }
 
 gboolean parole_media_list_is_empty (ParoleMediaList *list)
@@ -2011,9 +2022,9 @@ gboolean parole_media_list_is_empty (ParoleMediaList *list)
     GtkTreeIter iter;
     
     if (gtk_notebook_get_current_page(GTK_NOTEBOOK(list->priv->playlist_notebook)) == 0)
-    return !gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list->priv->store), &iter);
+        return !gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list->priv->store), &iter);
     else
-    return !gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list->priv->disc_store), &iter);
+        return !gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list->priv->disc_store), &iter);
 }
 
 /**
@@ -2031,12 +2042,12 @@ GtkTreeRowReference *parole_media_list_get_first_row (ParoleMediaList *list)
     if (gtk_notebook_get_current_page(GTK_NOTEBOOK(list->priv->playlist_notebook)) == 0)
     {
         if ( gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list->priv->store), &iter) )
-	        row = parole_media_list_get_row_reference_from_iter (list, &iter, TRUE);
+            row = parole_media_list_get_row_reference_from_iter (list, &iter, TRUE);
     }
     else
     {
         if ( gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list->priv->disc_store), &iter) )
-    	    row = parole_media_list_get_row_reference_from_iter (list, &iter, TRUE);
+            row = parole_media_list_get_row_reference_from_iter (list, &iter, TRUE);
     }
     
     return row;
@@ -2072,11 +2083,11 @@ void parole_media_list_select_row (ParoleMediaList *list, GtkTreeRowReference *r
     
     if ( gtk_tree_row_reference_valid (row) )
     {
-	    path = gtk_tree_row_reference_get_path (row);
-	    parole_media_list_select_path (list, 
-	        gtk_notebook_get_current_page(GTK_NOTEBOOK(list->priv->playlist_notebook)) == 1, 
-	        path);
-	    gtk_tree_path_free (path);
+        path = gtk_tree_row_reference_get_path (row);
+        parole_media_list_select_path (list, 
+            gtk_notebook_get_current_page(GTK_NOTEBOOK(list->priv->playlist_notebook)) == 1, 
+            path);
+        gtk_tree_path_free (path);
     }
 }
 
@@ -2087,20 +2098,20 @@ void parole_media_list_set_row_pixbuf  (ParoleMediaList *list, GtkTreeRowReferen
     
     if ( gtk_tree_row_reference_valid (row) )
     {
-	path = gtk_tree_row_reference_get_path (row);
-	
-	if (gtk_notebook_get_current_page(GTK_NOTEBOOK(list->priv->playlist_notebook)) == 0)
-	{
-	    if ( gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store), &iter, path) )
-	        gtk_list_store_set (list->priv->store, &iter, PIXBUF_COL, pix, -1);
-	}
-	else
-	{
-	    if ( gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->disc_store), &iter, path) )
-	        gtk_list_store_set (list->priv->disc_store, &iter, PIXBUF_COL, pix, -1);
-	}
-
-	gtk_tree_path_free (path);
+        path = gtk_tree_row_reference_get_path (row);
+        
+        if (gtk_notebook_get_current_page(GTK_NOTEBOOK(list->priv->playlist_notebook)) == 0)
+        {
+            if ( gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store), &iter, path) )
+                gtk_list_store_set (list->priv->store, &iter, PIXBUF_COL, pix, -1);
+        }
+        else
+        {
+            if ( gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->disc_store), &iter, path) )
+                gtk_list_store_set (list->priv->disc_store, &iter, PIXBUF_COL, pix, -1);
+        }
+
+        gtk_tree_path_free (path);
     }
 }
 
@@ -2113,20 +2124,20 @@ GtkTreeRowReference *row)
     
     if ( gtk_tree_row_reference_valid (row) )
     {
-	path = gtk_tree_row_reference_get_path (row);
-	
-	if (gtk_notebook_get_current_page(GTK_NOTEBOOK(list->priv->playlist_notebook)) == 0)
-	{
-    	if ( gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store), &iter, path) )
-    	    gtk_tree_model_get (GTK_TREE_MODEL(list->priv->store), &iter, NAME_COL, &name, -1);
-	}
-	else
-	{
-    	if ( gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->disc_store), &iter, path) )
-    	    gtk_tree_model_get (GTK_TREE_MODEL(list->priv->store), &iter, NAME_COL, &name, -1);
-	}
-	
-	gtk_tree_path_free (path);
+        path = gtk_tree_row_reference_get_path (row);
+        
+        if (gtk_notebook_get_current_page(GTK_NOTEBOOK(list->priv->playlist_notebook)) == 0)
+        {
+            if ( gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store), &iter, path) )
+                gtk_tree_model_get (GTK_TREE_MODEL(list->priv->store), &iter, NAME_COL, &name, -1);
+        }
+        else
+        {
+            if ( gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->disc_store), &iter, path) )
+                gtk_tree_model_get (GTK_TREE_MODEL(list->priv->store), &iter, NAME_COL, &name, -1);
+        }
+        
+        gtk_tree_path_free (path);
     }
     
     return name;
@@ -2139,20 +2150,20 @@ void parole_media_list_set_row_name (ParoleMediaList *list, GtkTreeRowReference
     
     if ( gtk_tree_row_reference_valid (row) )
     {
-	path = gtk_tree_row_reference_get_path (row);
-	
-	if (gtk_notebook_get_current_page(GTK_NOTEBOOK(list->priv->playlist_notebook)) == 0)
-	{
-    	if ( gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store), &iter, path) )
-    	    gtk_list_store_set (list->priv->store, &iter, NAME_COL, name, -1);
-	}
-	else
-	{
-    	if ( gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->disc_store), &iter, path) )
-    	    gtk_list_store_set (list->priv->disc_store, &iter, NAME_COL, name, -1);
-	}
-	
-	gtk_tree_path_free (path);
+        path = gtk_tree_row_reference_get_path (row);
+        
+        if (gtk_notebook_get_current_page(GTK_NOTEBOOK(list->priv->playlist_notebook)) == 0)
+        {
+            if ( gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store), &iter, path) )
+                gtk_list_store_set (list->priv->store, &iter, NAME_COL, name, -1);
+        }
+        else
+        {
+            if ( gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->disc_store), &iter, path) )
+                gtk_list_store_set (list->priv->disc_store, &iter, NAME_COL, name, -1);
+        }
+        
+        gtk_tree_path_free (path);
     }
 }
 
@@ -2163,20 +2174,20 @@ void parole_media_list_set_row_length (ParoleMediaList *list, GtkTreeRowReferenc
     
     if ( gtk_tree_row_reference_valid (row) )
     {
-	path = gtk_tree_row_reference_get_path (row);
-	
-	if (gtk_notebook_get_current_page(GTK_NOTEBOOK(list->priv->playlist_notebook)) == 0)
-	{
-	    if ( gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store), &iter, path) )
-    	    gtk_list_store_set (list->priv->store, &iter, LENGTH_COL, len, -1);
-	}
-	else
-	{
-    	if ( gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->disc_store), &iter, path) )
-    	    gtk_list_store_set (list->priv->disc_store, &iter, LENGTH_COL, len, -1);
-	}
-	
-	gtk_tree_path_free (path);
+        path = gtk_tree_row_reference_get_path (row);
+        
+        if (gtk_notebook_get_current_page(GTK_NOTEBOOK(list->priv->playlist_notebook)) == 0)
+        {
+            if ( gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->store), &iter, path) )
+                gtk_list_store_set (list->priv->store, &iter, LENGTH_COL, len, -1);
+        }
+        else
+        {
+            if ( gtk_tree_model_get_iter (GTK_TREE_MODEL (list->priv->disc_store), &iter, path) )
+                gtk_list_store_set (list->priv->disc_store, &iter, LENGTH_COL, len, -1);
+        }
+        
+        gtk_tree_path_free (path);
     }
 }
 
@@ -2197,24 +2208,24 @@ gboolean parole_media_list_add_files (ParoleMediaList *list, gchar **filenames,
     
     for ( i = 0; filenames && filenames[i] != NULL; i++)
     {
-	/*
-	 * File on disk?
-	 */
-	if ( !enqueue && g_file_test (filenames[i], G_FILE_TEST_EXISTS ) )
-	{
-	    added += parole_media_list_add_by_path (list, filenames[i], i == 0 ? TRUE : FALSE);
-	}
-	else
-	{
-	    ParoleFile *file;
-	    TRACE ("File=%s", filenames[i]);
-	    file = parole_file_new (filenames[i]);
-		if (enqueue) {
-			parole_media_list_add (list, file, FALSE, FALSE, FALSE);}
-		else
-			parole_media_list_add (list, file, FALSE, i == 0 ? TRUE : FALSE, i == 0 ? TRUE : FALSE);
-	    added++;
-	}
+        /*
+         * File on disk?
+         */
+        if ( !enqueue && g_file_test (filenames[i], G_FILE_TEST_EXISTS ) )
+        {
+            added += parole_media_list_add_by_path (list, filenames[i], i == 0 ? TRUE : FALSE);
+        }
+        else
+        {
+            ParoleFile *file;
+            TRACE ("File=%s", filenames[i]);
+            file = parole_file_new (filenames[i]);
+            if (enqueue) {
+                parole_media_list_add (list, file, FALSE, FALSE, FALSE);}
+            else
+                parole_media_list_add (list, file, FALSE, i == 0 ? TRUE : FALSE, i == 0 ? TRUE : FALSE);
+            added++;
+        }
     }
     
     return added > 0;
@@ -2225,35 +2236,35 @@ void parole_media_list_save_list (ParoleMediaList *list)
     gboolean save;
     
     g_object_get (G_OBJECT (list->priv->conf),
-		  "remember-playlist", &save,
-		  NULL);
+                  "remember-playlist", &save,
+                  NULL);
     
     if ( save )
     {
-	GSList *fileslist;
-	gchar *history;
-
-	history = xfce_resource_save_location (XFCE_RESOURCE_DATA, PAROLE_AUTO_SAVED_PLAYLIST , TRUE);
-	
-	if ( !history )
-	{
-	    g_warning ("Failed to save playlist");
-	    return;
-	}
-	
-	fileslist = parole_media_list_get_files (list);
-	if ( g_slist_length (fileslist) > 0 )
-	{
-	    parole_pl_parser_save_from_files (fileslist, history, PAROLE_PL_FORMAT_M3U);
-	    g_slist_foreach (fileslist, (GFunc) g_object_unref, NULL);
-	}
-	g_slist_free (fileslist);
+        GSList *fileslist;
+        gchar *history;
+
+        history = xfce_resource_save_location (XFCE_RESOURCE_DATA, PAROLE_AUTO_SAVED_PLAYLIST , TRUE);
+        
+        if ( !history )
+        {
+            g_warning ("Failed to save playlist");
+            return;
+        }
+        
+        fileslist = parole_media_list_get_files (list);
+        if ( g_slist_length (fileslist) > 0 )
+        {
+            parole_pl_parser_save_from_files (fileslist, history, PAROLE_PL_FORMAT_M3U);
+            g_slist_foreach (fileslist, (GFunc) g_object_unref, NULL);
+        }
+        g_slist_free (fileslist);
     }
 }
 
-static gboolean	 parole_media_list_dbus_add_files (ParoleMediaList *list,
-					           gchar **in_files, gboolean enqueue,
-						   GError **error);
+static gboolean  parole_media_list_dbus_add_files  (ParoleMediaList *list,
+                                                    gchar **in_files, gboolean enqueue,
+                                                    GError **error);
 
 #include "org.parole.media.list.h"
 
@@ -2264,20 +2275,20 @@ static void
 parole_media_list_dbus_class_init (ParoleMediaListClass *klass)
 {
     dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (klass),
-				     &dbus_glib_parole_media_list_object_info);
+                     &dbus_glib_parole_media_list_object_info);
 }
 
 static void
 parole_media_list_dbus_init (ParoleMediaList *list)
 {
     dbus_g_connection_register_g_object (list->priv->bus,
-					 PAROLE_DBUS_PLAYLIST_PATH,
-					 G_OBJECT (list));
+                     PAROLE_DBUS_PLAYLIST_PATH,
+                     G_OBJECT (list));
 }
 
-static gboolean	 parole_media_list_dbus_add_files (ParoleMediaList *list,
-						   gchar **in_files, gboolean enqueue,
-						   GError **error)
+static gboolean  parole_media_list_dbus_add_files (ParoleMediaList *list,
+                           gchar **in_files, gboolean enqueue,
+                           GError **error)
 {
     TRACE ("Adding files for DBus request");
     gtk_window_present (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (list))));
@@ -2289,33 +2300,33 @@ static gboolean	 parole_media_list_dbus_add_files (ParoleMediaList *list,
 void parole_media_list_grab_focus (ParoleMediaList *list)
 {
     if (gtk_widget_get_visible (list->priv->view) )
-	gtk_widget_grab_focus (list->priv->view);
+        gtk_widget_grab_focus (list->priv->view);
 }
 
 void 
 parole_media_list_set_repeat_toggled (ParoleMediaList *list,
-									  gboolean repeat_toggled)
+                                      gboolean repeat_toggled)
 {
-	gboolean toggled;
+    gboolean toggled;
     
     toggled = gtk_toggle_tool_button_get_active (GTK_TOGGLE_TOOL_BUTTON (list->priv->repeat_button));
     
     if (toggled != repeat_toggled)
     {
-    	gtk_toggle_tool_button_set_active( GTK_TOGGLE_TOOL_BUTTON (list->priv->repeat_button), repeat_toggled );
-	}
+        gtk_toggle_tool_button_set_active( GTK_TOGGLE_TOOL_BUTTON (list->priv->repeat_button), repeat_toggled );
+    }
 }
-																
+                                                                
 void 
 parole_media_list_set_shuffle_toggled (ParoleMediaList *list,
-									  gboolean shuffle_toggled)
+                                      gboolean shuffle_toggled)
 {
-	gboolean toggled;
+    gboolean toggled;
     
     toggled = gtk_toggle_tool_button_get_active (GTK_TOGGLE_TOOL_BUTTON (list->priv->shuffle_button));
     
     if (toggled != shuffle_toggled)
     {
-    	gtk_toggle_tool_button_set_active( GTK_TOGGLE_TOOL_BUTTON (list->priv->shuffle_button), shuffle_toggled );
-	}
+        gtk_toggle_tool_button_set_active( GTK_TOGGLE_TOOL_BUTTON (list->priv->shuffle_button), shuffle_toggled );
+    }
 }
diff --git a/src/parole-medialist.h b/src/parole-medialist.h
index 8f81ac4..c4831be 100644
--- a/src/parole-medialist.h
+++ b/src/parole-medialist.h
@@ -51,121 +51,139 @@ typedef struct ParoleMediaListPrivate ParoleMediaListPrivate;
 
 typedef struct
 {
-    GtkVBox         		 parent;
+    GtkVBox                     parent;
     
-    ParoleMediaListPrivate     	*priv;
+    ParoleMediaListPrivate     *priv;
     
 } ParoleMediaList;
 
 typedef struct
 {
-    GtkVBoxClass  		 parent_class;
+    GtkVBoxClass    parent_class;
     
-    void			(*media_activated)		    (ParoleMediaList *list,
-								     GtkTreeRowReference *row);
-								  
-    void			(*media_cursor_changed)		    (ParoleMediaList *list,
-								     gboolean media_selected);
-								     
-    void			(*uri_opened)			    (ParoleMediaList *list,
-								     const gchar *uri);
-								     
-	void			(*shuffle_toggled)		    (ParoleMediaList *list,
-								     gboolean shuffle_toggled);
-								     
-	void			(*repeat_toggled)		    (ParoleMediaList *list,
-								     gboolean repeat_toggled);
-								     
-    void			(*show_playlist)		    (ParoleMediaList *list,
-								     gboolean show_playlist);
-								     
-    void			(*gst_dvd_nav_message)		    (ParoleMediaList *list,
-								     gint gst_dvd_nav_message);
+    void            (*media_activated)              (ParoleMediaList *list,
+                                                     GtkTreeRowReference *row);
+                                  
+    void            (*media_cursor_changed)         (ParoleMediaList *list,
+                                                     gboolean media_selected);
+                                     
+    void            (*uri_opened)                   (ParoleMediaList *list,
+                                                     const gchar *uri);
+                                     
+    void            (*shuffle_toggled)              (ParoleMediaList *list,
+                                                     gboolean shuffle_toggled);
+                                     
+    void            (*repeat_toggled)               (ParoleMediaList *list,
+                                                     gboolean repeat_toggled);
+                                     
+    void            (*show_playlist)                (ParoleMediaList *list,
+                                                     gboolean show_playlist);
+                                     
+    void            (*gst_dvd_nav_message)          (ParoleMediaList *list,
+                                                     gint gst_dvd_nav_message);
     
 } ParoleMediaListClass;
 
-GType        			 parole_media_list_get_type         (void) G_GNUC_CONST;
+GType               parole_media_list_get_type      (void) G_GNUC_CONST;
 
-GtkWidget       		*parole_media_list_get              (void);
+GtkWidget          *parole_media_list_get           (void);
 
-void				 parole_media_list_load             (ParoleMediaList *list);
+void                parole_media_list_load          (ParoleMediaList *list);
 
-void    parole_media_list_set_playlist_view(ParoleMediaList *list, gint view);
+void                    
+parole_media_list_set_playlist_view                 (ParoleMediaList *list, 
+                                                     gint view);
 
-void    parole_media_list_clear_disc_list (ParoleMediaList *list);
+void                    
+parole_media_list_clear_disc_list                   (ParoleMediaList *list);
 
-void	parole_media_list_clear_list 	  (ParoleMediaList *list);
+void                parole_media_list_clear_list    (ParoleMediaList *list);
 
+gboolean            parole_media_list_add_by_path   (ParoleMediaList *list, 
+                                                     const gchar *path, 
+                                                     gboolean emit);
 
-gboolean			 parole_media_list_add_by_path      (ParoleMediaList *list, 
-								     const gchar *path, 
-								     gboolean emit);
+gboolean            
+parole_media_list_is_selected_row                   (ParoleMediaList *list);
 
-gboolean			 parole_media_list_is_selected_row  (ParoleMediaList *list);
+gboolean            parole_media_list_is_empty      (ParoleMediaList *list);
 
-gboolean			 parole_media_list_is_empty	    (ParoleMediaList *list);
+GtkTreeRowReference
+*parole_media_list_get_first_row                    (ParoleMediaList *list);
 
-GtkTreeRowReference             *parole_media_list_get_first_row    (ParoleMediaList *list);
+GtkTreeRowReference
+*parole_media_list_get_selected_row                 (ParoleMediaList *list);
 
-GtkTreeRowReference		*parole_media_list_get_selected_row (ParoleMediaList *list);
+ParoleFile         
+*parole_media_list_get_selected_file                (ParoleMediaList *list);
 
-ParoleFile              *parole_media_list_get_selected_file (ParoleMediaList *list);
+void                parole_media_list_select_row    (ParoleMediaList *list,
+                                                     GtkTreeRowReference *row);
 
-void				 parole_media_list_select_row 	    (ParoleMediaList *list,
-								     GtkTreeRowReference *row);
+GtkTreeRowReference
+*parole_media_list_get_next_row                     (ParoleMediaList *list,
+                                                     GtkTreeRowReference *row,
+                                                     gboolean repeat);
 
-GtkTreeRowReference             *parole_media_list_get_next_row     (ParoleMediaList *list,
-								     GtkTreeRowReference *row,
-								     gboolean repeat);
+GtkTreeRowReference
+*parole_media_list_get_prev_row                     (ParoleMediaList *list,
+                                                     GtkTreeRowReference *row);
 
-GtkTreeRowReference             *parole_media_list_get_prev_row     (ParoleMediaList *list,
-								     GtkTreeRowReference *row);
+GtkTreeRowReference
+*parole_media_list_get_row_random                   (ParoleMediaList *list);
 
-GtkTreeRowReference		*parole_media_list_get_row_random   (ParoleMediaList *list);
+void
+parole_media_list_set_row_pixbuf                    (ParoleMediaList *list,
+                                                     GtkTreeRowReference *row,
+                                                     GdkPixbuf *pix);
+                                     
+gchar              *parole_media_list_get_row_name  (ParoleMediaList *list,
+                                                     GtkTreeRowReference *row);
 
-void				 parole_media_list_set_row_pixbuf   (ParoleMediaList *list,
-								     GtkTreeRowReference *row,
-								     GdkPixbuf *pix);
-								     
-gchar                   *parole_media_list_get_row_name (ParoleMediaList *list,
-GtkTreeRowReference *row);
+void                parole_media_list_set_row_name  (ParoleMediaList *list,
+                                                     GtkTreeRowReference *row,
+                                                     const gchar *name);
 
-void				 parole_media_list_set_row_name     (ParoleMediaList *list,
-							             GtkTreeRowReference *row,
-								     const gchar *name);
+void                
+parole_media_list_set_row_length                    (ParoleMediaList *list,
+                                                     GtkTreeRowReference *row,
+                                                     const gchar *length);
 
+void                parole_media_list_open          (ParoleMediaList *list);
 
-void				 parole_media_list_set_row_length   (ParoleMediaList *list,
-							             GtkTreeRowReference *row,
-								     const gchar *length);
+void                parole_media_list_open_location (ParoleMediaList *list);
 
-void				 parole_media_list_open		    (ParoleMediaList *list);
+gboolean            parole_media_list_add_files     (ParoleMediaList *list,
+                                                     gchar **filenames, 
+                                                     gboolean enqueue);
+                                     
+void                
+parole_media_list_add_cdda_tracks                   (ParoleMediaList *list, 
+                                                     gint n_tracks);
 
-void			         parole_media_list_open_location    (ParoleMediaList *list);
+void                
+parole_media_list_add_dvd_chapters                  (ParoleMediaList *list, 
+                                                     gint n_chapters);
 
-gboolean			 parole_media_list_add_files        (ParoleMediaList *list,
-								     gchar **filenames, gboolean enqueue);
-								     
-void                parole_media_list_add_cdda_tracks (ParoleMediaList *list, gint n_tracks);
+GtkTreeRowReference 
+*parole_media_list_get_row_n                        (ParoleMediaList *list, 
+                                                     gint wanted_row);
 
-void                parole_media_list_add_dvd_chapters (ParoleMediaList *list, gint n_chapters);
+void                parole_media_list_save_list     (ParoleMediaList *list);
 
-GtkTreeRowReference *parole_media_list_get_row_n (ParoleMediaList *list, 
-						                          gint wanted_row);
+void                parole_media_list_save_cb       (GtkWidget *widget, 
+                                                     ParoleMediaList *list);
 
-void				 parole_media_list_save_list	    (ParoleMediaList *list);
+void                parole_media_list_grab_focus    (ParoleMediaList *list);
 
-void 		        parole_media_list_save_cb (GtkWidget *widget, 
-								                        ParoleMediaList *list);
-
-void				 parole_media_list_grab_focus       (ParoleMediaList *list);
-
-void				 parole_media_list_set_repeat_toggled		(ParoleMediaList *list,
-																gboolean repeat_toggled);
-																
-void 				 parole_media_list_set_shuffle_toggled		(ParoleMediaList *list,
-																gboolean shuffle_toggled);
-																
+void                
+parole_media_list_set_repeat_toggled                (ParoleMediaList *list,
+                                                     gboolean repeat_toggled);
+                                                                
+void                
+parole_media_list_set_shuffle_toggled               (ParoleMediaList *list,
+                                                     gboolean shuffle_toggled);
+                                                                
 void parole_media_list_add_dvd (ParoleMediaList *list, gchar *dvd_name);
 
 
diff --git a/src/parole-module.c b/src/parole-module.c
index b406f1f..8b5dde0 100644
--- a/src/parole-module.c
+++ b/src/parole-module.c
@@ -33,10 +33,10 @@
 
 #include "parole-module.h"
 
-static void     parole_provider_module_plugin_init   (ParoleProviderPluginIface	 *iface);
+static void     parole_provider_module_plugin_init   (ParoleProviderPluginIface  *iface);
 
 static void     parole_provider_module_class_init    (ParoleProviderModuleClass  *klass);
-static void	parole_provider_module_init 	     (ParoleProviderModule *module);
+static void     parole_provider_module_init          (ParoleProviderModule *module);
 
 GType
 parole_provider_module_get_type (void)
@@ -45,29 +45,29 @@ parole_provider_module_get_type (void)
 
     if (G_UNLIKELY (type == G_TYPE_INVALID))
     {
-	static const GTypeInfo info =
-	{
-	    sizeof (ParoleProviderModuleClass),
-	    NULL,
-	    NULL,
-	    (GClassInitFunc) parole_provider_module_class_init,
-	    NULL,
-	    NULL,
-	    sizeof (ParoleProviderModule),
-	    0,
-	    (GInstanceInitFunc) parole_provider_module_init,
-	    NULL,
-	};
-
-	static const GInterfaceInfo plugin_info =
-	{
-	    (GInterfaceInitFunc) parole_provider_module_plugin_init,
-	    NULL,
-	    NULL,
-	};
-
-	type = g_type_register_static (G_TYPE_TYPE_MODULE, "ParoleProviderModule", &info, 0);
-	g_type_add_interface_static (type, PAROLE_TYPE_PROVIDER_PLUGIN, &plugin_info);
+        static const GTypeInfo info =
+        {
+            sizeof (ParoleProviderModuleClass),
+            NULL,
+            NULL,
+            (GClassInitFunc) parole_provider_module_class_init,
+            NULL,
+            NULL,
+            sizeof (ParoleProviderModule),
+            0,
+            (GInstanceInitFunc) parole_provider_module_init,
+            NULL,
+        };
+
+        static const GInterfaceInfo plugin_info =
+        {
+            (GInterfaceInitFunc) parole_provider_module_plugin_init,
+            NULL,
+            NULL,
+        };
+
+        type = g_type_register_static (G_TYPE_TYPE_MODULE, "ParoleProviderModule", &info, 0);
+        g_type_add_interface_static (type, PAROLE_TYPE_PROVIDER_PLUGIN, &plugin_info);
     }
 
     return type;
@@ -84,16 +84,16 @@ parole_module_load (GTypeModule *gtype_module)
 
     if ( G_UNLIKELY (module->library == NULL) )
     {
-	g_critical ("Failed to load plugin : %s", g_module_error ());
-	return FALSE;
+        g_critical ("Failed to load plugin : %s", g_module_error ());
+        return FALSE;
     }
     
     if ( !g_module_symbol (module->library, "parole_plugin_initialize", (gpointer) &module->initialize) || 
          !g_module_symbol (module->library, "parole_plugin_shutdown", (gpointer) &module->shutdown))
     {
-	g_critical ("Plugin %s missing required symbols", gtype_module->name);
-	g_module_close (module->library);
-	return FALSE;
+        g_critical ("Plugin %s missing required symbols", gtype_module->name);
+        g_module_close (module->library);
+        return FALSE;
     }
     
     TRACE ("Loading module %s", gtype_module->name);
@@ -143,8 +143,8 @@ parole_provider_module_get_is_configurable (ParoleProviderPlugin *plugin)
     module = PAROLE_PROVIDER_MODULE (plugin);
     
     if ( module->instance )
-	return parole_provider_plugin_get_is_configurable (module->instance);
-	
+        return parole_provider_plugin_get_is_configurable (module->instance);
+    
     return FALSE;
 }
 
@@ -156,7 +156,7 @@ parole_provider_module_configure (ParoleProviderPlugin *plugin, GtkWidget *paren
     module = PAROLE_PROVIDER_MODULE (plugin);
     
     if ( module->instance )
-	parole_provider_plugin_configure (module->instance, parent);
+        parole_provider_plugin_configure (module->instance, parent);
 }
 
 static void     
@@ -191,7 +191,7 @@ parole_provider_module_new (const gchar *filename, const gchar *desktop_file)
     
     module->desktop_file = g_strdup (desktop_file);
     g_object_set_data_full (G_OBJECT (module), "desktop-file", 
-			     module->desktop_file, (GDestroyNotify) g_free);
+                 module->desktop_file, (GDestroyNotify) g_free);
     
     return module;
 }
@@ -222,14 +222,14 @@ void parole_provider_module_free_plugin (ParoleProviderModule *module)
     
     if ( module->instance )
     {
-	g_object_unref (module->instance);
-	module->instance = NULL;
+        g_object_unref (module->instance);
+        module->instance = NULL;
     }
     
     if ( module->player )
     {
-	g_object_unref (module->player);
-	module->player = NULL;
+        g_object_unref (module->player);
+        module->player = NULL;
     }
 }
 
diff --git a/src/parole-module.h b/src/parole-module.h
index 8250bf9..293196b 100644
--- a/src/parole-module.h
+++ b/src/parole-module.h
@@ -30,48 +30,48 @@
 
 G_BEGIN_DECLS
 
-#define PAROLE_TYPE_PROVIDER_MODULE         	(parole_provider_module_get_type () )
-#define PAROLE_PROVIDER_MODULE(o)           	(G_TYPE_CHECK_INSTANCE_CAST ((o), PAROLE_TYPE_PROVIDER_MODULE, ParoleProviderModule))
-#define PAROLE_PROVIDER_MODULE_CLASS(klass) 	(G_TYPE_CHECK_CLASS_CAST ((klass), PAROLE_TYPE_PROVIDER_MODULE, ParoleProviderModuleClass))
-#define PAROLE_IS_PROVIDER_MODULE(o)        	(G_TYPE_CHECK_INSTANCE_TYPE ((o), PAROLE_TYPE_PROVIDER_MODULE))
+#define PAROLE_TYPE_PROVIDER_MODULE             (parole_provider_module_get_type () )
+#define PAROLE_PROVIDER_MODULE(o)               (G_TYPE_CHECK_INSTANCE_CAST ((o), PAROLE_TYPE_PROVIDER_MODULE, ParoleProviderModule))
+#define PAROLE_PROVIDER_MODULE_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), PAROLE_TYPE_PROVIDER_MODULE, ParoleProviderModuleClass))
+#define PAROLE_IS_PROVIDER_MODULE(o)            (G_TYPE_CHECK_INSTANCE_TYPE ((o), PAROLE_TYPE_PROVIDER_MODULE))
 #define PAROLE_IS_PROVIDER_MODULE_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), PAROLE_TYPE_PROVIDER_MODULE))
-#define PAROLE_PROVIDER_MODULE_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS((o), PAROLE_TYPE_PROVIDER_MODULE, ParoleProviderModuleClass))
+#define PAROLE_PROVIDER_MODULE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), PAROLE_TYPE_PROVIDER_MODULE, ParoleProviderModuleClass))
 
 typedef struct _ParoleProviderModuleClass ParoleProviderModuleClass;
 typedef struct _ParoleProviderModule ParoleProviderModule;
 
 struct _ParoleProviderModule
 {
-    GTypeModule       	     parent;
+    GTypeModule              parent;
     
-    GModule		    *library;
-    ParolePluginPlayer      *player;
+    GModule                *library;
+    ParolePluginPlayer     *player;
     
-    GType		    (*initialize)		(ParoleProviderModule *module);
+    GType                   (*initialize)   (ParoleProviderModule *module);
 
-    void		    (*shutdown)			(void);
+    void                    (*shutdown)     (void);
     
-    GType		     provider_type;
-    gboolean		     active;
-    gpointer                 instance;
-    gchar                   *desktop_file;
+    GType                   provider_type;
+    gboolean                active;
+    gpointer                instance;
+    gchar                  *desktop_file;
 };
 
 struct _ParoleProviderModuleClass
 {
-    GTypeModuleClass 	     parent_class;
+    GTypeModuleClass        parent_class;
 } ;
 
-GType        		     parole_provider_module_get_type        (void) G_GNUC_CONST;
+GType                       parole_provider_module_get_type        (void) G_GNUC_CONST;
 
-ParoleProviderModule	    *parole_provider_module_new             (const gchar *filename,
-								     const gchar *desktop_file);
+ParoleProviderModule       *parole_provider_module_new             (const gchar *filename,
+                                                                    const gchar *desktop_file);
 
-void			     parole_provider_module_new_plugin      (ParoleProviderModule *module);
+void                        parole_provider_module_new_plugin      (ParoleProviderModule *module);
 
-void 			     parole_provider_module_free_plugin     (ParoleProviderModule *module);
+void                        parole_provider_module_free_plugin     (ParoleProviderModule *module);
 
-gboolean		     parole_provider_module_get_is_active   (ParoleProviderModule *module);
+gboolean                    parole_provider_module_get_is_active   (ParoleProviderModule *module);
 
 G_END_DECLS
 
diff --git a/src/parole-open-location.c b/src/parole-open-location.c
index 99277a5..4692899 100644
--- a/src/parole-open-location.c
+++ b/src/parole-open-location.c
@@ -40,18 +40,17 @@ static void parole_open_location_finalize   (GObject *object);
 
 struct ParoleOpenLocation
 {
-    GObject         	parent;
+    GObject             parent;
     
-    
-    GtkWidget 	       *entry;
+    GtkWidget          *entry;
 };
 
 struct ParoleOpenLocationClass
 {
-    GObjectClass 	parent_class;
+    GObjectClass    parent_class;
     
-    void		(*location_opened)	(ParoleOpenLocation *self,
-						 const gchar *address);
+    void            (*location_opened)  (ParoleOpenLocation *self,
+                                         const gchar *address);
 };
 
 enum
@@ -81,19 +80,19 @@ parole_open_location_response_cb (GtkDialog *dialog, gint response_id, ParoleOpe
 
     if ( response_id == GTK_RESPONSE_OK )
     {
-	location = gtk_combo_box_text_get_active_text  (GTK_COMBO_BOX_TEXT(self->entry));
-	
-	if ( !location || strlen (location) == 0)
-	    goto out;
+        location = gtk_combo_box_text_get_active_text  (GTK_COMBO_BOX_TEXT(self->entry));
+        
+        if ( !location || strlen (location) == 0)
+            goto out;
 
-	TRACE ("Location %s", location);
+        TRACE ("Location %s", location);
 
-	gtk_widget_hide (GTK_WIDGET (dialog));
-	g_signal_emit (G_OBJECT (self), signals [LOCATION_OPENED], 0, location);
+        gtk_widget_hide (GTK_WIDGET (dialog));
+        g_signal_emit (G_OBJECT (self), signals [LOCATION_OPENED], 0, location);
     }
 
-    out:
-	gtk_widget_destroy (GTK_WIDGET (dialog));
+out:
+    gtk_widget_destroy (GTK_WIDGET (dialog));
 }
 
 /* Populate the history-popup */
@@ -111,18 +110,18 @@ parole_open_location_get_completion_model (void)
     
     if ( lines )
     {
-	for ( i = 0; lines[i]; i++)
-	{
-	    if ( g_strcmp0(lines[i], "") != 0 )
-	    {
-	    gtk_list_store_append (store, &iter);
-	    gtk_list_store_set (store, &iter,
-				COL_ADDRESS, lines [i],
-				-1);
+        for ( i = 0; lines[i]; i++)
+        {
+            if ( g_strcmp0(lines[i], "") != 0 )
+            {
+                gtk_list_store_append (store, &iter);
+                gtk_list_store_set (store, &iter,
+                                    COL_ADDRESS, lines [i],
+                                    -1);
+            }
         }
-	}
-	
-	g_strfreev (lines);
+        
+        g_strfreev (lines);
     }
     return GTK_TREE_MODEL (store);
 }
@@ -178,8 +177,8 @@ ParoleOpenLocation *parole_open_location (GtkWidget *parent)
     dialog = GTK_WIDGET (gtk_builder_get_object (builder, "open-location"));
     
     if ( parent )
-	gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent));
-	
+        gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent));
+    
     gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ON_PARENT);
     
     self->entry = GTK_WIDGET (gtk_builder_get_object (builder, "entry"));
@@ -190,14 +189,14 @@ ParoleOpenLocation *parole_open_location (GtkWidget *parent)
     gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
 
     g_signal_connect_swapped (gtk_builder_get_object (builder, "clear-history"), "clicked",
-			      G_CALLBACK (parole_open_location_clear_history), model);
+                              G_CALLBACK (parole_open_location_clear_history), model);
     gtk_widget_set_tooltip_text (GTK_WIDGET (gtk_builder_get_object (builder, "clear-history")), _("Clear History"));
     
     g_signal_connect (dialog, "delete-event",
-		      G_CALLBACK (gtk_widget_destroy), NULL);
-		      
+                      G_CALLBACK (gtk_widget_destroy), NULL);
+              
     g_signal_connect (dialog, "response",
-		      G_CALLBACK (parole_open_location_response_cb), self);
+                      G_CALLBACK (parole_open_location_response_cb), self);
     
     gtk_widget_show_all (dialog);
     g_object_unref (builder);
diff --git a/src/parole-open-location.h b/src/parole-open-location.h
index 8ad1603..cf7fbed 100644
--- a/src/parole-open-location.h
+++ b/src/parole-open-location.h
@@ -28,16 +28,16 @@
 
 G_BEGIN_DECLS
 
-#define PAROLE_TYPE_OPEN_LOCATION        (parole_open_location_get_type () )
-#define PAROLE_OPEN_LOCATION(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), PAROLE_TYPE_OPEN_LOCATION, ParoleOpenLocation))
-#define PAROLE_IS_OPEN_LOCATION(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), PAROLE_TYPE_OPEN_LOCATION))
+#define PAROLE_TYPE_OPEN_LOCATION       (parole_open_location_get_type () )
+#define PAROLE_OPEN_LOCATION(o)         (G_TYPE_CHECK_INSTANCE_CAST ((o), PAROLE_TYPE_OPEN_LOCATION, ParoleOpenLocation))
+#define PAROLE_IS_OPEN_LOCATION(o)      (G_TYPE_CHECK_INSTANCE_TYPE ((o), PAROLE_TYPE_OPEN_LOCATION))
 
-typedef struct ParoleOpenLocation      ParoleOpenLocation;
-typedef struct ParoleOpenLocationClass ParoleOpenLocationClass;
+typedef struct ParoleOpenLocation       ParoleOpenLocation;
+typedef struct ParoleOpenLocationClass  ParoleOpenLocationClass;
 
-GType        			   parole_open_location_get_type       (void) G_GNUC_CONST;
+GType                parole_open_location_get_type   (void) G_GNUC_CONST;
 
-ParoleOpenLocation		  *parole_open_location 	       (GtkWidget *parent);
+ParoleOpenLocation  *parole_open_location            (GtkWidget *parent);
 
 G_END_DECLS
 
diff --git a/src/parole-player.c b/src/parole-player.c
index cdc5645..3b076c4 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -88,196 +88,215 @@ get_time_string (gchar *timestring, gint total_seconds)
 
     if ( hours == 0 )
     {
-	g_snprintf (timestring, 128, "%02i:%02i", minutes, seconds);
+        g_snprintf (timestring, 128, "%02i:%02i", minutes, seconds);
     }
     else
     {
-	g_snprintf (timestring, 128, "%i:%02i:%02i", hours, minutes, seconds);
+        g_snprintf (timestring, 128, "%i:%02i:%02i", hours, minutes, seconds);
     }
 }
 
 /*
  * DBus Glib init
  */
-static void parole_player_dbus_class_init  (ParolePlayerClass *klass);
-static void parole_player_dbus_init        (ParolePlayer *player);
+static void parole_player_dbus_class_init           (ParolePlayerClass *klass);
+static void parole_player_dbus_init                 (ParolePlayer *player);
 
-static void parole_player_disc_selected_cb (ParoleDisc *disc, 
-					    const gchar *uri, 
-					    const gchar *device, 
-					    ParolePlayer *player);
-					    
+static void parole_player_disc_selected_cb          (ParoleDisc *disc, 
+                                                     const gchar *uri, 
+                                                     const gchar *device, 
+                                                     ParolePlayer *player);
 
-static void parole_player_select_custom_subtitle (GtkMenuItem *widget, gpointer data);
-								
-static gboolean            parole_audiobox_expose_event (GtkWidget *w, GdkEventExpose *ev, ParolePlayer *player);
+static void parole_player_select_custom_subtitle    (GtkMenuItem *widget, gpointer data);
+                                
+static gboolean parole_audiobox_expose_event        (GtkWidget *w, GdkEventExpose *ev, ParolePlayer *player);
 
 /*
  * GtkBuilder Callbacks
  */
-void on_content_area_size_allocate (GtkWidget *widget, GtkAllocation *allocation, ParolePlayer *player);
+void        on_content_area_size_allocate           (GtkWidget *widget, 
+                                                     GtkAllocation *allocation, 
+                                                     ParolePlayer *player);
 
  
-gboolean        parole_player_configure_event_cb        (GtkWidget *widget, 
-							 GdkEventConfigure *ev, 
-							 ParolePlayer *player);
-							 
-gboolean	parole_player_range_button_press 	(GtkWidget *widget, 
-							 GdkEventButton *ev, 
-							 ParolePlayer *player);
-
-gboolean	parole_player_range_button_release	(GtkWidget *widget,
-							 GdkEventButton *ev,
-							 ParolePlayer *player);
-
-void            parole_player_range_value_changed       (GtkRange *range, 
-							 ParolePlayer *player);
-
-void            parole_player_play_pause_clicked        (GtkButton *button, 
-							 ParolePlayer *player);
-
-void            parole_player_stop_clicked              (GtkButton *button, 
-							 ParolePlayer *player);
-
-void            parole_player_forward_cb                  (GtkButton *button, 
-							 ParolePlayer *player);
-							 
-void            parole_player_back_cb                  (GtkButton *button, 
-							 ParolePlayer *player);
-							 
-void 			parole_player_seekf_cb (GtkWidget *widget, ParolePlayer *player, gdouble seek);
-
-void 			parole_player_seekb_cb (GtkWidget *widget, ParolePlayer *player, gdouble seek);
-							 
-gboolean    parole_player_window_state_event (GtkWidget *widget,
-                                GdkEventWindowState *event,
-                                ParolePlayer *player);
-
-void		parole_player_leave_fs_cb		(GtkButton *button,
-							 ParolePlayer *player);
-
-void            parole_player_destroy_cb                (GObject *window, 
-							 ParolePlayer *player);
-
-gboolean	parole_player_delete_event_cb		(GtkWidget *widget, 
-							 GdkEvent *ev,
-							 ParolePlayer *player);
-
-void		parole_player_show_hide_playlist	(GtkWidget *widget,
-							 ParolePlayer *player);
-							 
-void        parole_player_reset_controls (ParolePlayer *player, gboolean fullscreen);
+gboolean    parole_player_configure_event_cb        (GtkWidget *widget, 
+                                                     GdkEventConfigure *ev, 
+                                                     ParolePlayer *player);
+                             
+gboolean    parole_player_range_button_press        (GtkWidget *widget, 
+                                                     GdkEventButton *ev, 
+                                                     ParolePlayer *player);
+
+gboolean    parole_player_range_button_release      (GtkWidget *widget,
+                                                     GdkEventButton *ev,
+                                                     ParolePlayer *player);
+
+void        parole_player_range_value_changed       (GtkRange *range, 
+                                                     ParolePlayer *player);
+
+void        parole_player_play_pause_clicked        (GtkButton *button, 
+                                                     ParolePlayer *player);
+
+void        parole_player_stop_clicked              (GtkButton *button, 
+                                                     ParolePlayer *player);
+
+void        parole_player_forward_cb                (GtkButton *button, 
+                                                     ParolePlayer *player);
+                             
+void        parole_player_back_cb                   (GtkButton *button, 
+                                                     ParolePlayer *player);
+                             
+void        parole_player_seekf_cb                  (GtkWidget *widget, 
+                                                     ParolePlayer *player, 
+                                                     gdouble seek);
+
+void        parole_player_seekb_cb                  (GtkWidget *widget, 
+                                                     ParolePlayer *player, 
+                                                     gdouble seek);
+                             
+gboolean    parole_player_window_state_event        (GtkWidget *widget,
+                                                     GdkEventWindowState *event,
+                                                     ParolePlayer *player);
+
+void        parole_player_leave_fs_cb               (GtkButton *button,
+                                                     ParolePlayer *player);
+
+void        parole_player_destroy_cb                (GObject *window, 
+                                                     ParolePlayer *player);
+
+gboolean    parole_player_delete_event_cb           (GtkWidget *widget, 
+                                                     GdkEvent *ev,
+                                                     ParolePlayer *player);
+
+void        parole_player_show_hide_playlist        (GtkWidget *widget,
+                                                     ParolePlayer *player);
+                             
+void        parole_player_reset_controls            (ParolePlayer *player, 
+                                                     gboolean fullscreen);
 
 /*Menu items callbacks*/
-void            parole_player_menu_open_location_cb     (GtkWidget *widget, 
-							 ParolePlayer *player);
+void        parole_player_menu_open_location_cb     (GtkWidget *widget, 
+                                                     ParolePlayer *player);
 
-void            parole_player_menu_add_cb               (GtkWidget *widget, 
-							 ParolePlayer *player);
-							 
-void            parole_player_media_menu_select_cb      (GtkMenuItem *widget,
-                             ParolePlayer *player);
-							 
-void            parole_player_save_playlist_cb          (GtkWidget *widget,
-                             ParolePlayer *player);
+void        parole_player_menu_add_cb               (GtkWidget *widget, 
+                                                     ParolePlayer *player);
+                             
+void        parole_player_media_menu_select_cb      (GtkMenuItem *widget,
+                                                     ParolePlayer *player);
+                             
+void        parole_player_save_playlist_cb          (GtkWidget *widget,
+                                                     ParolePlayer *player);
 
-void            parole_player_menu_exit_cb              (GtkWidget *widget,
-							 ParolePlayer *player);
+void        parole_player_menu_exit_cb              (GtkWidget *widget,
+                                                     ParolePlayer *player);
 
-void		dvd_iso_mi_activated_cb			(GtkWidget *widget,
-							 ParolePlayer *player);
+void        dvd_iso_mi_activated_cb                 (GtkWidget *widget,
+                                                     ParolePlayer *player);
 
-void		cd_iso_mi_activated_cb			(GtkWidget *widget,
-							 ParolePlayer *player);
+void        cd_iso_mi_activated_cb                  (GtkWidget *widget,
+                                                     ParolePlayer *player);
 
-void            parole_player_volume_up 		(GtkWidget *widget, 
-							 ParolePlayer *player);
+void        parole_player_volume_up                 (GtkWidget *widget, 
+                                                     ParolePlayer *player);
 
-void            parole_player_volume_down 		(GtkWidget *widget, 
-							 ParolePlayer *player);
+void        parole_player_volume_down               (GtkWidget *widget, 
+                                                     ParolePlayer *player);
 
-void            parole_player_volume_mute 		(GtkWidget *widget, 
-							 ParolePlayer *player);
+void        parole_player_volume_mute               (GtkWidget *widget, 
+                                                     ParolePlayer *player);
 
-void		parole_player_open_preferences_cb	(GtkWidget *widget,
-							 ParolePlayer *player);
+void        parole_player_open_preferences_cb       (GtkWidget *widget,
+                                                     ParolePlayer *player);
 
-void            parole_player_volume_value_changed_cb   (GtkScaleButton *widget, 
-							 gdouble value,
-							 ParolePlayer *player);
+void        parole_player_volume_value_changed_cb   (GtkScaleButton *widget, 
+                                                     gdouble value,
+                                                     ParolePlayer *player);
 
-gboolean        parole_player_volume_scroll_event_cb	(GtkWidget *widget,
-							 GdkEventScroll *ev,
-							 ParolePlayer *player);
+gboolean    parole_player_volume_scroll_event_cb    (GtkWidget *widget,
+                                                     GdkEventScroll *ev,
+                                                     ParolePlayer *player);
 
-void		parole_player_full_screen_activated_cb  (GtkWidget *widget,
-							 ParolePlayer *player);
+void        parole_player_full_screen_activated_cb  (GtkWidget *widget,
+                                                     ParolePlayer *player);
 
-void		parole_player_shuffle_toggled_cb	(GtkWidget *widget,
-							 ParolePlayer *player);
+void        parole_player_shuffle_toggled_cb        (GtkWidget *widget,
+                                                     ParolePlayer *player);
 
-void		parole_player_repeat_toggled_cb		(GtkWidget *widget,
-							 ParolePlayer *player);
-							 
-static void		parole_player_clear_subtitles		(ParolePlayer *player);
+void        parole_player_repeat_toggled_cb         (GtkWidget *widget,
+                                                     ParolePlayer *player);
+                             
+static void parole_player_clear_subtitles           (ParolePlayer *player);
 
-static void		parole_player_clear_audio_tracks		(ParolePlayer *player);
+static void parole_player_clear_audio_tracks        (ParolePlayer *player);
 
 /*
  * Aspect ratio
  */
-void		ratio_none_toggled_cb			(GtkWidget *widget,
-							 ParolePlayer *player);
-
-void		ratio_auto_toggled_cb			(GtkWidget *widget,
-							 ParolePlayer *player);
-
-void		ratio_square_toggled_cb			(GtkWidget *widget,
-							 ParolePlayer *player);
-
-void		ratio_4_3_toggled_cb			(GtkWidget *widget,
-							 ParolePlayer *player);
-
-void		ratio_16_9_toggled_cb			(GtkWidget *widget,
-							 ParolePlayer *player);
-
-void		ratio_20_9_toggled_cb			(GtkWidget *widget,
-							 ParolePlayer *player);
-							 
-void 		parole_player_set_playlist_visible (ParolePlayer *player, 
-							 gboolean visibility);
-							 
-gboolean	parole_player_gst_widget_button_press (GtkWidget *widget, 
-							 GdkEventButton *ev, ParolePlayer *player);
-
-void	        parole_show_about			(GtkWidget *widget,
-							ParolePlayer *player);
-							
-void 		parole_player_set_audiotrack_radio_menu_item_selected(
-							ParolePlayer *player, gint audio_index);
-							
-void 		parole_player_set_subtitle_radio_menu_item_selected(
-							ParolePlayer *player, gint sub_index);
-							
-void 		parole_player_combo_box_audiotrack_changed_cb(GtkWidget *widget, 
-							ParolePlayer *player);
-							
-void 		parole_player_combo_box_subtitles_changed_cb(GtkWidget *widget, 
-							ParolePlayer *player);
-							
-static void parole_player_audiotrack_radio_menu_item_changed_cb(GtkWidget *widget, ParolePlayer *player);
-
-static void parole_player_subtitles_radio_menu_item_changed_cb(GtkWidget *widget, ParolePlayer *player);
-
-static void parole_player_dvd_chapter_count_change_cb (ParoleGst *gst, gint chapter_count, ParolePlayer *player);
-
-static void parole_player_dvd_chapter_change_cb (ParoleGst *gst, gint chapter_count, ParolePlayer *player);
-
-
-gboolean	parole_player_key_press 		(GtkWidget *widget, 
-							 GdkEventKey *ev, 
-							 ParolePlayer *player);
-							 
+void        ratio_none_toggled_cb                   (GtkWidget *widget,
+                                                     ParolePlayer *player);
+
+void        ratio_auto_toggled_cb                   (GtkWidget *widget,
+                                                     ParolePlayer *player);
+
+void        ratio_square_toggled_cb                 (GtkWidget *widget,
+                                                     ParolePlayer *player);
+
+void        ratio_4_3_toggled_cb                    (GtkWidget *widget,
+                                                     ParolePlayer *player);
+
+void        ratio_16_9_toggled_cb                   (GtkWidget *widget,
+                                                     ParolePlayer *player);
+
+void        ratio_20_9_toggled_cb                   (GtkWidget *widget,
+                                                     ParolePlayer *player);
+                             
+void        parole_player_set_playlist_visible      (ParolePlayer *player, 
+                                                     gboolean visibility);
+                             
+gboolean    parole_player_gst_widget_button_press   (GtkWidget *widget, 
+                                                     GdkEventButton *ev, 
+                                                     ParolePlayer *player);
+
+void        parole_show_about                       (GtkWidget *widget,
+                                                     ParolePlayer *player);
+                            
+void        parole_player_set_audiotrack_radio_menu_item_selected(
+                                                     ParolePlayer *player, 
+                                                     gint audio_index);
+                            
+void        parole_player_set_subtitle_radio_menu_item_selected(
+                                                     ParolePlayer *player, 
+                                                     gint sub_index);
+                            
+void        
+parole_player_combo_box_audiotrack_changed_cb       (GtkWidget *widget, 
+                                                     ParolePlayer *player);
+                            
+void        
+parole_player_combo_box_subtitles_changed_cb        (GtkWidget *widget, 
+                                                     ParolePlayer *player);
+                            
+static void 
+parole_player_audiotrack_radio_menu_item_changed_cb (GtkWidget *widget, 
+                                                     ParolePlayer *player);
+
+static void 
+parole_player_subtitles_radio_menu_item_changed_cb  (GtkWidget *widget, 
+                                                     ParolePlayer *player);
+
+static void 
+parole_player_dvd_chapter_count_change_cb           (ParoleGst *gst, 
+                                                     gint chapter_count, 
+                                                     ParolePlayer *player);
+
+static void parole_player_dvd_chapter_change_cb     (ParoleGst *gst, 
+                                                     gint chapter_count, 
+                                                     ParolePlayer *player);
+
+gboolean    parole_player_key_press                 (GtkWidget *widget, 
+                                                     GdkEventKey *ev, 
+                                                     ParolePlayer *player);
+                             
 static GtkTargetEntry target_entry[] =
 {
     { "STRING",        0, 0 },
@@ -292,93 +311,93 @@ static GtkTargetEntry target_entry[] =
 
 struct ParolePlayerPrivate
 {
-    DBusGConnection     *bus;
-    ParoleMediaList	*list;
-    ParoleDisc          *disc;
-    ParoleScreenSaver   *screen_saver;
-    ParoleConf          *conf;
+    DBusGConnection    *bus;
+    ParoleMediaList    *list;
+    ParoleDisc         *disc;
+    ParoleScreenSaver  *screen_saver;
+    ParoleConf         *conf;
 #ifdef HAVE_XF86_KEYSYM
-    ParoleButton        *button;
+    ParoleButton       *button;
 #endif
 
-    XfceSMClient	*sm_client;
-    gchar		*client_id;
-    
-    GtkFileFilter       *video_filter;
-    GtkRecentManager    *recent;
-
-    GtkWidget 		*gst;
-    ParoleMediaType current_media_type;
-
-    GtkWidget 		*window;
-    GtkWidget       *recent_menu;
-    GtkWidget		*playlist_nt;
-    GtkWidget		*show_hide_playlist;
-    GtkWidget		*show_hide_playlist_button;
-    GtkWidget		*shuffle_menu_item;
-    GtkWidget		*repeat_menu_item;
-    GtkWidget		*play_pause;
-    GtkWidget		*seekf;
-    GtkWidget		*seekb;
-    GtkWidget		*range;
-    
-    GtkWidget		*progressbar_buffering;
-    
-    GtkWidget		*label_elapsed;
-    GtkWidget		*label_duration;
-    GtkWidget		*fs_window; /* Window for packing control widgets 
-				     * when in full screen mode
-				     */
-    GtkWidget		*control; /* contains all play button*/
-    GtkWidget		*fullscreen_button;
-    GtkWidget		*fullscreen_image;
-    GdkPixbuf       *logo;
-    GtkWidget       *logo_image;
-    
-    GtkWidget		*hbox_infobar;
-    GtkWidget		*infobar;
-    GtkWidget		*combobox_audiotrack;
-    GtkWidget		*combobox_subtitles;
-    GtkListStore	*liststore_audiotrack;
-    GtkListStore	*liststore_subtitles;
-    GList			*audio_list;
-    GList			*subtitle_list;
-    gboolean		update_languages;
-    gboolean        updated_subs;
-    GtkWidget		*subtitles_group;
-    GtkWidget       *subtitles_menu_custom;
-    GtkWidget		*audio_group;
-    
-    GtkWidget		*subtitles_menu;
-    GtkWidget		*languages_menu;
-    
-    GtkWidget		*eventbox_output;
-    GtkWidget       *videobox;
-    
-    GtkWidget		*audiobox;
-    GtkWidget		*audiobox_cover;
-    GtkWidget		*audiobox_title;
-    GtkWidget		*audiobox_album;
-    GtkWidget		*audiobox_artist;
-    
-    GtkWidget		*volume;
-    GtkWidget		*menu_bar;
-    GtkWidget       *save_playlist;
-    GtkWidget		*play_box;
+    XfceSMClient       *sm_client;
+    gchar              *client_id;
+    
+    GtkFileFilter      *video_filter;
+    GtkRecentManager   *recent;
+
+    GtkWidget          *gst;
+    ParoleMediaType     current_media_type;
+
+    GtkWidget          *window;
+    GtkWidget          *recent_menu;
+    GtkWidget          *playlist_nt;
+    GtkWidget          *show_hide_playlist;
+    GtkWidget          *show_hide_playlist_button;
+    GtkWidget          *shuffle_menu_item;
+    GtkWidget          *repeat_menu_item;
+    GtkWidget          *play_pause;
+    GtkWidget          *seekf;
+    GtkWidget          *seekb;
+    GtkWidget          *range;
+    
+    GtkWidget          *progressbar_buffering;
+    
+    GtkWidget          *label_elapsed;
+    GtkWidget          *label_duration;
+    GtkWidget          *fs_window; /* Window for packing control widgets 
+                                    * when in full screen mode
+                                    */
+    GtkWidget          *control; /* contains all play button*/
+    GtkWidget          *fullscreen_button;
+    GtkWidget          *fullscreen_image;
+    GdkPixbuf          *logo;
+    GtkWidget          *logo_image;
+    
+    GtkWidget          *hbox_infobar;
+    GtkWidget          *infobar;
+    GtkWidget          *combobox_audiotrack;
+    GtkWidget          *combobox_subtitles;
+    GtkListStore       *liststore_audiotrack;
+    GtkListStore       *liststore_subtitles;
+    GList              *audio_list;
+    GList              *subtitle_list;
+    gboolean            update_languages;
+    gboolean            updated_subs;
+    GtkWidget          *subtitles_group;
+    GtkWidget          *subtitles_menu_custom;
+    GtkWidget          *audio_group;
+    
+    GtkWidget          *subtitles_menu;
+    GtkWidget          *languages_menu;
+    
+    GtkWidget          *eventbox_output;
+    GtkWidget          *videobox;
+    
+    GtkWidget          *audiobox;
+    GtkWidget          *audiobox_cover;
+    GtkWidget          *audiobox_title;
+    GtkWidget          *audiobox_album;
+    GtkWidget          *audiobox_artist;
+    
+    GtkWidget          *volume;
+    GtkWidget          *menu_bar;
+    GtkWidget          *save_playlist;
+    GtkWidget          *play_box;
      
-    gboolean             exit;
+    gboolean            exit;
     
-    gboolean		 embedded;
-    gboolean		 full_screen;
+    gboolean            embedded;
+    gboolean            full_screen;
     
-    ParoleState     state;
-    gboolean		 user_seeking;
-    gboolean             internal_range_change;
-    gboolean		 buffering;
+    ParoleState         state;
+    gboolean            user_seeking;
+    gboolean            internal_range_change;
+    gboolean            buffering;
     
-    gboolean        wait_for_gst_disc_info;
+    gboolean            wait_for_gst_disc_info;
     
-    gint            handle_width;
+    gint                handle_width;
     
     GtkTreeRowReference *row;
         
@@ -392,7 +411,7 @@ enum
 
 G_DEFINE_TYPE (ParolePlayer, parole_player, G_TYPE_OBJECT)
 
-void parole_show_about	(GtkWidget *widget, ParolePlayer *player)
+void parole_show_about  (GtkWidget *widget, ParolePlayer *player)
 {
     parole_about (GTK_WINDOW (player->priv->window));
 }
@@ -400,43 +419,43 @@ void parole_show_about	(GtkWidget *widget, ParolePlayer *player)
 void ratio_none_toggled_cb (GtkWidget *widget, ParolePlayer *player)
 {
     g_object_set (G_OBJECT (player->priv->conf),
-		  "aspect-ratio", PAROLE_ASPECT_RATIO_NONE,
-		  NULL);
+                  "aspect-ratio", PAROLE_ASPECT_RATIO_NONE,
+                  NULL);
 }
 
 void ratio_auto_toggled_cb (GtkWidget *widget, ParolePlayer *player)
 {
     g_object_set (G_OBJECT (player->priv->conf),
-		  "aspect-ratio", PAROLE_ASPECT_RATIO_AUTO,
-		  NULL);
+                  "aspect-ratio", PAROLE_ASPECT_RATIO_AUTO,
+                  NULL);
 }
 
 void ratio_square_toggled_cb (GtkWidget *widget, ParolePlayer *player)
 {
      g_object_set (G_OBJECT (player->priv->conf),
-		  "aspect-ratio", PAROLE_ASPECT_RATIO_SQUARE,
-		  NULL);
+                  "aspect-ratio", PAROLE_ASPECT_RATIO_SQUARE,
+                  NULL);
 }
 
 void ratio_4_3_toggled_cb (GtkWidget *widget, ParolePlayer *player)
 {
     g_object_set (G_OBJECT (player->priv->conf),
-		  "aspect-ratio", PAROLE_ASPECT_RATIO_4_3,
-		  NULL);
+                  "aspect-ratio", PAROLE_ASPECT_RATIO_4_3,
+                  NULL);
 }
 
 void ratio_16_9_toggled_cb (GtkWidget *widget, ParolePlayer *player)
 {
     g_object_set (G_OBJECT (player->priv->conf),
-		  "aspect-ratio", PAROLE_ASPECT_RATIO_16_9,
-		  NULL);
+                  "aspect-ratio", PAROLE_ASPECT_RATIO_16_9,
+                  NULL);
 }
 
 void ratio_20_9_toggled_cb (GtkWidget *widget, ParolePlayer *player)
 {
     g_object_set (G_OBJECT (player->priv->conf),
-		  "aspect-ratio", PAROLE_ASPECT_RATIO_DVB,
-		  NULL);
+                  "aspect-ratio", PAROLE_ASPECT_RATIO_DVB,
+                  NULL);
 }
 
 void parole_player_set_playlist_visible (ParolePlayer *player, gboolean visibility)
@@ -464,17 +483,17 @@ void parole_player_set_playlist_visible (ParolePlayer *player, gboolean visibili
         
         gtk_widget_show (player->priv->playlist_nt);
         gtk_widget_set_tooltip_text( GTK_WIDGET( player->priv->show_hide_playlist_button ), _("Hide playlist") );
-        g_object_set (G_OBJECT (player->priv->conf),	
-                    "showhide-playlist", TRUE,
-                    NULL);
+        g_object_set   (G_OBJECT (player->priv->conf),    
+                        "showhide-playlist", TRUE,
+                        NULL);
     }
     else
     {
         gtk_widget_hide (player->priv->playlist_nt);
         gtk_widget_set_tooltip_text( GTK_WIDGET( player->priv->show_hide_playlist_button ), _("Show playlist") );
-        g_object_set (G_OBJECT (player->priv->conf),	
-                    "showhide-playlist", FALSE,
-                    NULL);
+        g_object_set   (G_OBJECT (player->priv->conf),    
+                        "showhide-playlist", FALSE,
+                        NULL);
         
         if ( !player->priv->full_screen )
             gtk_window_resize(GTK_WINDOW (player->priv->window), window_w-playlist_w-player->priv->handle_width, window_h);
@@ -506,10 +525,10 @@ iso_files_folder_changed_cb (GtkFileChooser *widget, ParolePlayer *player)
     
     if ( folder )
     {
-    g_object_set (G_OBJECT (player->priv->conf),
-		  "iso-image-folder", folder,
-		  NULL);
-	g_free (folder);
+        g_object_set (G_OBJECT (player->priv->conf),
+                      "iso-image-folder", folder,
+                      NULL);
+        g_free (folder);
     }
 }
 
@@ -523,22 +542,22 @@ parole_player_open_iso_image (ParolePlayer *player, ParoleIsoImage image)
     gint response;
     
     chooser = gtk_file_chooser_dialog_new (_("Open ISO image"), GTK_WINDOW (player->priv->window),
-					   GTK_FILE_CHOOSER_ACTION_OPEN,
-					   GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-					   GTK_STOCK_OPEN, GTK_RESPONSE_OK,
-					   NULL);
-				
+                                           GTK_FILE_CHOOSER_ACTION_OPEN,
+                                           GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                                           GTK_STOCK_OPEN, GTK_RESPONSE_OK,
+                                           NULL);
+                
     gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (chooser), FALSE);
     
     g_object_get (G_OBJECT (player->priv->conf),
-		  "iso-image-folder", &folder,
-		  NULL);
+                  "iso-image-folder", &folder,
+                  NULL);
     
     if ( folder )
-	gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (chooser), folder);
+        gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (chooser), folder);
     
     g_signal_connect (chooser, "current-folder-changed",
-		      G_CALLBACK (iso_files_folder_changed_cb), player);
+              G_CALLBACK (iso_files_folder_changed_cb), player);
     
     filter = gtk_file_filter_new ();
     gtk_file_filter_set_name (filter, image == PAROLE_ISO_IMAGE_CD ? _("CD image") : _("DVD image"));
@@ -550,20 +569,20 @@ parole_player_open_iso_image (ParolePlayer *player, ParoleIsoImage image)
     
     if ( response == GTK_RESPONSE_OK )
     {
-	file = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (chooser));
+        file = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (chooser));
     }
     
     gtk_widget_destroy (chooser);
     
     if ( file )
     {
-	gchar *uri;
-	//FIXME: vcd will word for svcd?
-	uri = g_strdup_printf ("%s%s", PAROLE_ISO_IMAGE_CD ? "dvd://" : ("vcd://"), file);
-	TRACE ("Playing ISO image %s", uri);
-	parole_player_disc_selected_cb (NULL, uri, NULL, player);
-	g_free (file);
-	g_free (uri);
+        gchar *uri;
+        //FIXME: vcd will work for svcd?
+        uri = g_strdup_printf ("%s%s", PAROLE_ISO_IMAGE_CD ? "dvd://" : ("vcd://"), file);
+        TRACE ("Playing ISO image %s", uri);
+        parole_player_disc_selected_cb (NULL, uri, NULL, player);
+        g_free (file);
+        g_free (uri);
     }
 }
 
@@ -572,7 +591,7 @@ void dvd_iso_mi_activated_cb (GtkWidget *widget, ParolePlayer *player)
     parole_player_open_iso_image (player, PAROLE_ISO_IMAGE_DVD);
 }
 
-void cd_iso_mi_activated_cb (GtkWidget *widget,	 ParolePlayer *player)
+void cd_iso_mi_activated_cb (GtkWidget *widget,  ParolePlayer *player)
 {
     parole_player_open_iso_image (player, PAROLE_ISO_IMAGE_CD);
 }
@@ -584,11 +603,11 @@ parole_player_change_range_value (ParolePlayer *player, gdouble value)
     
     if ( !player->priv->user_seeking )
     {
-	player->priv->internal_range_change = TRUE;
-    
-	gtk_range_set_value (GTK_RANGE (player->priv->range), value);
+        player->priv->internal_range_change = TRUE;
+        
+        gtk_range_set_value (GTK_RANGE (player->priv->range), value);
 
-	player->priv->internal_range_change = FALSE;
+        player->priv->internal_range_change = FALSE;
     }
     
     get_time_string (pos_text, value);
@@ -598,29 +617,29 @@ parole_player_change_range_value (ParolePlayer *player, gdouble value)
 static void
 parole_player_reset (ParolePlayer *player)
 {
-	parole_gst_stop (PAROLE_GST (player->priv->gst));
-	player->priv->update_languages = TRUE;
-	gtk_window_set_title (GTK_WINDOW (player->priv->window), _("Parole Media Player"));
-	player->priv->audio_list = NULL;
-	player->priv->subtitle_list = NULL;
-	
-	gtk_widget_hide(GTK_WIDGET(player->priv->infobar));
+    parole_gst_stop (PAROLE_GST (player->priv->gst));
+    player->priv->update_languages = TRUE;
+    gtk_window_set_title (GTK_WINDOW (player->priv->window), _("Parole Media Player"));
+    player->priv->audio_list = NULL;
+    player->priv->subtitle_list = NULL;
+    
+    gtk_widget_hide(GTK_WIDGET(player->priv->infobar));
     parole_player_change_range_value (player, 0);
 
     if ( player->priv->row )
     {
-	parole_media_list_set_row_pixbuf (player->priv->list, player->priv->row, NULL);
-	gtk_tree_row_reference_free (player->priv->row);
-	player->priv->row = NULL;
+        parole_media_list_set_row_pixbuf (player->priv->list, player->priv->row, NULL);
+        gtk_tree_row_reference_free (player->priv->row);
+        player->priv->row = NULL;
     }
     
     if (player->priv->current_media_type == PAROLE_MEDIA_TYPE_DVD)
     {
         TRACE("CLEAR DVD LIST");
-	    parole_media_list_clear_disc_list (player->priv->list);
-	    TRACE("END CLEAR DVD LIST");
+        parole_media_list_clear_disc_list (player->priv->list);
+        TRACE("END CLEAR DVD LIST");
     }
-	player->priv->current_media_type = PAROLE_MEDIA_TYPE_UNKNOWN;
+    player->priv->current_media_type = PAROLE_MEDIA_TYPE_UNKNOWN;
     
     parole_media_list_set_playlist_view(player->priv->list, PAROLE_MEDIA_LIST_PLAYLIST_VIEW_STANDARD);
     
@@ -631,9 +650,9 @@ parole_player_dvd_reset (ParolePlayer *player)
 {
     if ( player->priv->row )
     {
-	parole_media_list_set_row_pixbuf (player->priv->list, player->priv->row, NULL);
-	gtk_tree_row_reference_free (player->priv->row);
-	player->priv->row = NULL;
+        parole_media_list_set_row_pixbuf (player->priv->list, player->priv->row, NULL);
+        gtk_tree_row_reference_free (player->priv->row);
+        player->priv->row = NULL;
     }
 }
 
@@ -642,192 +661,192 @@ parole_player_dvd_reset (ParolePlayer *player)
 static gboolean
 parole_sublang_equal_lists (GList *orig, GList *new)
 {
-	GList *o, *n;
-	gboolean retval;
+    GList *o, *n;
+    gboolean retval;
 
-	if ((orig == NULL && new != NULL) || (orig != NULL && new == NULL))
-		return FALSE;
-	if (orig == NULL && new == NULL)
-		return TRUE;
+    if ((orig == NULL && new != NULL) || (orig != NULL && new == NULL))
+        return FALSE;
+    if (orig == NULL && new == NULL)
+        return TRUE;
 
-	if (g_list_length (orig) != g_list_length (new))
-		return FALSE;
+    if (g_list_length (orig) != g_list_length (new))
+        return FALSE;
 
-	retval = TRUE;
-	o = orig;
-	n = new;
-	while (o != NULL && n != NULL && retval != FALSE)
-	{
-		if (g_str_equal (o->data, n->data) == FALSE)
-			retval = FALSE;
+    retval = TRUE;
+    o = orig;
+    n = new;
+    while (o != NULL && n != NULL && retval != FALSE)
+    {
+        if (g_str_equal (o->data, n->data) == FALSE)
+            retval = FALSE;
                 o = g_list_next (o);
                 n = g_list_next (n);
-	}
+    }
 
-	return retval;
+    return retval;
 }
 
 static void
 parole_player_clear_subtitles (ParolePlayer *player)
 {
-	GtkTreeIter iter;
-	GList *menu_items, *menu_iter;
-	gint counter = 0;
-	
-	/* Clear the InfoBar Combobox */
-	gtk_list_store_clear(player->priv->liststore_subtitles);
-	gtk_list_store_append(GTK_LIST_STORE(player->priv->liststore_subtitles), &iter);
-	gtk_list_store_set(GTK_LIST_STORE(player->priv->liststore_subtitles), &iter, 0, "None", -1);
-	gtk_combo_box_set_active( GTK_COMBO_BOX(player->priv->combobox_subtitles), 0 );
-	
-	/* Clear the subtitle menu options */
-	menu_items = gtk_container_get_children( GTK_CONTAINER (player->priv->subtitles_menu) );
-	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(player->priv->subtitles_group), TRUE);
-	
-	for (menu_iter = menu_items; menu_iter != NULL; menu_iter = g_list_next(menu_iter))
-	{
-		if (counter >= 4)
-			gtk_widget_destroy(GTK_WIDGET(menu_iter->data));
-		counter++;
-	}
-	g_list_free(menu_items);
+    GtkTreeIter iter;
+    GList *menu_items, *menu_iter;
+    gint counter = 0;
+    
+    /* Clear the InfoBar Combobox */
+    gtk_list_store_clear(player->priv->liststore_subtitles);
+    gtk_list_store_append(GTK_LIST_STORE(player->priv->liststore_subtitles), &iter);
+    gtk_list_store_set(GTK_LIST_STORE(player->priv->liststore_subtitles), &iter, 0, "None", -1);
+    gtk_combo_box_set_active( GTK_COMBO_BOX(player->priv->combobox_subtitles), 0 );
+    
+    /* Clear the subtitle menu options */
+    menu_items = gtk_container_get_children( GTK_CONTAINER (player->priv->subtitles_menu) );
+    gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(player->priv->subtitles_group), TRUE);
+    
+    for (menu_iter = menu_items; menu_iter != NULL; menu_iter = g_list_next(menu_iter))
+    {
+        if (counter >= 4)
+            gtk_widget_destroy(GTK_WIDGET(menu_iter->data));
+        counter++;
+    }
+    g_list_free(menu_items);
 }
 
 static void
 parole_player_set_subtitles_list (ParolePlayer *player, GList *subtitle_list)
 {
-	GList *l;
-	gchar* language;
-	
-	GtkTreeIter iter;
-	gint counter = 0;
-	
-	GtkWidget *menu_item;
+    GList *l;
+    gchar* language;
+    
+    GtkTreeIter iter;
+    gint counter = 0;
+    
+    GtkWidget *menu_item;
 
-	parole_player_clear_subtitles( player );
+    parole_player_clear_subtitles( player );
 
-	player->priv->subtitle_list = subtitle_list;
+    player->priv->subtitle_list = subtitle_list;
 
-	for (l = subtitle_list; l != NULL; l = l->next)
-	{
-		language = g_strdup (l->data);
+    for (l = subtitle_list; l != NULL; l = l->next)
+    {
+        language = g_strdup (l->data);
 
-		gtk_list_store_append(GTK_LIST_STORE(player->priv->liststore_subtitles), &iter);
-		gtk_list_store_set(GTK_LIST_STORE(player->priv->liststore_subtitles), &iter, 0, language, -1);
+        gtk_list_store_append(GTK_LIST_STORE(player->priv->liststore_subtitles), &iter);
+        gtk_list_store_set(GTK_LIST_STORE(player->priv->liststore_subtitles), &iter, 0, language, -1);
 
-		menu_item = gtk_radio_menu_item_new_with_label_from_widget (GTK_RADIO_MENU_ITEM(player->priv->subtitles_group), language);
-		gtk_widget_show (menu_item);
-		
-		gtk_menu_shell_append (GTK_MENU_SHELL (player->priv->subtitles_menu), menu_item);
-		g_signal_connect (menu_item, "activate",
-		      G_CALLBACK (parole_player_subtitles_radio_menu_item_changed_cb), player);
-		
-		g_free (language);
-		
-		counter++;
-	}
-	
-	if (g_list_length (subtitle_list) != 1) {
-    	gtk_widget_show(player->priv->infobar);
-  	}
+        menu_item = gtk_radio_menu_item_new_with_label_from_widget (GTK_RADIO_MENU_ITEM(player->priv->subtitles_group), language);
+        gtk_widget_show (menu_item);
+        
+        gtk_menu_shell_append (GTK_MENU_SHELL (player->priv->subtitles_menu), menu_item);
+        g_signal_connect   (menu_item, "activate",
+                            G_CALLBACK (parole_player_subtitles_radio_menu_item_changed_cb), player);
+        
+        g_free (language);
+        
+        counter++;
+    }
+    
+    if (g_list_length (subtitle_list) != 1) {
+        gtk_widget_show(player->priv->infobar);
+    }
 }
 
 static void
 parole_player_clear_audio_tracks (ParolePlayer *player)
 {
-	GList *menu_items, *menu_iter;
-	GtkWidget *empty_item;
+    GList *menu_items, *menu_iter;
+    GtkWidget *empty_item;
 
-	gtk_list_store_clear(player->priv->liststore_audiotrack);
-	player->priv->audio_group = NULL;
-	
-	/* Clear the subtitle menu options */
-	
-	menu_items = gtk_container_get_children( GTK_CONTAINER (player->priv->languages_menu) );
-	
-	for (menu_iter = menu_items; menu_iter != NULL; menu_iter = g_list_next(menu_iter))
-	gtk_widget_destroy(GTK_WIDGET(menu_iter->data));
-	g_list_free(menu_items);
-	
-	empty_item = gtk_menu_item_new_with_label(_("Empty"));
-	gtk_widget_set_sensitive( empty_item, FALSE );
-	gtk_widget_show( empty_item );
-	
-	gtk_menu_shell_append (GTK_MENU_SHELL (player->priv->languages_menu), empty_item);
+    gtk_list_store_clear(player->priv->liststore_audiotrack);
+    player->priv->audio_group = NULL;
+    
+    /* Clear the subtitle menu options */
+    
+    menu_items = gtk_container_get_children( GTK_CONTAINER (player->priv->languages_menu) );
+    
+    for (menu_iter = menu_items; menu_iter != NULL; menu_iter = g_list_next(menu_iter))
+        gtk_widget_destroy(GTK_WIDGET(menu_iter->data));
+    g_list_free(menu_items);
+    
+    empty_item = gtk_menu_item_new_with_label(_("Empty"));
+    gtk_widget_set_sensitive( empty_item, FALSE );
+    gtk_widget_show( empty_item );
+    
+    gtk_menu_shell_append (GTK_MENU_SHELL (player->priv->languages_menu), empty_item);
 }
 
 static void
 parole_player_set_audio_list (ParolePlayer *player, GList *audio_list)
 {
-	GList *menu_iter;
-	GList *l;
-	gchar* language;
-	
-	GtkTreeIter iter;
-	
-	GtkWidget *menu_item;
-	
-	parole_player_clear_audio_tracks( player );
-
-	menu_iter = gtk_container_get_children( GTK_CONTAINER (player->priv->languages_menu) );
-	
-	gtk_widget_destroy(GTK_WIDGET(menu_iter->data));
-	g_list_free(menu_iter);
-	
-	player->priv->audio_list = audio_list;
-	
-	for (l = audio_list; l != NULL; l = l->next)
-	{
-		language = g_strdup (l->data);
-	
-		gtk_list_store_append(GTK_LIST_STORE(player->priv->liststore_audiotrack), &iter);
-		gtk_list_store_set(GTK_LIST_STORE(player->priv->liststore_audiotrack), &iter, 0, language, -1);
-		
-		if (player->priv->audio_group == NULL)
-		{
-			player->priv->audio_group = GTK_WIDGET (gtk_radio_menu_item_new_with_label (NULL, language));
-			gtk_widget_show (GTK_WIDGET(player->priv->audio_group));
-			gtk_menu_shell_append (GTK_MENU_SHELL (player->priv->languages_menu), GTK_WIDGET(player->priv->audio_group));
-			gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(player->priv->audio_group), TRUE);
-			
-			g_signal_connect (player->priv->audio_group, "activate",
-		      G_CALLBACK (parole_player_audiotrack_radio_menu_item_changed_cb), player);
-		} else {
-			
-			menu_item = gtk_radio_menu_item_new_with_label_from_widget (GTK_RADIO_MENU_ITEM(player->priv->audio_group), language);
-			gtk_widget_show (menu_item);
-			gtk_menu_shell_append (GTK_MENU_SHELL (player->priv->languages_menu), menu_item);
-			
-			g_signal_connect (menu_item, "activate",
-		      G_CALLBACK (parole_player_audiotrack_radio_menu_item_changed_cb), player);
-		}
-		
-		g_free (language);
-	}
-	
-	gtk_combo_box_set_active( GTK_COMBO_BOX(player->priv->combobox_audiotrack), 0 );
-	
-	if (g_list_length (audio_list) >= 2) {
-		gtk_widget_set_sensitive( GTK_WIDGET( player->priv->combobox_audiotrack ), TRUE );
-  		gtk_widget_show(player->priv->infobar);
-  	}
-  	else {
-  	gtk_widget_set_sensitive( GTK_WIDGET( player->priv->combobox_audiotrack ), FALSE );
-  	}
+    GList *menu_iter;
+    GList *l;
+    gchar* language;
+    
+    GtkTreeIter iter;
+    
+    GtkWidget *menu_item;
+    
+    parole_player_clear_audio_tracks( player );
+
+    menu_iter = gtk_container_get_children( GTK_CONTAINER (player->priv->languages_menu) );
+    
+    gtk_widget_destroy(GTK_WIDGET(menu_iter->data));
+    g_list_free(menu_iter);
+    
+    player->priv->audio_list = audio_list;
+    
+    for (l = audio_list; l != NULL; l = l->next)
+    {
+        language = g_strdup (l->data);
+    
+        gtk_list_store_append(GTK_LIST_STORE(player->priv->liststore_audiotrack), &iter);
+        gtk_list_store_set(GTK_LIST_STORE(player->priv->liststore_audiotrack), &iter, 0, language, -1);
+        
+        if (player->priv->audio_group == NULL)
+        {
+            player->priv->audio_group = GTK_WIDGET (gtk_radio_menu_item_new_with_label (NULL, language));
+            gtk_widget_show (GTK_WIDGET(player->priv->audio_group));
+            gtk_menu_shell_append (GTK_MENU_SHELL (player->priv->languages_menu), GTK_WIDGET(player->priv->audio_group));
+            gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(player->priv->audio_group), TRUE);
+            
+            g_signal_connect (player->priv->audio_group, "activate",
+                              G_CALLBACK (parole_player_audiotrack_radio_menu_item_changed_cb), player);
+        } else {
+            
+            menu_item = gtk_radio_menu_item_new_with_label_from_widget (GTK_RADIO_MENU_ITEM(player->priv->audio_group), language);
+            gtk_widget_show (menu_item);
+            gtk_menu_shell_append (GTK_MENU_SHELL (player->priv->languages_menu), menu_item);
+            
+            g_signal_connect (menu_item, "activate",
+                              G_CALLBACK (parole_player_audiotrack_radio_menu_item_changed_cb), player);
+        }
+        
+        g_free (language);
+    }
+    
+    gtk_combo_box_set_active( GTK_COMBO_BOX(player->priv->combobox_audiotrack), 0 );
+    
+    if (g_list_length (audio_list) >= 2) {
+        gtk_widget_set_sensitive( GTK_WIDGET( player->priv->combobox_audiotrack ), TRUE );
+        gtk_widget_show(player->priv->infobar);
+    }
+    else {
+        gtk_widget_set_sensitive( GTK_WIDGET( player->priv->combobox_audiotrack ), FALSE );
+    }
 }
 
 static void
 parole_player_update_audio_tracks (ParolePlayer *player, ParoleGst *gst)
 {
-	GList * list = gst_get_lang_list_for_type (gst, "AUDIO");
-	
-	if (parole_sublang_equal_lists (player->priv->audio_list, list) == TRUE)
-	{
-		return;
-	}
-	
-	parole_player_set_audio_list (player, list);
-	
+    GList * list = gst_get_lang_list_for_type (gst, "AUDIO");
+    
+    if (parole_sublang_equal_lists (player->priv->audio_list, list) == TRUE)
+    {
+        return;
+    }
+    
+    parole_player_set_audio_list (player, list);
+    
     g_free (list->data);
     g_list_free (list);
     list = NULL;
@@ -836,37 +855,37 @@ parole_player_update_audio_tracks (ParolePlayer *player, ParoleGst *gst)
 static void
 parole_player_update_subtitles (ParolePlayer *player, ParoleGst *gst)
 {
-	GList * list = gst_get_lang_list_for_type (gst, "TEXT");
-	
-	guint64 sub_index;
-	gboolean sub_enabled;
-	
-	sub_index = 0;
-	
-	g_object_get (G_OBJECT (player->priv->conf),
-		  "enable-subtitle", &sub_enabled,
-		  NULL);
-		  
-	if (sub_enabled)
-	sub_index = 1;
-	
+    GList * list = gst_get_lang_list_for_type (gst, "TEXT");
+    
+    guint64 sub_index;
+    gboolean sub_enabled;
+    
+    sub_index = 0;
+    
+    g_object_get (G_OBJECT (player->priv->conf),
+                  "enable-subtitle", &sub_enabled,
+                  NULL);
+          
+    if (sub_enabled)
+        sub_index = 1;
+    
     if (parole_sublang_equal_lists (player->priv->subtitle_list, list) == TRUE)
     {
-	    if (g_list_length (list) == 0)
-	    {
-		    parole_player_clear_subtitles(player);
-	    }
-	    return;
+        if (g_list_length (list) == 0)
+        {
+            parole_player_clear_subtitles(player);
+        }
+        return;
     }
 
     parole_player_set_subtitles_list (player, list);
-	
-	gtk_combo_box_set_active( GTK_COMBO_BOX(player->priv->combobox_subtitles), sub_index );
-	
-	if (g_list_length (list) != 1) {
-    	gtk_widget_show(player->priv->infobar);
-  	}
-  	g_free (list->data);
+    
+    gtk_combo_box_set_active( GTK_COMBO_BOX(player->priv->combobox_subtitles), sub_index );
+    
+    if (g_list_length (list) != 1) {
+        gtk_widget_show(player->priv->infobar);
+    }
+    g_free (list->data);
     g_list_free (list);
     list = NULL;
 }
@@ -874,21 +893,21 @@ parole_player_update_subtitles (ParolePlayer *player, ParoleGst *gst)
 static void
 parole_player_update_languages (ParolePlayer *player, ParoleGst *gst)
 {
-	if (player->priv->update_languages == TRUE)
-	{
-		if (gst_get_has_video( PAROLE_GST(player->priv->gst) ))
-		{
-			parole_player_update_audio_tracks(player, gst);
-			parole_player_update_subtitles(player, gst);
-			
-			/* Enable custom subtitles for video as long as its not a DVD. */
-			gtk_widget_set_sensitive(player->priv->subtitles_menu_custom, 
-			    player->priv->current_media_type != PAROLE_MEDIA_TYPE_DVD);
-		}
-		else
-		    gtk_widget_set_sensitive(player->priv->subtitles_menu_custom, FALSE);
-		player->priv->update_languages = FALSE;
-	}
+    if (player->priv->update_languages == TRUE)
+    {
+        if (gst_get_has_video( PAROLE_GST(player->priv->gst) ))
+        {
+            parole_player_update_audio_tracks(player, gst);
+            parole_player_update_subtitles(player, gst);
+            
+            /* Enable custom subtitles for video as long as its not a DVD. */
+            gtk_widget_set_sensitive(player->priv->subtitles_menu_custom, 
+                player->priv->current_media_type != PAROLE_MEDIA_TYPE_DVD);
+        }
+        else
+            gtk_widget_set_sensitive(player->priv->subtitles_menu_custom, FALSE);
+        player->priv->update_languages = FALSE;
+    }
 }
 
 static void
@@ -900,13 +919,13 @@ parole_player_show_audiobox (ParolePlayer *player)
     if (!gst_get_has_video ( PAROLE_GST(player->priv->gst) ) &&
         !gst_get_has_vis   ( PAROLE_GST(player->priv->gst) ) )
     {
-	gtk_widget_show(player->priv->audiobox);
-	gtk_widget_hide(player->priv->videobox);
+        gtk_widget_show(player->priv->audiobox);
+        gtk_widget_hide(player->priv->videobox);
     }
     else
     {
-	gtk_widget_hide(player->priv->audiobox);
-	gtk_widget_show(player->priv->videobox);
+        gtk_widget_hide(player->priv->audiobox);
+        gtk_widget_show(player->priv->videobox);
     }
 }
 
@@ -936,20 +955,20 @@ parole_player_select_custom_subtitle (GtkMenuItem *widget, gpointer data)
 
     /* Build the FileChooser dialog for subtitle selection. */
     chooser = gtk_file_chooser_dialog_new (_("Select Subtitle File"), NULL,
-					   GTK_FILE_CHOOSER_ACTION_OPEN,
-					   GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-					   GTK_STOCK_OPEN, GTK_RESPONSE_OK,
-					   NULL);
-				
+                                           GTK_FILE_CHOOSER_ACTION_OPEN,
+                                           GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                                           GTK_STOCK_OPEN, GTK_RESPONSE_OK,
+                                           NULL);
+                
     gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (chooser), FALSE);
     gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (chooser), FALSE);
     
-    g_object_get (G_OBJECT (player->priv->conf),
-        "media-chooser-folder", &folder,
-        NULL);
+    g_object_get   (G_OBJECT (player->priv->conf),
+                    "media-chooser-folder", &folder,
+                    NULL);
     
     if ( folder )
-	gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (chooser), folder);
+        gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (chooser), folder);
     
     /* Subtitle format filter */
     filter = gtk_file_filter_new ();
@@ -974,7 +993,7 @@ parole_player_select_custom_subtitle (GtkMenuItem *widget, gpointer data)
     /* Run the dialog, get the selected filename. */    
     response = gtk_dialog_run (GTK_DIALOG (chooser));
     if ( response == GTK_RESPONSE_OK )
-    sub = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (chooser));
+        sub = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (chooser));
     
     gtk_widget_destroy (chooser);
     
@@ -988,24 +1007,24 @@ parole_player_select_custom_subtitle (GtkMenuItem *widget, gpointer data)
         
         if ( g_str_has_prefix (uri, "file:/") )
         {
-	        TRACE ("Trying to play media file %s", uri);
-	        TRACE ("Trying to use subtitle file %s", sub);
-	        player->priv->updated_subs = TRUE;
-	        
-	        file = parole_media_list_get_selected_file( player->priv->list );
+            TRACE ("Trying to play media file %s", uri);
+            TRACE ("Trying to use subtitle file %s", sub);
+            player->priv->updated_subs = TRUE;
+            
+            file = parole_media_list_get_selected_file( player->priv->list );
             
             /* Set the subtitles in gst as well as in the media list, for later
                retrieval. */
             if ( file )
             {
-	        parole_file_set_custom_subtitles(file, sub);
-	        parole_gst_set_custom_subtitles(PAROLE_GST (player->priv->gst), sub);
-	        parole_gst_play_uri (PAROLE_GST (player->priv->gst), uri, sub);
-	        }
+                parole_file_set_custom_subtitles(file, sub);
+                parole_gst_set_custom_subtitles(PAROLE_GST (player->priv->gst), sub);
+                parole_gst_play_uri (PAROLE_GST (player->priv->gst), uri, sub);
+            }
         }
         
-	    g_free (sub);
-	    g_free (uri);
+        g_free (sub);
+        g_free (uri);
     }
 }
 
@@ -1020,59 +1039,59 @@ parole_player_media_activated_cb (ParoleMediaList *list, GtkTreeRowReference *ro
     
     if ( gtk_tree_model_get_iter (model, &iter, gtk_tree_row_reference_get_path (row)) )
     {
-	gtk_tree_model_get (model, &iter, DATA_COL, &file, -1);
-	
-	if ( file )
-	{
-	    const gchar *sub = NULL;
-	    const gchar *uri;
-	    const gchar *directory = NULL;
-	    gint dvd_chapter;
-	    
-	    uri = parole_file_get_uri (file);
-	    directory = parole_file_get_directory(file);
-	    
-	    if ( g_str_has_prefix (uri, "dvd") )
-	    {
-	        parole_player_dvd_reset (player);
-	        player->priv->row = gtk_tree_row_reference_copy (row);
-	        dvd_chapter = parole_file_get_dvd_chapter(file);
-	        parole_gst_set_dvd_chapter(PAROLE_GST(player->priv->gst), dvd_chapter);
-	        g_object_unref (file);
-	        return;
-	    }
-	    parole_player_reset (player);
-	    player->priv->row = gtk_tree_row_reference_copy (row);
-	    
-	    if ( g_str_has_prefix (uri, "file:/") )
-	    {
-		if ( parole_file_filter (player->priv->video_filter, file) )
-		{
-		    sub = parole_file_get_custom_subtitles (file);
-		    parole_gst_set_custom_subtitles(PAROLE_GST(player->priv->gst), sub);
-		    if (sub == NULL)
-		        sub = parole_get_subtitle_path (uri);
-		}
-	    }
-	    TRACE ("Trying to play media file %s", uri);
-	    TRACE ("File content type %s", parole_file_get_content_type(file));
-	    
-	    
-	    parole_gst_play_uri (PAROLE_GST (player->priv->gst), 
-				 parole_file_get_uri (file),
-				 sub);
-	    
-	    gtk_window_set_title (GTK_WINDOW (player->priv->window), parole_media_list_get_row_name (player->priv->list, player->priv->row));
-	    
-	    if ( directory )
-	    {
+        gtk_tree_model_get (model, &iter, DATA_COL, &file, -1);
+    
+    if ( file )
+    {
+        const gchar *sub = NULL;
+        const gchar *uri;
+        const gchar *directory = NULL;
+        gint dvd_chapter;
+        
+        uri = parole_file_get_uri (file);
+        directory = parole_file_get_directory(file);
+        
+        if ( g_str_has_prefix (uri, "dvd") )
+        {
+            parole_player_dvd_reset (player);
+            player->priv->row = gtk_tree_row_reference_copy (row);
+            dvd_chapter = parole_file_get_dvd_chapter(file);
+            parole_gst_set_dvd_chapter(PAROLE_GST(player->priv->gst), dvd_chapter);
+            g_object_unref (file);
+            return;
+        }
+        parole_player_reset (player);
+        player->priv->row = gtk_tree_row_reference_copy (row);
+        
+        if ( g_str_has_prefix (uri, "file:/") )
+        {
+            if ( parole_file_filter (player->priv->video_filter, file) )
+            {
+                    sub = parole_file_get_custom_subtitles (file);
+                    parole_gst_set_custom_subtitles(PAROLE_GST(player->priv->gst), sub);
+                    if (sub == NULL)
+                        sub = parole_get_subtitle_path (uri);
+            }
+        }
+        TRACE ("Trying to play media file %s", uri);
+        TRACE ("File content type %s", parole_file_get_content_type(file));
+        
+        
+        parole_gst_play_uri (PAROLE_GST (player->priv->gst), 
+                             parole_file_get_uri (file),
+                             sub);
+        
+        gtk_window_set_title (GTK_WINDOW (player->priv->window), parole_media_list_get_row_name (player->priv->list, player->priv->row));
+        
+        if ( directory )
+        {
             g_object_set (G_OBJECT (player->priv->conf),
                 "media-chooser-folder", directory,
                 NULL);
-		}
+        }
 
-	    g_object_unref (file);
-	}
+        g_object_unref (file);
+    }
     }
 }
 
@@ -1088,9 +1107,9 @@ parole_player_disc_selected_cb (ParoleDisc *disc, const gchar *uri, const gchar
         player->priv->wait_for_gst_disc_info = TRUE;
         if ( player->priv->row )
         {
-	    parole_media_list_set_row_pixbuf (player->priv->list, player->priv->row, NULL);
-	    gtk_tree_row_reference_free (player->priv->row);
-	    player->priv->row = NULL;
+            parole_media_list_set_row_pixbuf (player->priv->list, player->priv->row, NULL);
+            gtk_tree_row_reference_free (player->priv->row);
+            player->priv->row = NULL;
         }
         TRACE("CLEAR PLAYLIST");
         parole_media_list_clear_list (player->priv->list);
@@ -1167,11 +1186,11 @@ parole_player_recent_menu_item_activated_cb (GtkWidget *widget, ParolePlayer *pl
         filenames[0] = g_strdup(filename);
         filenames[1] = NULL;
         
-	    list = parole_player_get_media_list (player);
-	    parole_media_list_add_files (list, filenames, FALSE);
-	    
-	    g_free(filenames[0]);
-	}
+        list = parole_player_get_media_list (player);
+        parole_media_list_add_files (list, filenames, FALSE);
+        
+        g_free(filenames[0]);
+    }
     
     g_free(filename);
     g_free(uri);
@@ -1182,8 +1201,8 @@ parole_player_media_cursor_changed_cb (ParoleMediaList *list, gboolean media_sel
 {
     if (player->priv->state < PAROLE_STATE_PAUSED)
     {
-	gtk_widget_set_sensitive (player->priv->play_pause, 
-				  media_selected || !parole_media_list_is_empty (player->priv->list));
+    gtk_widget_set_sensitive   (player->priv->play_pause, 
+                                media_selected || !parole_media_list_is_empty (player->priv->list));
     }
 }
 
@@ -1196,7 +1215,7 @@ parole_player_media_list_shuffle_toggled_cb (ParoleMediaList *list, gboolean shu
     
     if (toggled != shuffle_toggled)
     {
-    	gtk_check_menu_item_set_active ( GTK_CHECK_MENU_ITEM(player->priv->shuffle_menu_item), shuffle_toggled);
+        gtk_check_menu_item_set_active ( GTK_CHECK_MENU_ITEM(player->priv->shuffle_menu_item), shuffle_toggled);
     }
 }
 
@@ -1209,7 +1228,7 @@ parole_player_media_list_repeat_toggled_cb (ParoleMediaList *list, gboolean repe
     
     if (toggled != repeat_toggled)
     {
-    	gtk_check_menu_item_set_active ( GTK_CHECK_MENU_ITEM(player->priv->repeat_menu_item), repeat_toggled);
+        gtk_check_menu_item_set_active ( GTK_CHECK_MENU_ITEM(player->priv->repeat_menu_item), repeat_toggled);
     }
 }
 
@@ -1217,7 +1236,7 @@ static void
 parole_player_media_list_show_playlist_cb (ParoleMediaList *list, gboolean show_playlist, ParolePlayer *player)
 {
     parole_media_list_set_playlist_view(player->priv->list, 
-                    player->priv->current_media_type == PAROLE_MEDIA_TYPE_DVD);
+                                        player->priv->current_media_type == PAROLE_MEDIA_TYPE_DVD);
     parole_player_set_playlist_visible (player, show_playlist);
 }
 
@@ -1236,7 +1255,7 @@ parole_player_media_progressed_cb (ParoleGst *gst, const ParoleStream *stream, g
     
     if (!player->priv->user_seeking)
     {
-	parole_player_change_range_value (player, value);
+        parole_player_change_range_value (player, value);
     }
 }
 
@@ -1246,9 +1265,9 @@ parole_player_seekable_notify (ParoleStream *stream, GParamSpec *spec, ParolePla
     gboolean seekable;
     
     g_object_get (G_OBJECT (stream),
-		  "seekable", &seekable,
-		  NULL);
-		  
+                  "seekable", &seekable,
+                  NULL);
+          
     gtk_widget_set_tooltip_text (GTK_WIDGET (player->priv->range), seekable ? NULL : _("Media stream is not seekable"));
     gtk_widget_set_sensitive (GTK_WIDGET (player->priv->range), seekable);
     gtk_widget_set_sensitive (player->priv->seekf, seekable);
@@ -1268,12 +1287,12 @@ parole_player_set_playpause_button_image (GtkWidget *widget, const gchar *stock_
     }
     
     g_object_get (G_OBJECT (widget),
-		  "image", &img,
-		  NULL);
-		  
+                  "image", &img,
+                  NULL);
+          
     g_object_set (G_OBJECT (img),
-	      "icon-name", icon_name,
-	      NULL);
+                  "icon-name", icon_name,
+                  NULL);
 
     g_object_unref (img);
     //g_object_unref (icon_name);
@@ -1289,38 +1308,38 @@ parole_player_save_uri (ParolePlayer *player, const ParoleStream *stream)
     guint i;
 
     g_object_get (G_OBJECT (stream),
-		  "uri", &uri,
-		  NULL);
+                  "uri", &uri,
+                  NULL);
     
     g_object_get (G_OBJECT (stream),
-		  "media-type", &media_type,
-		  NULL);
-		  
+                  "media-type", &media_type,
+                  NULL);
+          
     if ( media_type == PAROLE_MEDIA_TYPE_LOCAL_FILE )
     {
-	gtk_recent_manager_add_item (player->priv->recent, uri);
-	goto out;
+        gtk_recent_manager_add_item (player->priv->recent, uri);
+        goto out;
     }
-	
+    
     lines = parole_get_history ();
     
     if (lines )
     {
-	for ( i = 0; lines[i]; i++)
-	{
-	    if ( !g_strcmp0 (lines[i], uri) )
-	    {
-		save = FALSE;
-		break;
-	    }   
-	}
+    for ( i = 0; lines[i]; i++)
+    {
+        if ( !g_strcmp0 (lines[i], uri) )
+        {
+        save = FALSE;
+        break;
+        }   
+    }
     }
     
     if ( media_type != PAROLE_MEDIA_TYPE_CDDA && media_type != PAROLE_MEDIA_TYPE_DVD )
     {
         if ( save )
         {
-	        parole_insert_line_history (uri);
+            parole_insert_line_history (uri);
         }
     }
     
@@ -1341,22 +1360,22 @@ parole_player_playing (ParolePlayer *player, const ParoleStream *stream)
     pix = parole_icon_load ("player_play", 16);
     
     if ( !pix )
-	pix = parole_icon_load ("gtk-media-play-ltr", 16);
+        pix = parole_icon_load ("gtk-media-play-ltr", 16);
     
     parole_media_list_set_row_pixbuf (player->priv->list, player->priv->row, pix);
     
     g_object_get (G_OBJECT (stream),
-		  "seekable", &seekable,
-		  "duration", &duration,
-		  "live", &live,
-		  NULL);
-		  
+                  "seekable", &seekable,
+                  "duration", &duration,
+                  "live", &live,
+                  NULL);
+          
     if (player->priv->wait_for_gst_disc_info == TRUE)
     {
         parole_media_list_add_cdda_tracks(player->priv->list, parole_gst_get_num_tracks(PAROLE_GST (player->priv->gst)));
         player->priv->wait_for_gst_disc_info = FALSE;
     }
-		  
+          
     gtk_widget_set_sensitive (player->priv->play_pause, TRUE);
     
     parole_player_set_playpause_button_image (player->priv->play_pause, GTK_STOCK_MEDIA_PAUSE);
@@ -1367,31 +1386,31 @@ parole_player_playing (ParolePlayer *player, const ParoleStream *stream)
     player->priv->internal_range_change = TRUE;
     if ( live || duration == 0)
     {
-		parole_player_change_range_value (player, 0);
-		gtk_widget_set_visible( player->priv->label_duration, FALSE );
-		gtk_widget_set_visible( player->priv->label_elapsed, FALSE );
-	}
+        parole_player_change_range_value (player, 0);
+        gtk_widget_set_visible( player->priv->label_duration, FALSE );
+        gtk_widget_set_visible( player->priv->label_elapsed, FALSE );
+    }
     else 
     {
-		gtk_range_set_range (GTK_RANGE (player->priv->range), 0, duration);
-		gtk_widget_set_visible( player->priv->label_duration, TRUE );
-		gtk_widget_set_visible( player->priv->label_elapsed, TRUE );
-	}
-
-	if ( duration != 0)
-	{
-	    gchar dur_text[128];
-	    get_time_string (dur_text, duration);
-
-	    gtk_label_set_text (GTK_LABEL (player->priv->label_duration), dur_text);
-	    if ( player->priv->current_media_type != PAROLE_MEDIA_TYPE_DVD )
-	    {
-	    parole_media_list_set_row_length (player->priv->list,
-	                                      player->priv->row,
-	                                      dur_text);
-	    }
-	}
-	
+        gtk_range_set_range (GTK_RANGE (player->priv->range), 0, duration);
+        gtk_widget_set_visible( player->priv->label_duration, TRUE );
+        gtk_widget_set_visible( player->priv->label_elapsed, TRUE );
+    }
+
+    if ( duration != 0)
+    {
+        gchar dur_text[128];
+        get_time_string (dur_text, duration);
+
+        gtk_label_set_text (GTK_LABEL (player->priv->label_duration), dur_text);
+        if ( player->priv->current_media_type != PAROLE_MEDIA_TYPE_DVD )
+        {
+            parole_media_list_set_row_length (player->priv->list,
+                                              player->priv->row,
+                                              dur_text);
+        }
+    }
+    
     player->priv->internal_range_change = FALSE;
     
     gtk_widget_set_sensitive (player->priv->seekf, seekable);
@@ -1399,8 +1418,8 @@ parole_player_playing (ParolePlayer *player, const ParoleStream *stream)
     gtk_widget_set_tooltip_text (GTK_WIDGET (player->priv->range), seekable ? NULL : _("Media stream is not seekable"));
 
     if ( pix )
-	g_object_unref (pix);
-	
+        g_object_unref (pix);
+    
     parole_player_save_uri (player, stream);
     parole_media_list_select_row (player->priv->list, player->priv->row);
     gtk_widget_grab_focus (player->priv->gst);
@@ -1421,13 +1440,13 @@ parole_player_paused (ParolePlayer *player)
     
     if ( player->priv->user_seeking == FALSE)
     {
-	parole_player_set_playpause_button_image (player->priv->play_pause, GTK_STOCK_MEDIA_PLAY);
-	gtk_widget_set_tooltip_text(player->priv->play_pause, _("Play"));
+        parole_player_set_playpause_button_image (player->priv->play_pause, GTK_STOCK_MEDIA_PLAY);
+        gtk_widget_set_tooltip_text(player->priv->play_pause, _("Play"));
     }
     
     if ( pix )
-	g_object_unref (pix);
-	
+        g_object_unref (pix);
+    
 }
 
 static void
@@ -1447,16 +1466,16 @@ parole_player_stopped (ParolePlayer *player)
     TRACE ("Player stopped");
     
     gtk_widget_set_sensitive (player->priv->play_pause, 
-			      parole_media_list_is_selected_row (player->priv->list) || 
-			      !parole_media_list_is_empty (player->priv->list));
-			      
+                              parole_media_list_is_selected_row (player->priv->list) || 
+                              !parole_media_list_is_empty (player->priv->list));
+                  
     gtk_window_set_title (GTK_WINDOW (player->priv->window), _("Parole Media Player"));
 
-	gtk_widget_hide(player->priv->videobox);
-	gtk_widget_hide(player->priv->audiobox);
-	gtk_widget_show(player->priv->logo_image);
-	
-	
+    gtk_widget_hide(player->priv->videobox);
+    gtk_widget_hide(player->priv->audiobox);
+    gtk_widget_show(player->priv->logo_image);
+    
+    
     get_time_string (dur_text, 0);
     gtk_label_set_text (GTK_LABEL (player->priv->label_duration), dur_text);
 
@@ -1473,7 +1492,7 @@ parole_player_stopped (ParolePlayer *player)
     
     if ( player->priv->exit )
     {
-	parole_player_quit (player);
+        parole_player_quit (player);
     }
 }
 
@@ -1485,49 +1504,49 @@ parole_player_play_selected_row (ParolePlayer *player)
     row = parole_media_list_get_selected_row (player->priv->list);
     
     if ( row == NULL )
-	row = parole_media_list_get_first_row (player->priv->list);
+        row = parole_media_list_get_first_row (player->priv->list);
     
     if ( row )
-	parole_player_media_activated_cb (player->priv->list, row, player);
+        parole_player_media_activated_cb (player->priv->list, row, player);
 }
 
 static void
 parole_player_play_next (ParolePlayer *player, gboolean allow_shuffle)
 {
-	gboolean repeat, shuffle;
+    gboolean repeat, shuffle;
     GtkTreeRowReference *row;
     
-	if ( player->priv->current_media_type == PAROLE_MEDIA_TYPE_DVD )
+    if ( player->priv->current_media_type == PAROLE_MEDIA_TYPE_DVD )
     {
-		parole_gst_next_dvd_chapter (PAROLE_GST(player->priv->gst));
-		return;
+        parole_gst_next_dvd_chapter (PAROLE_GST(player->priv->gst));
+        return;
     }
     
     g_object_get (G_OBJECT (player->priv->conf),
-		  "shuffle", &shuffle,
-		  "repeat", &repeat,
-		  NULL);
+                  "shuffle", &shuffle,
+                  "repeat", &repeat,
+                  NULL);
     
     if ( player->priv->row )
     {
-	parole_media_list_set_row_pixbuf (player->priv->list, player->priv->row, NULL);
-	
-	if ( shuffle && allow_shuffle )
-	    row = parole_media_list_get_row_random (player->priv->list);
-	else
-	    row = parole_media_list_get_next_row (player->priv->list, player->priv->row, repeat);
-	
-	if ( row )
-	{
-	    parole_player_media_activated_cb (player->priv->list, row, player);
-	    return;
-	}
-	else
-	{
-	    TRACE ("No remaining media in the list");
-	    gtk_tree_row_reference_free (player->priv->row);
-	    player->priv->row = NULL;
-	}
+        parole_media_list_set_row_pixbuf (player->priv->list, player->priv->row, NULL);
+        
+        if ( shuffle && allow_shuffle )
+            row = parole_media_list_get_row_random (player->priv->list);
+        else
+            row = parole_media_list_get_next_row (player->priv->list, player->priv->row, repeat);
+        
+        if ( row )
+        {
+            parole_player_media_activated_cb (player->priv->list, row, player);
+            return;
+        }
+        else
+        {
+            TRACE ("No remaining media in the list");
+            gtk_tree_row_reference_free (player->priv->row);
+            player->priv->row = NULL;
+        }
     }
 
     parole_gst_stop (PAROLE_GST (player->priv->gst));
@@ -1536,31 +1555,31 @@ parole_player_play_next (ParolePlayer *player, gboolean allow_shuffle)
 static void
 parole_player_play_prev (ParolePlayer *player)
 {
-	GtkTreeRowReference *row;
+    GtkTreeRowReference *row;
 
-	if ( player->priv->current_media_type == PAROLE_MEDIA_TYPE_DVD )
+    if ( player->priv->current_media_type == PAROLE_MEDIA_TYPE_DVD )
     {
-		parole_gst_prev_dvd_chapter (PAROLE_GST(player->priv->gst));
-		return;
+        parole_gst_prev_dvd_chapter (PAROLE_GST(player->priv->gst));
+        return;
     }
     
     if ( player->priv->row )
     {
-	parole_media_list_set_row_pixbuf (player->priv->list, player->priv->row, NULL);
-	
-	row = parole_media_list_get_prev_row (player->priv->list, player->priv->row);
-	
-	if ( row )
-	{
-	    parole_player_media_activated_cb (player->priv->list, row, player);
-	    return;
-	}
-	else
-	{
-	    TRACE ("No remaining media in the list");
-	    gtk_tree_row_reference_free (player->priv->row);
-	    player->priv->row = NULL;
-	}
+        parole_media_list_set_row_pixbuf (player->priv->list, player->priv->row, NULL);
+        
+        row = parole_media_list_get_prev_row (player->priv->list, player->priv->row);
+        
+        if ( row )
+        {
+            parole_player_media_activated_cb (player->priv->list, row, player);
+            return;
+        }
+        else
+        {
+            TRACE ("No remaining media in the list");
+            gtk_tree_row_reference_free (player->priv->row);
+            player->priv->row = NULL;
+        }
     }
 
     parole_gst_stop (PAROLE_GST (player->priv->gst));
@@ -1574,26 +1593,26 @@ parole_player_reset_saver_changed (ParolePlayer *player, const ParoleStream *str
     TRACE ("Start");
     
     g_object_get (G_OBJECT (player->priv->conf),
-		  "reset-saver", &reset_saver,
-		  NULL);
-		  
+                  "reset-saver", &reset_saver,
+                  NULL);
+          
     if ( !reset_saver )
-	parole_screen_saver_uninhibit (player->priv->screen_saver, GTK_WINDOW (player->priv->window));
+        parole_screen_saver_uninhibit (player->priv->screen_saver, GTK_WINDOW (player->priv->window));
     else if ( player->priv->state ==  PAROLE_STATE_PLAYING )
     {
-	gboolean has_video;
-	
-	g_object_get (G_OBJECT (stream),
-		      "has-video", &has_video,
-		      NULL);
-		      
-	if ( has_video )
-	{
-	    parole_screen_saver_inhibit (player->priv->screen_saver, GTK_WINDOW (player->priv->window));
-	}
+        gboolean has_video;
+        
+        g_object_get (G_OBJECT (stream),
+                      "has-video", &has_video,
+                      NULL);
+                  
+        if ( has_video )
+        {
+            parole_screen_saver_inhibit (player->priv->screen_saver, GTK_WINDOW (player->priv->window));
+        }
     }
     else
-	parole_screen_saver_uninhibit (player->priv->screen_saver, GTK_WINDOW (player->priv->window));
+    parole_screen_saver_uninhibit (player->priv->screen_saver, GTK_WINDOW (player->priv->window));
 }
 
 static void
@@ -1606,32 +1625,32 @@ parole_player_media_state_cb (ParoleGst *gst, const ParoleStream *stream, Parole
     
     if ( state == PAROLE_STATE_PLAYING )
     {
-	parole_player_playing (player, stream);
-	parole_player_show_audiobox(player);
+        parole_player_playing (player, stream);
+        parole_player_show_audiobox(player);
     }
     else if ( state == PAROLE_STATE_PAUSED )
     {
-	parole_player_paused (player);
+        parole_player_paused (player);
     }
     else if ( state == PAROLE_STATE_STOPPED )
     {
-	parole_player_stopped (player);
+        parole_player_stopped (player);
     }
     /* PAROLE_STATE_ABOUT_TO_FINISH is used for continuous playback of audio CDs */
     else if ( state == PAROLE_STATE_ABOUT_TO_FINISH )
     {
 #ifdef DEBUG
-    TRACE ("***Playback about to finish***");
+        TRACE ("***Playback about to finish***");
 #endif
-    if ( player->priv->current_media_type == PAROLE_MEDIA_TYPE_DVD )
-        parole_player_play_next (player, TRUE);
+        if ( player->priv->current_media_type == PAROLE_MEDIA_TYPE_DVD )
+            parole_player_play_next (player, TRUE);
     }
     else if ( state == PAROLE_STATE_PLAYBACK_FINISHED )
     {
 #ifdef DEBUG
-    TRACE ("***Playback finished***");
+        TRACE ("***Playback finished***");
 #endif
-	parole_player_play_next (player, TRUE);
+        parole_player_play_next (player, TRUE);
     }
 }
 
@@ -1645,11 +1664,11 @@ void
 parole_player_play_pause_clicked (GtkButton *button, ParolePlayer *player)
 {
     if ( player->priv->state == PAROLE_STATE_PLAYING )
-	parole_gst_pause (PAROLE_GST (player->priv->gst));
+        parole_gst_pause (PAROLE_GST (player->priv->gst));
     else if ( player->priv->state == PAROLE_STATE_PAUSED )
-	parole_gst_resume (PAROLE_GST (player->priv->gst));
+        parole_gst_resume (PAROLE_GST (player->priv->gst));
     else
-	parole_player_play_selected_row (player);
+        parole_player_play_selected_row (player);
 }
 
 void
@@ -1660,31 +1679,27 @@ parole_player_stop_clicked (GtkButton *button, ParolePlayer *player)
 
 void parole_player_forward_cb (GtkButton *button, ParolePlayer *player)
 {
-	parole_player_play_next (player, TRUE);
+    parole_player_play_next (player, TRUE);
 }
-							 
+                             
 void parole_player_back_cb (GtkButton *button, ParolePlayer *player)
 {
-	parole_player_play_prev (player);
+    parole_player_play_prev (player);
 }
 
 void parole_player_seekf_cb (GtkWidget *widget, ParolePlayer *player, gdouble seek)
 {
-	seek =  parole_gst_get_stream_position (PAROLE_GST (player->priv->gst) )
-			+
-			seek;
-	parole_gst_seek (PAROLE_GST (player->priv->gst), seek);
-	parole_player_change_range_value (player, seek);
+    seek = parole_gst_get_stream_position (PAROLE_GST (player->priv->gst) ) + seek;
+    parole_gst_seek (PAROLE_GST (player->priv->gst), seek);
+    parole_player_change_range_value (player, seek);
 }
 
 void parole_player_seekb_cb (GtkWidget *widget, ParolePlayer *player, gdouble seek)
 {
-	seek =  parole_gst_get_stream_position (PAROLE_GST (player->priv->gst) )
-			-
-			seek;
-	if ( seek < 0 ) { seek = 0; }
-	parole_gst_seek (PAROLE_GST (player->priv->gst), seek);
-	parole_player_change_range_value (player, seek);
+    seek = parole_gst_get_stream_position (PAROLE_GST (player->priv->gst) ) - seek;
+    if ( seek < 0 ) { seek = 0; }
+    parole_gst_seek (PAROLE_GST (player->priv->gst), seek);
+    parole_player_change_range_value (player, seek);
 }
 
 gboolean
@@ -1714,11 +1729,11 @@ parole_player_range_value_changed (GtkRange *range, ParolePlayer *player)
     
     if ( !player->priv->internal_range_change )
     {
-	value = gtk_range_get_value (GTK_RANGE (range));
-	player->priv->user_seeking = TRUE;
-	TRACE ("Sending a seek request with value :%e", value);
-	parole_gst_seek (PAROLE_GST (player->priv->gst), value);
-	player->priv->user_seeking = FALSE;
+        value = gtk_range_get_value (GTK_RANGE (range));
+        player->priv->user_seeking = TRUE;
+        TRACE ("Sending a seek request with value :%e", value);
+        parole_gst_seek (PAROLE_GST (player->priv->gst), value);
+        player->priv->user_seeking = FALSE;
     }
 }
 
@@ -1741,89 +1756,88 @@ parole_player_media_tag_cb (ParoleGst *gst, const ParoleStream *stream, ParolePl
     
     if ( player->priv->row )
     {
-	g_object_get (G_OBJECT (stream),
-		      "title", &title,
-		      "album", &album,
-		      "artist", &artist,
-		      "year", &year,
-		      NULL);
-
-	if ( title )
-	{
-	    parole_media_list_set_row_name (player->priv->list, player->priv->row, title);
-	    gtk_window_set_title (GTK_WINDOW (player->priv->window), title);
-	    gtk_label_set_markup(GTK_LABEL(player->priv->audiobox_title), g_markup_printf_escaped("<span color='#F4F4F4'><b><big>%s</big></b></span>", title));
-	    g_free (title);
-	}
-	else
-	    gtk_label_set_markup(GTK_LABEL(player->priv->audiobox_title), g_strdup_printf("<span color='#F4F4F4'><b><big>%s</big></b></span>", _("Unknown Song")));
-
-	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));
-	    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);
-	}
-	
-	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")));
-	
-	if (year)
-	    g_free (year);
-
-	if ( artist )
-	{
-	    gtk_label_set_markup(GTK_LABEL(player->priv->audiobox_artist), g_markup_printf_escaped("<big><span color='#BBBBBB'><i>%s</i></span> <span color='#F4F4F4'>%s</span></big>", _("by"), artist));
-	    g_free (artist);
-	}
-	else
-	    gtk_label_set_markup(GTK_LABEL(player->priv->audiobox_artist), g_strdup_printf("<big><span color='#BBBBBB'><i>%s</i></span> <span color='#F4F4F4'>%s</span></big>", _("by"), _("Unknown Artist")));
-	
-	image = parole_stream_get_image(G_OBJECT(stream));
-	if (image)
-	{
-	    gtk_image_set_from_pixbuf(GTK_IMAGE(player->priv->audiobox_cover), image);
-	    g_object_unref(image);
-    }
-	else
-	gtk_image_set_from_icon_name(GTK_IMAGE(player->priv->audiobox_cover), "audio-x-generic-symbolic", GTK_ICON_SIZE_ARTWORK_FALLBACK);
+        g_object_get (G_OBJECT (stream),
+                      "title", &title,
+                      "album", &album,
+                      "artist", &artist,
+                      "year", &year,
+                      NULL);
+
+        if ( title )
+        {
+            parole_media_list_set_row_name (player->priv->list, player->priv->row, title);
+            gtk_window_set_title (GTK_WINDOW (player->priv->window), title);
+            gtk_label_set_markup(GTK_LABEL(player->priv->audiobox_title), g_markup_printf_escaped("<span color='#F4F4F4'><b><big>%s</big></b></span>", title));
+            g_free (title);
+        }
+        else
+            gtk_label_set_markup(GTK_LABEL(player->priv->audiobox_title), g_strdup_printf("<span color='#F4F4F4'><b><big>%s</big></b></span>", _("Unknown Song")));
+
+        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));
+            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);
+        }
+        
+        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")));
+        
+        if (year)
+            g_free (year);
+
+        if ( artist )
+        {
+            gtk_label_set_markup(GTK_LABEL(player->priv->audiobox_artist), g_markup_printf_escaped("<big><span color='#BBBBBB'><i>%s</i></span> <span color='#F4F4F4'>%s</span></big>", _("by"), artist));
+            g_free (artist);
+        }
+        else
+            gtk_label_set_markup(GTK_LABEL(player->priv->audiobox_artist), g_strdup_printf("<big><span color='#BBBBBB'><i>%s</i></span> <span color='#F4F4F4'>%s</span></big>", _("by"), _("Unknown Artist")));
+        
+        image = parole_stream_get_image(G_OBJECT(stream));
+        if (image)
+        {
+            gtk_image_set_from_pixbuf(GTK_IMAGE(player->priv->audiobox_cover), image);
+            g_object_unref(image);
+        }
+        else
+        gtk_image_set_from_icon_name(GTK_IMAGE(player->priv->audiobox_cover), "audio-x-generic-symbolic", GTK_ICON_SIZE_ARTWORK_FALLBACK);
     }
 }
 
 static void
 parole_player_buffering_cb (ParoleGst *gst, const ParoleStream *stream, gint percentage, ParolePlayer *player)
 {
-	gchar *buff;
+    gchar *buff;
 
     if ( percentage == 100 )
     {
-	player->priv->buffering = FALSE;
-	parole_gst_resume (PAROLE_GST (player->priv->gst));
-	gtk_widget_hide (player->priv->progressbar_buffering);
-    gtk_widget_show (player->priv->label_duration);
-    gtk_widget_show (player->priv->range);
-    gtk_widget_show (player->priv->label_elapsed);
+        player->priv->buffering = FALSE;
+        parole_gst_resume (PAROLE_GST (player->priv->gst));
+        gtk_widget_hide (player->priv->progressbar_buffering);
+        gtk_widget_show (player->priv->label_duration);
+        gtk_widget_show (player->priv->range);
+        gtk_widget_show (player->priv->label_elapsed);
     }
     else
     {
-	player->priv->buffering = TRUE;
-	
-	
-	if ( player->priv->state == PAROLE_STATE_PLAYING )
-	    parole_gst_pause (PAROLE_GST (player->priv->gst));
-	    
-    buff = g_strdup_printf ("%s (%d%%)", _("Buffering"), percentage);
-    
-    gtk_progress_bar_set_text (GTK_PROGRESS_BAR (player->priv->progressbar_buffering), buff);
-    gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (player->priv->progressbar_buffering), (gdouble) percentage/100);
-    gtk_widget_hide (player->priv->label_duration);
-    gtk_widget_hide (player->priv->range);
-    gtk_widget_hide (player->priv->label_elapsed);
-    gtk_widget_show (player->priv->progressbar_buffering);
-    g_free (buff);
+        player->priv->buffering = TRUE;
+        
+        if ( player->priv->state == PAROLE_STATE_PLAYING )
+            parole_gst_pause (PAROLE_GST (player->priv->gst));
+            
+        buff = g_strdup_printf ("%s (%d%%)", _("Buffering"), percentage);
+        
+        gtk_progress_bar_set_text (GTK_PROGRESS_BAR (player->priv->progressbar_buffering), buff);
+        gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (player->priv->progressbar_buffering), (gdouble) percentage/100);
+        gtk_widget_hide (player->priv->label_duration);
+        gtk_widget_hide (player->priv->range);
+        gtk_widget_hide (player->priv->label_elapsed);
+        gtk_widget_show (player->priv->progressbar_buffering);
+        g_free (buff);
     }
 }
 
@@ -1831,11 +1845,11 @@ static void
 parole_player_dvd_chapter_count_change_cb (ParoleGst *gst, gint chapter_count, ParolePlayer *player)
 {
     gtk_tree_row_reference_free (player->priv->row);
-	player->priv->row = NULL;
-	
-	/* FIXME Cannot clear list prior to adding new chapters. */
-	//parole_media_list_clear_list (player->priv->list);
-	
+    player->priv->row = NULL;
+    
+    /* FIXME Cannot clear list prior to adding new chapters. */
+    //parole_media_list_clear_list (player->priv->list);
+    
     parole_media_list_add_dvd_chapters (player->priv->list, chapter_count);
 }
 
@@ -1844,20 +1858,20 @@ parole_player_dvd_chapter_change_cb (ParoleGst *gst, gint chapter_count, ParoleP
 {
     GdkPixbuf *pix = NULL;
     
-	parole_media_list_set_row_pixbuf (player->priv->list, player->priv->row, NULL);
-	
+    parole_media_list_set_row_pixbuf (player->priv->list, player->priv->row, NULL);
+    
     player->priv->row = parole_media_list_get_row_n (player->priv->list, chapter_count-1);
 
     pix = parole_icon_load ("player_play", 16);
     
     if ( !pix )
-	pix = parole_icon_load ("gtk-media-play-ltr", 16);
+        pix = parole_icon_load ("gtk-media-play-ltr", 16);
     
     parole_media_list_set_row_pixbuf (player->priv->list, player->priv->row, pix);
     parole_media_list_select_row (player->priv->list, player->priv->row);
     
     if ( pix )
-	g_object_unref (pix);
+        g_object_unref (pix);
 }
 
 gboolean parole_player_delete_event_cb (GtkWidget *widget, GdkEvent *ev, ParolePlayer *player)
@@ -1891,17 +1905,17 @@ parole_player_move_fs_window (ParolePlayer *player)
     screen = gtk_window_get_screen (GTK_WINDOW (player->priv->fs_window));
     
     gdk_screen_get_monitor_geometry (screen,
-				     gdk_screen_get_monitor_at_window (screen, gtk_widget_get_window( GTK_WIDGET(player->priv->window))),
-				     &rect);
+            gdk_screen_get_monitor_at_window (screen, gtk_widget_get_window( GTK_WIDGET(player->priv->window))),
+            &rect);
     
     gtk_widget_get_allocation( GTK_WIDGET(player->priv->play_box), allocation );
     gtk_window_resize (GTK_WINDOW (player->priv->fs_window), 
-		       rect.width, 
-		       allocation->height);
+                       rect.width, 
+                       allocation->height);
     
     gtk_window_move (GTK_WINDOW (player->priv->fs_window),
-		     rect.x, 
-		     rect.height + rect.y - allocation->height);
+                     rect.x, 
+                     rect.height + rect.y - allocation->height);
 
     g_free(allocation);
 }
@@ -1996,7 +2010,7 @@ void
 parole_player_embedded (ParolePlayer *player)
 {
     if ( player->priv->embedded == TRUE )
-    return;
+        return;
     
     player->priv->embedded = TRUE;
     
@@ -2007,7 +2021,7 @@ void
 parole_player_full_screen (ParolePlayer *player, gboolean fullscreen)
 {
     if ( player->priv->full_screen == fullscreen )
-	return;
+        return;
     
     parole_player_reset_controls(player, fullscreen);
 }
@@ -2044,15 +2058,15 @@ parole_player_show_menu (ParolePlayer *player, guint button, guint activate_time
     icon = gtk_image_new_from_icon_name (player->priv->state == PAROLE_STATE_PLAYING ? "media-playback-pause-symbolic":"media-playback-start-symbolic", GTK_ICON_SIZE_MENU);
     gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM(mi), GTK_WIDGET(icon));
 
-					     
+                         
     g_object_get (G_OBJECT (player->priv->play_pause),
-		  "sensitive", &sensitive,
-		  NULL);
-		  
+                  "sensitive", &sensitive,
+                  NULL);
+          
     gtk_widget_set_sensitive (mi, sensitive);
     gtk_widget_show (mi);
     g_signal_connect_swapped (mi, "activate",
-			      G_CALLBACK (parole_player_play_menu_item_activate), player);
+                              G_CALLBACK (parole_player_play_menu_item_activate), player);
     gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
     
     /*
@@ -2064,7 +2078,7 @@ parole_player_show_menu (ParolePlayer *player, guint button, guint activate_time
     gtk_widget_set_sensitive (mi, (player->priv->state >= PAROLE_STATE_PAUSED));
     gtk_widget_show (mi);
     g_signal_connect (mi, "activate",
-		      G_CALLBACK (parole_player_forward_cb), player);
+                      G_CALLBACK (parole_player_forward_cb), player);
     gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
     
     /*
@@ -2076,7 +2090,7 @@ parole_player_show_menu (ParolePlayer *player, guint button, guint activate_time
     gtk_widget_set_sensitive (mi, (player->priv->state >= PAROLE_STATE_PAUSED));
     gtk_widget_show (mi);
     g_signal_connect (mi, "activate",
-		      G_CALLBACK (parole_player_back_cb), player);
+                      G_CALLBACK (parole_player_back_cb), player);
     gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
     
     /*
@@ -2087,17 +2101,16 @@ parole_player_show_menu (ParolePlayer *player, guint button, guint activate_time
     gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM(mi), GTK_WIDGET(icon));
     gtk_widget_show (mi);
     g_signal_connect_swapped (mi, "activate",
-			      G_CALLBACK (parole_player_full_screen_menu_item_activate), player);
+                              G_CALLBACK (parole_player_full_screen_menu_item_activate), player);
     gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
-    
 
     g_signal_connect_swapped (menu, "selection-done",
-			      G_CALLBACK (gtk_widget_destroy), menu);
+                              G_CALLBACK (gtk_widget_destroy), menu);
     
     gtk_menu_popup (GTK_MENU (menu), 
-		    NULL, NULL,
-		    NULL, NULL,
-		    button, activate_time);
+                    NULL, NULL,
+                    NULL, NULL,
+                    button, activate_time);
 }
 
 gboolean
@@ -2107,8 +2120,8 @@ parole_player_gst_widget_button_press (GtkWidget *widget, GdkEventButton *ev, Pa
 
     if ( ev->type == GDK_2BUTTON_PRESS )
     {
-	parole_player_full_screen_menu_item_activate (player);
-	ret_val = TRUE;
+        parole_player_full_screen_menu_item_activate (player);
+        ret_val = TRUE;
     }
 
     return ret_val;
@@ -2121,14 +2134,14 @@ parole_player_gst_widget_button_release (GtkWidget *widget, GdkEventButton *ev,
     
     if ( ev->button == 3 )
     {
-	parole_player_show_menu (player, ev->button, ev->time);
-	gtk_widget_grab_focus (widget);
-	ret_val = TRUE;
+        parole_player_show_menu (player, ev->button, ev->time);
+        gtk_widget_grab_focus (widget);
+        ret_val = TRUE;
     }
     else if ( ev->button == 1 )
     {
-	gtk_widget_grab_focus (widget);
-	ret_val = TRUE;
+        gtk_widget_grab_focus (widget);
+        ret_val = TRUE;
     }
     
     return ret_val;
@@ -2147,23 +2160,23 @@ static gboolean parole_player_hide_fs_window (gpointer data)
     
     if ( gtk_widget_get_visible (player->priv->fs_window) )
     {
-	/* Don't hide the popup if the pointer is above it*/
-	gtk_widget_get_allocation( GTK_WIDGET(player->priv->fs_window), allocation );
-	w = allocation->width;
-	h = allocation->height;
-	g_free(allocation);
-	
-    devmgr = gdk_display_get_device_manager(gtk_widget_get_display(GTK_WIDGET(player->priv->fs_window)));
-    dev = gdk_device_manager_get_client_pointer(devmgr);
-    gdk_window_get_device_position( gtk_widget_get_window(GTK_WIDGET(player->priv->fs_window)),
-                                    dev, &x, &y, NULL);
-	
-	if ((x >= 0) && (x <= w) && (y >= 0) && (y <= h))
-	    return TRUE;
-
-	gtk_widget_hide (player->priv->fs_window);
-	gdkwindow = gtk_widget_get_window (player->priv->window);
-	parole_window_invisible_cursor (gdkwindow);
+        /* Don't hide the popup if the pointer is above it*/
+        gtk_widget_get_allocation( GTK_WIDGET(player->priv->fs_window), allocation );
+        w = allocation->width;
+        h = allocation->height;
+        g_free(allocation);
+        
+        devmgr = gdk_display_get_device_manager(gtk_widget_get_display(GTK_WIDGET(player->priv->fs_window)));
+        dev = gdk_device_manager_get_client_pointer(devmgr);
+        gdk_window_get_device_position( gtk_widget_get_window(GTK_WIDGET(player->priv->fs_window)),
+                                        dev, &x, &y, NULL);
+        
+        if ((x >= 0) && (x <= w) && (y >= 0) && (y <= h))
+            return TRUE;
+
+        gtk_widget_hide (player->priv->fs_window);
+        gdkwindow = gtk_widget_get_window (player->priv->window);
+        parole_window_invisible_cursor (gdkwindow);
     }
 
     return FALSE;
@@ -2177,21 +2190,21 @@ parole_player_gst_widget_motion_notify_event (GtkWidget *widget, GdkEventMotion
     
     if ( player->priv->full_screen )
     {
-	gtk_widget_show_all (player->priv->fs_window);
-	gdkwindow = gtk_widget_get_window (player->priv->window);
-	gdk_window_set_cursor (gdkwindow, NULL);
-	if ( hide_timeout != 0 )
-	{
-	    g_source_remove (hide_timeout);
-	    hide_timeout = 0;
-	}
-	    
-	hide_timeout = g_timeout_add_seconds (4, (GSourceFunc) parole_player_hide_fs_window, player);
+        gtk_widget_show_all (player->priv->fs_window);
+        gdkwindow = gtk_widget_get_window (player->priv->window);
+        gdk_window_set_cursor (gdkwindow, NULL);
+        if ( hide_timeout != 0 )
+        {
+            g_source_remove (hide_timeout);
+            hide_timeout = 0;
+        }
+            
+        hide_timeout = g_timeout_add_seconds (4, (GSourceFunc) parole_player_hide_fs_window, player);
     }
     else if ( hide_timeout != 0)
     {
-	g_source_remove (hide_timeout);
-	hide_timeout = 0;
+        g_source_remove (hide_timeout);
+        hide_timeout = 0;
     }
     
     return FALSE;
@@ -2219,10 +2232,10 @@ void
 parole_player_media_menu_select_cb (GtkMenuItem *widget, ParolePlayer *player)
 {
     gtk_widget_set_sensitive (player->priv->save_playlist, 
-				  !parole_media_list_is_empty (player->priv->list));    
+                  !parole_media_list_is_empty (player->priv->list));    
 }
 
-void parole_player_open_preferences_cb	(GtkWidget *widget, ParolePlayer *player)
+void parole_player_open_preferences_cb  (GtkWidget *widget, ParolePlayer *player)
 {
     ParoleConfDialog *dialog;
     
@@ -2245,10 +2258,10 @@ void parole_player_shuffle_toggled_cb (GtkWidget *widget, ParolePlayer *player)
     toggled = gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget));
     
     g_object_set (G_OBJECT (player->priv->conf),
-		  "shuffle", toggled,
-		  NULL);
-		  
-	parole_media_list_set_shuffle_toggled(player->priv->list, toggled);
+                  "shuffle", toggled,
+                  NULL);
+          
+    parole_media_list_set_shuffle_toggled(player->priv->list, toggled);
 }
 
 void parole_player_repeat_toggled_cb (GtkWidget *widget, ParolePlayer *player)
@@ -2258,18 +2271,18 @@ void parole_player_repeat_toggled_cb (GtkWidget *widget, ParolePlayer *player)
     toggled = gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget));
     
     g_object_set (G_OBJECT (player->priv->conf),
-		  "repeat", toggled,
-		  NULL);
-		  
-	parole_media_list_set_repeat_toggled(player->priv->list, toggled);
+                  "repeat", toggled,
+                  NULL);
+          
+    parole_media_list_set_repeat_toggled(player->priv->list, toggled);
 }
 
 static void
 parole_property_notify_cb_volume (ParoleGst *gst, GParamSpec *spec, ParolePlayer *player)
 {
-	gdouble volume;
-	volume = parole_gst_get_volume (PAROLE_GST (player->priv->gst));
-	gtk_scale_button_set_value (GTK_SCALE_BUTTON (player->priv->volume), volume);
+    gdouble volume;
+    volume = parole_gst_get_volume (PAROLE_GST (player->priv->gst));
+    gtk_scale_button_set_value (GTK_SCALE_BUTTON (player->priv->volume), volume);
 }
 
 static void
@@ -2285,13 +2298,13 @@ parole_player_volume_scroll_event_cb (GtkWidget *widget, GdkEventScroll *ev, Par
 
     if ( ev->direction == GDK_SCROLL_UP )
     {
-	parole_player_volume_up (NULL, player);
-	ret_val = TRUE;
+        parole_player_volume_up (NULL, player);
+        ret_val = TRUE;
     }
     else if ( ev->direction == GDK_SCROLL_DOWN )
     {
-	parole_player_volume_down (NULL, player);
-	ret_val = TRUE;
+        parole_player_volume_down (NULL, player);
+        ret_val = TRUE;
     }
 
     return ret_val;
@@ -2302,9 +2315,9 @@ parole_player_volume_value_changed_cb (GtkScaleButton *widget, gdouble value, Pa
 {
     parole_player_change_volume (player, value);
     if ( value > 0.0 )
-    g_object_set (G_OBJECT (player->priv->conf),
-        "volume", (gint)(value * 100),
-        NULL);
+        g_object_set (G_OBJECT (player->priv->conf),
+                      "volume", (gint)(value * 100),
+                      NULL);
 }
 
 void
@@ -2329,8 +2342,8 @@ void parole_player_volume_mute (GtkWidget *widget, ParolePlayer *player)
     if (gtk_scale_button_get_value (GTK_SCALE_BUTTON (player->priv->volume)) == 0.0)
     {
         g_object_get (G_OBJECT (player->priv->conf),
-        "volume", &value,
-        NULL);
+                      "volume", &value,
+                      NULL);
         gtk_menu_item_set_label( GTK_MENU_ITEM(widget), _("Mute") );
     }
     else
@@ -2345,7 +2358,7 @@ static void
 parole_player_screen_size_change_changed_cb (GdkScreen *screen, ParolePlayer *player)
 {
     if ( player->priv->full_screen )
-	parole_player_move_fs_window (player);
+        parole_player_move_fs_window (player);
 }
 
 static void
@@ -2372,13 +2385,13 @@ parole_player_finalize (GObject *object)
     g_object_unref (player->priv->screen_saver);
 
     if ( player->priv->client_id )
-	g_free (player->priv->client_id);
-	
+        g_free (player->priv->client_id);
+    
     g_object_unref (player->priv->sm_client);
 
 #ifdef HAVE_XF86_KEYSYM
     if (player->priv->button)
-    g_object_unref (player->priv->button);
+        g_object_unref (player->priv->button);
 #endif
 
     gtk_widget_destroy (player->priv->fs_window);
@@ -2388,40 +2401,40 @@ parole_player_finalize (GObject *object)
 }
 
 static void parole_player_set_property (GObject *object,
-				        guint prop_id,
-				        const GValue *value,
-				        GParamSpec *pspec)
+                        guint prop_id,
+                        const GValue *value,
+                        GParamSpec *pspec)
 {
     ParolePlayer *player;
     player = PAROLE_PLAYER (object);
 
     switch (prop_id)
     {
-	case PROP_CLIENT_ID:
-	    player->priv->client_id = g_value_dup_string (value);
-	    break;
-	default:
-	    G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-	    break;
+        case PROP_CLIENT_ID:
+            player->priv->client_id = g_value_dup_string (value);
+            break;
+        default:
+            G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+            break;
     }
 }
 
 static void parole_player_get_property (GObject *object,
-				        guint prop_id,
-				        GValue *value,
-				        GParamSpec *pspec)
+                        guint prop_id,
+                        GValue *value,
+                        GParamSpec *pspec)
 {
     ParolePlayer *player;
     player = PAROLE_PLAYER (object);
 
     switch (prop_id)
     {
-	case PROP_CLIENT_ID:
-	    g_value_set_string (value, player->priv->client_id);
-	    break;
-	default:
-	    G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-	    break;
+        case PROP_CLIENT_ID:
+            g_value_set_string (value, player->priv->client_id);
+            break;
+        default:
+            G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+            break;
     }
 }
 
@@ -2445,17 +2458,17 @@ parole_player_constructed (GObject *object)
 
     current_dir = g_get_current_dir ();
     
-    player->priv->sm_client = xfce_sm_client_get_full (XFCE_SM_CLIENT_RESTART_NORMAL,
-						       XFCE_SM_CLIENT_PRIORITY_DEFAULT,
-						       player->priv->client_id,
-						       current_dir,
-						       restart_command,
-						       DESKTOPDIR "/" PACKAGE_NAME ".desktop");
-				      
+    player->priv->sm_client =   xfce_sm_client_get_full (XFCE_SM_CLIENT_RESTART_NORMAL,
+                                XFCE_SM_CLIENT_PRIORITY_DEFAULT,
+                                player->priv->client_id,
+                                current_dir,
+                                restart_command,
+                                DESKTOPDIR "/" PACKAGE_NAME ".desktop");
+                      
     if ( xfce_sm_client_connect (player->priv->sm_client, NULL ) )
     {
-	g_signal_connect_swapped (player->priv->sm_client, "quit-requested",
-				  G_CALLBACK (parole_player_sm_quit_requested_cb), player);
+        g_signal_connect_swapped (player->priv->sm_client, "quit-requested",
+                      G_CALLBACK (parole_player_sm_quit_requested_cb), player);
     }
     
     g_free (current_dir);
@@ -2479,12 +2492,12 @@ parole_player_class_init (ParolePlayerClass *klass)
      * Since: 0.2.2
      **/
     g_object_class_install_property (object_class,
-				     PROP_CLIENT_ID,
-				     g_param_spec_string ("client-id",
-							  NULL, 
-							  NULL,
-							  NULL,
-							  G_PARAM_READWRITE|G_PARAM_CONSTRUCT_ONLY));
+                     PROP_CLIENT_ID,
+                     g_param_spec_string ("client-id",
+                              NULL, 
+                              NULL,
+                              NULL,
+                              G_PARAM_READWRITE|G_PARAM_CONSTRUCT_ONLY));
 
     g_type_class_add_private (klass, sizeof (ParolePlayerPrivate));
     
@@ -2520,78 +2533,78 @@ parole_player_handle_key_press (GdkEventKey *ev, ParolePlayer *player)
     
     if ( focused )
     {
-	if ( gtk_widget_is_ancestor (focused, player->priv->playlist_nt) ) 
-	{
-	    return FALSE;
-	}
+        if ( gtk_widget_is_ancestor (focused, player->priv->playlist_nt) ) 
+        {
+            return FALSE;
+        }
     }
     
     switch (ev->keyval)
     {
-	case GDK_KEY_f:
-	case GDK_KEY_F:
-            if ( player->priv->embedded != TRUE ) parole_player_full_screen_menu_item_activate (player);
-	    ret_val = TRUE;
-	    break;
-	case GDK_KEY_space:
-	case GDK_KEY_p:
-	case GDK_KEY_P:
-	    parole_player_play_pause_clicked (NULL, player);
-	    ret_val = TRUE;
-	    break;
-    case GDK_KEY_Right:
-	    /* Media seekable ?*/
-	    if ( gtk_widget_get_sensitive (player->priv->range) )
-	    {
-		if (ev->state & GDK_CONTROL_MASK) parole_player_seekf_cb (NULL, player, seek_medium);
-		else parole_player_seekf_cb (NULL, player, seek_short);
-	    }
-	    ret_val = TRUE;
-	    break;
-	case GDK_KEY_Left:
-	    if ( gtk_widget_get_sensitive (player->priv->range) )
-	    {
-		if (ev->state & GDK_CONTROL_MASK) parole_player_seekb_cb (NULL, player, seek_medium);
-		else parole_player_seekb_cb (NULL, player, seek_short);
-	    }
-	    ret_val = TRUE;
-	    break;
-	case GDK_KEY_Page_Down:
-	    if ( gtk_widget_get_sensitive (player->priv->range) )
-		parole_player_seekb_cb (NULL, player, seek_long);
-	    ret_val = TRUE;
-	    break;
-	case GDK_KEY_Page_Up:
-	    if ( gtk_widget_get_sensitive (player->priv->range) )
-		parole_player_seekf_cb (NULL, player, seek_long);
-	    ret_val = TRUE;
-	    break;
-	case GDK_KEY_s:
-	case GDK_KEY_S:
-	    parole_player_stop_clicked (NULL, player);
-	    ret_val = TRUE;
-	    break;
-	case GDK_KEY_Escape:
-	    parole_player_full_screen (player, FALSE);
-	    break;
+        case GDK_KEY_f:
+        case GDK_KEY_F:
+                if ( player->priv->embedded != TRUE ) parole_player_full_screen_menu_item_activate (player);
+            ret_val = TRUE;
+            break;
+        case GDK_KEY_space:
+        case GDK_KEY_p:
+        case GDK_KEY_P:
+            parole_player_play_pause_clicked (NULL, player);
+            ret_val = TRUE;
+            break;
+        case GDK_KEY_Right:
+            /* Media seekable ?*/
+            if ( gtk_widget_get_sensitive (player->priv->range) )
+            {
+            if (ev->state & GDK_CONTROL_MASK) parole_player_seekf_cb (NULL, player, seek_medium);
+            else parole_player_seekf_cb (NULL, player, seek_short);
+            }
+            ret_val = TRUE;
+            break;
+        case GDK_KEY_Left:
+            if ( gtk_widget_get_sensitive (player->priv->range) )
+            {
+            if (ev->state & GDK_CONTROL_MASK) parole_player_seekb_cb (NULL, player, seek_medium);
+            else parole_player_seekb_cb (NULL, player, seek_short);
+            }
+            ret_val = TRUE;
+            break;
+        case GDK_KEY_Page_Down:
+            if ( gtk_widget_get_sensitive (player->priv->range) )
+            parole_player_seekb_cb (NULL, player, seek_long);
+            ret_val = TRUE;
+            break;
+        case GDK_KEY_Page_Up:
+            if ( gtk_widget_get_sensitive (player->priv->range) )
+            parole_player_seekf_cb (NULL, player, seek_long);
+            ret_val = TRUE;
+            break;
+        case GDK_KEY_s:
+        case GDK_KEY_S:
+            parole_player_stop_clicked (NULL, player);
+            ret_val = TRUE;
+            break;
+        case GDK_KEY_Escape:
+            parole_player_full_screen (player, FALSE);
+            break;
 #ifdef HAVE_XF86_KEYSYM
-	case XF86XK_OpenURL:
-	    parole_player_full_screen (player, FALSE);
-	    parole_media_list_open_location (player->priv->list);
-	    break;
+        case XF86XK_OpenURL:
+            parole_player_full_screen (player, FALSE);
+            parole_media_list_open_location (player->priv->list);
+            break;
 #endif
-	break;
-	/* 
-	 * Pass these to the media list and tell it to
-	 * grab the focus
-	 */
-	case GDK_KEY_Up:
-	case GDK_KEY_Down:
-	    if (!player->priv->full_screen && gtk_widget_get_visible(player->priv->playlist_nt))
-	        parole_media_list_grab_focus (player->priv->list);
-	    break;
-	default:
-	    break;
+        break;
+        /* 
+         * Pass these to the media list and tell it to
+         * grab the focus
+         */
+        case GDK_KEY_Up:
+        case GDK_KEY_Down:
+            if (!player->priv->full_screen && gtk_widget_get_visible(player->priv->playlist_nt))
+                parole_media_list_grab_focus (player->priv->list);
+            break;
+        default:
+            break;
     }
     
     return ret_val;
@@ -2600,42 +2613,36 @@ parole_player_handle_key_press (GdkEventKey *ev, ParolePlayer *player)
 gboolean
 parole_player_key_press (GtkWidget *widget, GdkEventKey *ev, ParolePlayer *player)
 {
-/*
-    gchar *key;
-    key = gdk_keyval_name (ev->keyval);
-    g_print ("Key Press 0x%X:%s on widget=%s\n", ev->keyval, key, gtk_widget_get_name (widget));
-*/
-
     switch (ev->keyval)
     {
-	case GDK_KEY_F11:
-            if ( player->priv->embedded != TRUE ) parole_player_full_screen_menu_item_activate (player);
-	    return TRUE;
+        case GDK_KEY_F11:
+                if ( player->priv->embedded != TRUE ) parole_player_full_screen_menu_item_activate (player);
+            return TRUE;
 #ifdef HAVE_XF86_KEYSYM
-	case XF86XK_AudioPlay:
-	    parole_player_play_pause_clicked (NULL, player);
-	    return TRUE;
-	case XF86XK_AudioStop:
-	    parole_player_stop_clicked (NULL, player);
-	    return TRUE;
-	case XF86XK_AudioRaiseVolume:
-	    parole_player_volume_up (NULL, player);
-	    return TRUE;
-	case XF86XK_AudioLowerVolume:
-	    parole_player_volume_down (NULL, player);
-	    return TRUE;
-	case XF86XK_AudioMute:
-	    parole_player_volume_mute (NULL, player);
-	    return TRUE;
-	case XF86XK_AudioPrev:
-		parole_player_play_prev (player);
-	    return TRUE;
-	case XF86XK_AudioNext:
-		parole_player_play_next (player, TRUE);
-	    return TRUE;
+        case XF86XK_AudioPlay:
+            parole_player_play_pause_clicked (NULL, player);
+            return TRUE;
+        case XF86XK_AudioStop:
+            parole_player_stop_clicked (NULL, player);
+            return TRUE;
+        case XF86XK_AudioRaiseVolume:
+            parole_player_volume_up (NULL, player);
+            return TRUE;
+        case XF86XK_AudioLowerVolume:
+            parole_player_volume_down (NULL, player);
+            return TRUE;
+        case XF86XK_AudioMute:
+            parole_player_volume_mute (NULL, player);
+            return TRUE;
+        case XF86XK_AudioPrev:
+            parole_player_play_prev (player);
+            return TRUE;
+        case XF86XK_AudioNext:
+            parole_player_play_next (player, TRUE);
+            return TRUE;
 #endif /* HAVE_XF86_KEYSYM */
-	default:
-	    break;
+        default:
+            break;
     }
     
     return parole_player_handle_key_press (ev, player);
@@ -2649,20 +2656,20 @@ parole_player_button_pressed_cb (ParoleButton *button, ParoleButtonKey key, Paro
     
     switch (key)
     {
-	case PAROLE_KEY_AUDIO_PLAY:
-	    parole_player_play_pause_clicked (NULL, player);
-	    break;
-	case PAROLE_KEY_AUDIO_STOP:
-	    parole_player_stop_clicked (NULL, player);
-	    break;
-	case PAROLE_KEY_AUDIO_PREV:
-		parole_player_play_prev (player);
-	    break;
-	case PAROLE_KEY_AUDIO_NEXT:
-		parole_player_play_next (player, TRUE);
-	    break;
-	default:
-	    break;
+        case PAROLE_KEY_AUDIO_PLAY:
+            parole_player_play_pause_clicked (NULL, player);
+            break;
+        case PAROLE_KEY_AUDIO_STOP:
+            parole_player_stop_clicked (NULL, player);
+            break;
+        case PAROLE_KEY_AUDIO_PREV:
+            parole_player_play_prev (player);
+            break;
+        case PAROLE_KEY_AUDIO_NEXT:
+            parole_player_play_next (player, TRUE);
+            break;
+        default:
+            break;
     }
 }
 #endif
@@ -2674,36 +2681,35 @@ parole_gst_set_default_aspect_ratio (ParolePlayer *player, GtkBuilder *builder)
     const gchar *widget_name;
     
     g_object_get (G_OBJECT (player->priv->conf),
-		  "aspect-ratio", &ratio,
-		  NULL);
-		  
+                  "aspect-ratio", &ratio,
+                  NULL);
+          
     switch (ratio )
     {
-	case PAROLE_ASPECT_RATIO_NONE:
-	    widget_name = "ratio_none";
-	    break;
-	case PAROLE_ASPECT_RATIO_AUTO:
-	    widget_name = "ratio_auto";
-	    break;
-	case PAROLE_ASPECT_RATIO_SQUARE:
-	    widget_name = "ratio_square";
-	    break;
-	case PAROLE_ASPECT_RATIO_16_9:
-	    widget_name = "ratio_16_9";
-	    break;
-	case PAROLE_ASPECT_RATIO_4_3:
-	    widget_name = "ratio_4_3";
-	    break;
-	case PAROLE_ASPECT_RATIO_DVB:
-	    widget_name = "ratio_20_9";
-	    break;
-	default:
-	    g_warn_if_reached ();
-	    return;
-    }
-	
-    gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, widget_name)), 
-				    TRUE);
+        case PAROLE_ASPECT_RATIO_NONE:
+            widget_name = "ratio_none";
+            break;
+        case PAROLE_ASPECT_RATIO_AUTO:
+            widget_name = "ratio_auto";
+            break;
+        case PAROLE_ASPECT_RATIO_SQUARE:
+            widget_name = "ratio_square";
+            break;
+        case PAROLE_ASPECT_RATIO_16_9:
+            widget_name = "ratio_16_9";
+            break;
+        case PAROLE_ASPECT_RATIO_4_3:
+            widget_name = "ratio_4_3";
+            break;
+        case PAROLE_ASPECT_RATIO_DVB:
+            widget_name = "ratio_20_9";
+            break;
+        default:
+            g_warn_if_reached ();
+            return;
+    }
+    
+    gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, widget_name)), TRUE);
 }
 
 static void
@@ -2712,8 +2718,13 @@ on_bug_report_clicked (GtkWidget *w, ParolePlayer *player)
     GtkWidget *dialog;
     if (!gtk_show_uri(NULL, "https://bugzilla.xfce.org/buglist.cgi?product=parole", GDK_CURRENT_TIME, NULL))
     {
-        dialog = gtk_message_dialog_new(GTK_WINDOW(player->priv->window), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _("Unable to open default web browser"));
-        gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), _("Please go to https://bugzilla.xfce.org/buglist.cgi?product=parole to report your bug."));
+        dialog = gtk_message_dialog_new(GTK_WINDOW(player->priv->window), 
+                                        GTK_DIALOG_DESTROY_WITH_PARENT, 
+                                        GTK_MESSAGE_ERROR, 
+                                        GTK_BUTTONS_CLOSE, 
+                                        _("Unable to open default web browser"));
+        gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), 
+                _("Please go to https://bugzilla.xfce.org/buglist.cgi?product=parole to report your bug."));
         gtk_dialog_run(GTK_DIALOG(dialog));
         gtk_widget_destroy(dialog);
     }
@@ -2764,10 +2775,9 @@ on_content_area_size_allocate (GtkWidget *widget, GtkAllocation *allocation, Par
     gtk_widget_set_allocation(widget, allocation);
 
     if ( gtk_widget_get_realized (widget) )
-    {	
-	
-	gtk_widget_queue_draw (widget);
-	}
+    {   
+        gtk_widget_queue_draw (widget);
+    }
 }
 
 gboolean
@@ -2777,11 +2787,11 @@ parole_player_configure_event_cb (GtkWidget *widget, GdkEventConfigure *ev, Paro
     
     if ( !player->priv->full_screen )
     {
-	gtk_window_get_size (GTK_WINDOW (widget), &w, &h);
-	g_object_set (G_OBJECT (player->priv->conf),
-		      "window-width", w,
-		      "window-height", h,
-		      NULL);
+        gtk_window_get_size (GTK_WINDOW (widget), &w, &h);
+        g_object_set (G_OBJECT (player->priv->conf),
+                      "window-width", w,
+                      "window-height", h,
+                      NULL);
     }
     
     return FALSE;
@@ -2789,13 +2799,13 @@ parole_player_configure_event_cb (GtkWidget *widget, GdkEventConfigure *ev, Paro
 
 static void
 parole_player_drag_data_received_cb (GtkWidget *widget,
-				     GdkDragContext *drag_context,
-				     gint x,
-				     gint y,
-				     GtkSelectionData *data,
-				     guint info,
-				     guint drag_time,
-				     ParolePlayer *player)
+                                     GdkDragContext *drag_context,
+                                     gint x,
+                                     gint y,
+                                     GtkSelectionData *data,
+                                     guint info,
+                                     guint drag_time,
+                                     ParolePlayer *player)
 {
     
     gchar **uri_list;
@@ -2807,11 +2817,11 @@ parole_player_drag_data_received_cb (GtkWidget *widget,
     uri_list = g_uri_list_extract_uris ((const gchar *)gtk_selection_data_get_data(data));
     for ( i = 0; uri_list[i] != NULL; i++)
     {
-	gchar *path;
-	path = g_filename_from_uri (uri_list[i], NULL, NULL);
-	added += parole_media_list_add_by_path (player->priv->list, path, i == 0 ? TRUE : FALSE);
+        gchar *path;
+        path = g_filename_from_uri (uri_list[i], NULL, NULL);
+        added += parole_media_list_add_by_path (player->priv->list, path, i == 0 ? TRUE : FALSE);
 
-	g_free (path);
+        g_free (path);
     }
     
     g_strfreev (uri_list);
@@ -2824,16 +2834,16 @@ static void
 parole_player_window_notify_is_active (ParolePlayer *player)
 {
     if ( !player->priv->full_screen )
-	return;
-	
+        return;
+    
     if (!gtk_window_is_active (GTK_WINDOW (player->priv->window)) )
     {
-	gtk_widget_hide (player->priv->fs_window);
-	parole_gst_set_cursor_visible (PAROLE_GST (player->priv->gst), TRUE);
+        gtk_widget_hide (player->priv->fs_window);
+        parole_gst_set_cursor_visible (PAROLE_GST (player->priv->gst), TRUE);
     } 
     else 
     {
-	parole_gst_set_cursor_visible (PAROLE_GST (player->priv->gst), FALSE);
+        parole_gst_set_cursor_visible (PAROLE_GST (player->priv->gst), FALSE);
     }
 } 
 
@@ -2864,15 +2874,15 @@ parole_player_set_wm_opacity_hint (GtkWidget *widget)
     atom = XInternAtom (xdisplay, "_NET_WM_WINDOW_OPACITY_LOCKED", TRUE);
     
     if ( atom == None )
-	return;
+        return;
     
     gdkwindow = gtk_widget_get_window (widget);
     
     XChangeProperty (xdisplay, gdk_x11_window_get_xid (gdkwindow),
-		     atom, XA_CARDINAL,
-		     32, PropModeAppend,
-		     (guchar *) &mode, 
-		     1);
+                     atom, XA_CARDINAL,
+                     32, PropModeAppend,
+                     (guchar *) &mode, 
+                     1);
 }
 
 static void
@@ -2880,15 +2890,15 @@ parole_player_setup_multimedia_keys (ParolePlayer *player)
 {
     #ifdef HAVE_XF86_KEYSYM
     gboolean enabled;
-    g_object_get (G_OBJECT (player->priv->conf),
-			"multimedia-keys", &enabled,
-			NULL);
+    g_object_get   (G_OBJECT (player->priv->conf),
+                    "multimedia-keys", &enabled,
+                    NULL);
 
     if ( enabled )
     {
-	player->priv->button = parole_button_new ();
-	g_signal_connect (player->priv->button, "button-pressed",
-	G_CALLBACK (parole_player_button_pressed_cb), player);
+        player->priv->button = parole_button_new ();
+        g_signal_connect (player->priv->button, "button-pressed",
+        G_CALLBACK (parole_player_button_pressed_cb), player);
     }
     #endif
 }
@@ -2941,17 +2951,17 @@ parole_player_init (ParolePlayer *player)
     player->priv->conf = parole_conf_new ();
     
     g_signal_connect_swapped (player->priv->conf, "notify::reset-saver",
-			      G_CALLBACK (parole_player_reset_saver_changed_cb), player);
+            G_CALLBACK (parole_player_reset_saver_changed_cb), player);
      
     player->priv->gst = parole_gst_new (player->priv->conf);
 
     player->priv->disc = parole_disc_new ();
     g_signal_connect (player->priv->disc, "disc-selected",
-		      G_CALLBACK (parole_player_disc_selected_cb), player);
-		      
+            G_CALLBACK (parole_player_disc_selected_cb), player);
+              
     g_signal_connect (player->priv->disc, "label-changed",
-		      G_CALLBACK (parole_player_disc_label_changed_cb), player);
-	    
+            G_CALLBACK (parole_player_disc_label_changed_cb), player);
+        
     player->priv->screen_saver = parole_screen_saver_new ();
     player->priv->list = PAROLE_MEDIA_LIST (parole_media_list_get ());
     
@@ -2970,46 +2980,46 @@ parole_player_init (ParolePlayer *player)
      * Gst signals
      */
     g_signal_connect (G_OBJECT (player->priv->gst), "media-state",
-		      G_CALLBACK (parole_player_media_state_cb), player);
-	
+            G_CALLBACK (parole_player_media_state_cb), player);
+    
     g_signal_connect (G_OBJECT (player->priv->gst), "media-progressed",
-		      G_CALLBACK (parole_player_media_progressed_cb), player);
-		      
+            G_CALLBACK (parole_player_media_progressed_cb), player);
+              
     g_signal_connect (G_OBJECT (player->priv->gst), "media-tag",
-		      G_CALLBACK (parole_player_media_tag_cb), player);
+            G_CALLBACK (parole_player_media_tag_cb), player);
     
     g_signal_connect (G_OBJECT (player->priv->gst), "error",
-		      G_CALLBACK (parole_player_error_cb), player);
+            G_CALLBACK (parole_player_error_cb), player);
    
     g_signal_connect (G_OBJECT (player->priv->gst), "buffering",
-		      G_CALLBACK (parole_player_buffering_cb), player);
-		      
+            G_CALLBACK (parole_player_buffering_cb), player);
+              
     g_signal_connect (G_OBJECT (player->priv->gst), "dvd-chapter-count-change",
-              G_CALLBACK (parole_player_dvd_chapter_count_change_cb), player);
+            G_CALLBACK (parole_player_dvd_chapter_count_change_cb), player);
               
     g_signal_connect (G_OBJECT (player->priv->gst), "dvd-chapter-change",
-              G_CALLBACK (parole_player_dvd_chapter_change_cb), player);
+            G_CALLBACK (parole_player_dvd_chapter_change_cb), player);
     
     g_signal_connect_after (G_OBJECT (player->priv->gst), "button-release-event",
-			    G_CALLBACK (parole_player_gst_widget_button_release), player);
+            G_CALLBACK (parole_player_gst_widget_button_release), player);
     
     g_signal_connect_after (G_OBJECT (player->priv->gst), "button-press-event",
-			    G_CALLBACK (parole_player_gst_widget_button_press), player);
+            G_CALLBACK (parole_player_gst_widget_button_press), player);
     
     g_signal_connect (G_OBJECT (player->priv->gst), "motion-notify-event",
-		      G_CALLBACK (parole_player_gst_widget_motion_notify_event), player);
+            G_CALLBACK (parole_player_gst_widget_motion_notify_event), player);
     
     g_signal_connect (G_OBJECT (player->priv->gst), "notify::volume",
-			G_CALLBACK (parole_property_notify_cb_volume), player);
+            G_CALLBACK (parole_property_notify_cb_volume), player);
 
     output = GTK_WIDGET (gtk_builder_get_object (builder, "video_output"));
     
-    gtk_drag_dest_set (output, GTK_DEST_DEFAULT_ALL, 
-		       target_entry, G_N_ELEMENTS (target_entry),
-                       GDK_ACTION_COPY | GDK_ACTION_MOVE);
-		       
+    gtk_drag_dest_set  (output, GTK_DEST_DEFAULT_ALL, 
+                        target_entry, G_N_ELEMENTS (target_entry),
+                        GDK_ACTION_COPY | GDK_ACTION_MOVE);
+               
     g_signal_connect (output, "drag-data-received",
-		      G_CALLBACK (parole_player_drag_data_received_cb), player);
+            G_CALLBACK (parole_player_drag_data_received_cb), player);
     
     /*
      * GTK Widgets
@@ -3038,7 +3048,7 @@ parole_player_init (ParolePlayer *player)
                         G_CALLBACK(parole_player_save_playlist_cb), 
                         PAROLE_PLAYER(player) );
     g_signal_connect (gtk_builder_get_object (builder, "media-menu"), "select",
-	              G_CALLBACK (parole_player_media_menu_select_cb), player);
+                  G_CALLBACK (parole_player_media_menu_select_cb), player);
     
     /* Recent Menu */
     recent_menu = GTK_WIDGET (gtk_builder_get_object (builder, "recent_menu"));
@@ -3104,7 +3114,7 @@ parole_player_init (ParolePlayer *player)
     gtk_widget_add_events (GTK_WIDGET (player->priv->eventbox_output), GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK);
     g_signal_connect (G_OBJECT (player->priv->eventbox_output), "motion-notify-event",
             G_CALLBACK (parole_player_gst_widget_motion_notify_event), player);
-		      
+              
     /* Background Image */
     player->priv->logo = gdk_pixbuf_new_from_file (g_strdup_printf ("%s/parole.png", PIXMAPS_DIR), NULL);
     player->priv->logo_image = GTK_WIDGET (gtk_builder_get_object (builder, "logo"));
@@ -3163,16 +3173,16 @@ parole_player_init (ParolePlayer *player)
     player->priv->hbox_infobar = GTK_WIDGET (gtk_builder_get_object (builder, "infobar_placeholder"));
     
     /* Initialize the InfoBar */
-	player->priv->infobar = gtk_info_bar_new ();
-	gtk_info_bar_set_message_type (GTK_INFO_BAR (player->priv->infobar),
+    player->priv->infobar = gtk_info_bar_new ();
+    gtk_info_bar_set_message_type (GTK_INFO_BAR (player->priv->infobar),
                             GTK_MESSAGE_QUESTION);
                             
     gtk_widget_set_no_show_all (player->priv->infobar, TRUE);
 
-	content_area = gtk_info_bar_get_content_area (GTK_INFO_BAR (player->priv->infobar));
-	g_signal_connect (content_area, "size-allocate",
-		      G_CALLBACK (on_content_area_size_allocate), player);
-		      
+    content_area = gtk_info_bar_get_content_area (GTK_INFO_BAR (player->priv->infobar));
+    g_signal_connect (content_area, "size-allocate",
+              G_CALLBACK (on_content_area_size_allocate), player);
+              
     gtk_box_pack_start( GTK_BOX( player->priv->hbox_infobar ), player->priv->infobar, TRUE, TRUE, 0);
     
     /* Initialize the Audio Track combobox */
@@ -3181,66 +3191,66 @@ parole_player_init (ParolePlayer *player)
     player->priv->audio_list = NULL;
     
     cell = gtk_cell_renderer_text_new();
-	gtk_cell_layout_pack_start( GTK_CELL_LAYOUT( player->priv->combobox_audiotrack ), cell, TRUE );
-	gtk_cell_layout_set_attributes( GTK_CELL_LAYOUT( player->priv->combobox_audiotrack ), cell, "text", 0, NULL );
-	
-	/* Humanize and pack the Audio Track combobox */
-	audiotrack_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
-	audiotrack_label = gtk_label_new(_("Audio Track:"));
-	gtk_box_pack_start(GTK_BOX(audiotrack_box), audiotrack_label, FALSE, FALSE, 0);
-	gtk_box_pack_end(GTK_BOX(audiotrack_box), player->priv->combobox_audiotrack, FALSE, FALSE, 0);
-	gtk_container_add(GTK_CONTAINER(content_area), audiotrack_box);
+    gtk_cell_layout_pack_start( GTK_CELL_LAYOUT( player->priv->combobox_audiotrack ), cell, TRUE );
+    gtk_cell_layout_set_attributes( GTK_CELL_LAYOUT( player->priv->combobox_audiotrack ), cell, "text", 0, NULL );
+    
+    /* Humanize and pack the Audio Track combobox */
+    audiotrack_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
+    audiotrack_label = gtk_label_new(_("Audio Track:"));
+    gtk_box_pack_start(GTK_BOX(audiotrack_box), audiotrack_label, FALSE, FALSE, 0);
+    gtk_box_pack_end(GTK_BOX(audiotrack_box), player->priv->combobox_audiotrack, FALSE, FALSE, 0);
+    gtk_container_add(GTK_CONTAINER(content_area), audiotrack_box);
     
     /* Initialize the Subtitles combobox */
     player->priv->liststore_subtitles = gtk_list_store_new(1, G_TYPE_STRING);
     player->priv->combobox_subtitles = gtk_combo_box_new_with_model(GTK_TREE_MODEL(player->priv->liststore_subtitles));
     player->priv->subtitle_list = NULL;
     
-	sub_cell = gtk_cell_renderer_text_new();
-	gtk_cell_layout_pack_start( GTK_CELL_LAYOUT( player->priv->combobox_subtitles ), sub_cell, TRUE );
-	gtk_cell_layout_set_attributes( GTK_CELL_LAYOUT( player->priv->combobox_subtitles ), sub_cell, "text", 0, NULL );
+    sub_cell = gtk_cell_renderer_text_new();
+    gtk_cell_layout_pack_start( GTK_CELL_LAYOUT( player->priv->combobox_subtitles ), sub_cell, TRUE );
+    gtk_cell_layout_set_attributes( GTK_CELL_LAYOUT( player->priv->combobox_subtitles ), sub_cell, "text", 0, NULL );
 
     /* Humanize and pack the Subtitles combobox */
-	subtitle_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
-	subtitle_label = gtk_label_new(_("Subtitles:"));
-	gtk_box_pack_start(GTK_BOX(subtitle_box), subtitle_label, FALSE, FALSE, 0);
-	gtk_box_pack_end(GTK_BOX(subtitle_box), player->priv->combobox_subtitles, FALSE, FALSE, 0);
-	gtk_container_add(GTK_CONTAINER(content_area), subtitle_box);
-	
-	infobar_close = gtk_button_new_with_label(_("Close"));
-	close_icon = gtk_image_new_from_icon_name("dialog-close", GTK_ICON_SIZE_BUTTON);
-	gtk_button_set_image(GTK_BUTTON(infobar_close), close_icon);
-	g_signal_connect (infobar_close, "clicked",
-		      G_CALLBACK (on_infobar_close_clicked), player);
-	gtk_box_pack_end(GTK_BOX(content_area), infobar_close, FALSE, FALSE, 0);
-	
-	gtk_widget_show_all(content_area);
-	
-	player->priv->update_languages = FALSE;
-	player->priv->updated_subs = FALSE;
-	/* End Info Bar */
-	
-	g_object_get (G_OBJECT (player->priv->conf),
-        "volume", &volume,
-        NULL);
+    subtitle_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
+    subtitle_label = gtk_label_new(_("Subtitles:"));
+    gtk_box_pack_start(GTK_BOX(subtitle_box), subtitle_label, FALSE, FALSE, 0);
+    gtk_box_pack_end(GTK_BOX(subtitle_box), player->priv->combobox_subtitles, FALSE, FALSE, 0);
+    gtk_container_add(GTK_CONTAINER(content_area), subtitle_box);
+    
+    infobar_close = gtk_button_new_with_label(_("Close"));
+    close_icon = gtk_image_new_from_icon_name("dialog-close", GTK_ICON_SIZE_BUTTON);
+    gtk_button_set_image(GTK_BUTTON(infobar_close), close_icon);
+    g_signal_connect (infobar_close, "clicked",
+              G_CALLBACK (on_infobar_close_clicked), player);
+    gtk_box_pack_end(GTK_BOX(content_area), infobar_close, FALSE, FALSE, 0);
+    
+    gtk_widget_show_all(content_area);
+    
+    player->priv->update_languages = FALSE;
+    player->priv->updated_subs = FALSE;
+    /* End Info Bar */
+    
+    g_object_get (G_OBJECT (player->priv->conf),
+                  "volume", &volume,
+                  NULL);
     gtk_scale_button_set_value (GTK_SCALE_BUTTON (player->priv->volume), 
-			 (gdouble) (volume/100.));
+             (gdouble) (volume/100.));
     /*
      * Pack the playlist.
      */
     gtk_notebook_append_page (GTK_NOTEBOOK (player->priv->playlist_nt), 
-			      GTK_WIDGET (player->priv->list),
-			      gtk_label_new (_("Playlist")));
-			      
+                  GTK_WIDGET (player->priv->list),
+                  gtk_label_new (_("Playlist")));
+                  
     g_object_get (G_OBJECT (player->priv->conf),
-		  "showhide-playlist", &showhide,
-		  NULL);
-		  
+                  "showhide-playlist", &showhide,
+                  NULL);
+          
     g_object_get (G_OBJECT (player->priv->conf),
-		  "window-width", &w,
-		  "window-height", &h,
-		  NULL);
-		  
+                  "window-width", &w,
+                  "window-height", &h,
+                  NULL);
+          
     parole_player_set_playlist_visible(player, showhide);
     
     gtk_window_set_default_size (GTK_WINDOW (player->priv->window), w, h);
@@ -3251,38 +3261,37 @@ parole_player_init (ParolePlayer *player)
     parole_player_set_wm_opacity_hint (player->priv->window);
     
     gtk_box_pack_start (GTK_BOX (output), 
-			player->priv->gst,
-			TRUE, TRUE, 0);
+                        player->priv->gst,
+                        TRUE, TRUE, 0);
     
     gtk_widget_realize (player->priv->gst);
     gtk_widget_show (player->priv->gst);
 
     g_signal_connect (G_OBJECT (parole_gst_get_stream (PAROLE_GST (player->priv->gst))), "notify::seekable",
-		      G_CALLBACK (parole_player_seekable_notify), player);
+              G_CALLBACK (parole_player_seekable_notify), player);
 
-    parole_player_change_volume (player, 
-				 (gdouble) (volume/100.));
+    parole_player_change_volume (player, (gdouble) (volume/100.));
 
     g_signal_connect (player->priv->list, "media_activated",
-		      G_CALLBACK (parole_player_media_activated_cb), player);
-		      
+              G_CALLBACK (parole_player_media_activated_cb), player);
+              
     g_signal_connect (player->priv->list, "media_cursor_changed",
-		      G_CALLBACK (parole_player_media_cursor_changed_cb), player);
-		      
+              G_CALLBACK (parole_player_media_cursor_changed_cb), player);
+              
     g_signal_connect (player->priv->list, "uri-opened",
-		      G_CALLBACK (parole_player_uri_opened_cb), player);
-		      
-	g_signal_connect (player->priv->list, "repeat-toggled",
-		      G_CALLBACK (parole_player_media_list_repeat_toggled_cb), player);
-		      
-	g_signal_connect (player->priv->list, "shuffle-toggled",
-		      G_CALLBACK (parole_player_media_list_shuffle_toggled_cb), player);
-		      
+              G_CALLBACK (parole_player_uri_opened_cb), player);
+              
+    g_signal_connect (player->priv->list, "repeat-toggled",
+              G_CALLBACK (parole_player_media_list_repeat_toggled_cb), player);
+              
+    g_signal_connect (player->priv->list, "shuffle-toggled",
+              G_CALLBACK (parole_player_media_list_shuffle_toggled_cb), player);
+              
     g_signal_connect (player->priv->list, "show-playlist",
-		      G_CALLBACK (parole_player_media_list_show_playlist_cb), player);
-		      
+              G_CALLBACK (parole_player_media_list_show_playlist_cb), player);
+              
     g_signal_connect (player->priv->list, "gst-dvd-nav-message",
-		      G_CALLBACK (parole_player_media_list_gst_nav_message_cb), player);
+              G_CALLBACK (parole_player_media_list_gst_nav_message_cb), player);
     
     /*
      * Load auto saved media list.
@@ -3290,18 +3299,16 @@ parole_player_init (ParolePlayer *player)
     parole_media_list_load (player->priv->list);
     
     g_object_get (G_OBJECT (player->priv->conf),
-		  "repeat", &repeat,
-		  "shuffle", &shuffle,
-		  NULL);
+                  "repeat", &repeat,
+                  "shuffle", &shuffle,
+                  NULL);
 
-    gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "repeat")),
-				    repeat);
-				    
+    gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "repeat")), repeat);
+                    
     parole_media_list_set_repeat_toggled(player->priv->list, repeat);
 
-    gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "shuffle")),
-				    shuffle);
-				    
+    gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "shuffle")), shuffle);
+                    
     parole_media_list_set_shuffle_toggled(player->priv->list, shuffle);
 
     player->priv->fs_window = gtk_window_new (GTK_WINDOW_POPUP);
@@ -3313,21 +3320,21 @@ parole_player_init (ParolePlayer *player)
     gtk_style_context_add_class (fullscreen_mode, "osd");
   
     parole_gst_set_default_aspect_ratio (player, builder);
-	
+    
     gtk_builder_connect_signals (builder, player);
     
     screen = gtk_widget_get_screen (player->priv->window);
     g_signal_connect (G_OBJECT (screen), "size-changed",
-		      G_CALLBACK (parole_player_screen_size_change_changed_cb), player);
+              G_CALLBACK (parole_player_screen_size_change_changed_cb), player);
     
     g_object_unref (builder);
     
     parole_player_setup_multimedia_keys (player);
     
     g_signal_connect_swapped (player->priv->window, "notify::is-active",
-			      G_CALLBACK (parole_player_window_notify_is_active), player);
-			      
-	gtk_widget_grab_focus (player->priv->gst);
+              G_CALLBACK (parole_player_window_notify_is_active), player);
+                  
+    gtk_widget_grab_focus (player->priv->gst);
     
     parole_player_dbus_init (player);
 }
@@ -3340,7 +3347,7 @@ parole_player_new (const gchar *client_id)
     return player;
 }
 
-ParoleMediaList	*parole_player_get_media_list (ParolePlayer *player)
+ParoleMediaList *parole_player_get_media_list (ParolePlayer *player)
 {
     return player->priv->list;
 }
@@ -3351,129 +3358,129 @@ void parole_player_play_uri_disc (ParolePlayer *player, const gchar *uri, const
 {
     if ( uri )
     {
-	parole_player_disc_selected_cb (NULL, uri, device, player);
+        parole_player_disc_selected_cb (NULL, uri, device, player);
     }
     else if (device)
     {
-	gchar *uri_local = parole_get_uri_from_unix_device (device);
-	if ( uri_local )
-	{
-	    parole_player_disc_selected_cb (NULL, uri_local, device, player);
-	    g_free (uri_local);
-	}
+        gchar *uri_local = parole_get_uri_from_unix_device (device);
+        if ( uri_local )
+        {
+            parole_player_disc_selected_cb (NULL, uri_local, device, player);
+            g_free (uri_local);
+        }
     }
 }
 
 void parole_player_set_audiotrack_radio_menu_item_selected(ParolePlayer *player, gint audio_index)
 {
-	GList *menu_items, *menu_iter;
-	gint counter = 0;
-	
-	menu_items = gtk_container_get_children( GTK_CONTAINER (player->priv->languages_menu) );
-	
-	for (menu_iter = menu_items; menu_iter != NULL; menu_iter = g_list_next(menu_iter))
-	{
-		if (counter == audio_index) {
-			gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu_iter->data), TRUE);
-			break;
-		}
-		counter++;
-	}
-	g_list_free(menu_items);
+    GList *menu_items, *menu_iter;
+    gint counter = 0;
+    
+    menu_items = gtk_container_get_children( GTK_CONTAINER (player->priv->languages_menu) );
+    
+    for (menu_iter = menu_items; menu_iter != NULL; menu_iter = g_list_next(menu_iter))
+    {
+        if (counter == audio_index) {
+            gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu_iter->data), TRUE);
+            break;
+        }
+        counter++;
+    }
+    g_list_free(menu_items);
 }
 
 void parole_player_set_subtitle_radio_menu_item_selected(ParolePlayer *player, gint sub_index)
 {
-	GList *menu_items, *menu_iter;
-	menu_items = gtk_container_get_children( GTK_CONTAINER (player->priv->subtitles_menu) );
-	
-	if (sub_index <= 0)
-	{
-		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu_items->data), TRUE);
-	}
-	else
-	{
-		gint counter = -3;
-		for (menu_iter = menu_items; menu_iter != NULL; menu_iter = g_list_next(menu_iter))
-		{
-			if (counter == sub_index) {
-				gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu_iter->data), TRUE);
-				break;
-			}
-			counter++;
-		}
-	}
-	g_list_free(menu_items);
+    GList *menu_items, *menu_iter;
+    menu_items = gtk_container_get_children( GTK_CONTAINER (player->priv->subtitles_menu) );
+    
+    if (sub_index <= 0)
+    {
+        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu_items->data), TRUE);
+    }
+    else
+    {
+        gint counter = -3;
+        for (menu_iter = menu_items; menu_iter != NULL; menu_iter = g_list_next(menu_iter))
+        {
+            if (counter == sub_index) {
+                gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu_iter->data), TRUE);
+                break;
+            }
+            counter++;
+        }
+    }
+    g_list_free(menu_items);
 }
 
 void parole_player_audiotrack_radio_menu_item_changed_cb(GtkWidget *widget, ParolePlayer *player)
 {
-	gint radio_index = 0;
-	GList *menu_items, *menu_iter;
-	gint counter = 0;
-	gint combobox_index;
-	
-	menu_items = gtk_container_get_children( GTK_CONTAINER (player->priv->languages_menu) );
-	
-	for (menu_iter = menu_items; menu_iter != NULL; menu_iter = g_list_next(menu_iter))
-	{
-		if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(menu_iter->data)) == TRUE) {
-			radio_index = counter;
-			break;
-		}
-		counter++;
-	}
-	g_list_free(menu_items);
-	
-	combobox_index = gtk_combo_box_get_active(GTK_COMBO_BOX(player->priv->combobox_audiotrack));
-	if (radio_index != combobox_index)
-	gtk_combo_box_set_active(GTK_COMBO_BOX(player->priv->combobox_audiotrack), radio_index);
+    gint radio_index = 0;
+    GList *menu_items, *menu_iter;
+    gint counter = 0;
+    gint combobox_index;
+    
+    menu_items = gtk_container_get_children( GTK_CONTAINER (player->priv->languages_menu) );
+    
+    for (menu_iter = menu_items; menu_iter != NULL; menu_iter = g_list_next(menu_iter))
+    {
+        if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(menu_iter->data)) == TRUE) {
+            radio_index = counter;
+            break;
+        }
+        counter++;
+    }
+    g_list_free(menu_items);
+    
+    combobox_index = gtk_combo_box_get_active(GTK_COMBO_BOX(player->priv->combobox_audiotrack));
+    if (radio_index != combobox_index)
+        gtk_combo_box_set_active(GTK_COMBO_BOX(player->priv->combobox_audiotrack), radio_index);
 }
 
 void parole_player_subtitles_radio_menu_item_changed_cb(GtkWidget *widget, ParolePlayer *player)
 {
-	gint radio_index = 0;
-	gint combobox_index = 0; 
-	gint counter = 0;
-	
-	GList *menu_items, *menu_iter;
-	menu_items = gtk_container_get_children( GTK_CONTAINER (player->priv->subtitles_menu) );
-	
-	for (menu_iter = menu_items; menu_iter != NULL; menu_iter = g_list_next(menu_iter))
-	{
-		if (counter == 0 || counter > 3)
-		{
-			if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(menu_iter->data)) == TRUE) {
-				radio_index = counter;
-				break;
-			}
-		}
-		counter++;
-	}
-	g_list_free(menu_items);
-	
-	if (radio_index != 0)
-	radio_index -= 3;
-
-	combobox_index = gtk_combo_box_get_active(GTK_COMBO_BOX(player->priv->combobox_subtitles));
-	if (radio_index != combobox_index)
-	gtk_combo_box_set_active(GTK_COMBO_BOX(player->priv->combobox_subtitles), radio_index);
+    gint radio_index = 0;
+    gint combobox_index = 0; 
+    gint counter = 0;
+    
+    GList *menu_items, *menu_iter;
+    menu_items = gtk_container_get_children( GTK_CONTAINER (player->priv->subtitles_menu) );
+    
+    for (menu_iter = menu_items; menu_iter != NULL; menu_iter = g_list_next(menu_iter))
+    {
+        if (counter == 0 || counter > 3)
+        {
+            if (gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(menu_iter->data)) == TRUE) {
+                radio_index = counter;
+                break;
+            }
+        }
+        counter++;
+    }
+    g_list_free(menu_items);
+    
+    if (radio_index != 0)
+        radio_index -= 3;
+
+    combobox_index = gtk_combo_box_get_active(GTK_COMBO_BOX(player->priv->combobox_subtitles));
+    if (radio_index != combobox_index)
+        gtk_combo_box_set_active(GTK_COMBO_BOX(player->priv->combobox_subtitles), radio_index);
 }
 
 void parole_player_combo_box_audiotrack_changed_cb(GtkWidget *widget, ParolePlayer *player)
 {
-	gint audio_index = gtk_combo_box_get_active(GTK_COMBO_BOX(player->priv->combobox_audiotrack));
-	if (player->priv->update_languages == FALSE)
-	gst_set_current_audio_track(PAROLE_GST(player->priv->gst), audio_index);
-	parole_player_set_audiotrack_radio_menu_item_selected(player, audio_index);
+    gint audio_index = gtk_combo_box_get_active(GTK_COMBO_BOX(player->priv->combobox_audiotrack));
+    if (player->priv->update_languages == FALSE)
+        gst_set_current_audio_track(PAROLE_GST(player->priv->gst), audio_index);
+    parole_player_set_audiotrack_radio_menu_item_selected(player, audio_index);
 }
 
 void parole_player_combo_box_subtitles_changed_cb(GtkWidget *widget, ParolePlayer *player)
 {
-	gint sub_index = gtk_combo_box_get_active(GTK_COMBO_BOX(player->priv->combobox_subtitles));
-	if (player->priv->update_languages == FALSE)
-	gst_set_current_subtitle_track(PAROLE_GST(player->priv->gst), sub_index);
-	parole_player_set_subtitle_radio_menu_item_selected(player, sub_index);
+    gint sub_index = gtk_combo_box_get_active(GTK_COMBO_BOX(player->priv->combobox_subtitles));
+    if (player->priv->update_languages == FALSE)
+        gst_set_current_subtitle_track(PAROLE_GST(player->priv->gst), sub_index);
+    parole_player_set_subtitle_radio_menu_item_selected(player, sub_index);
 }
 
 void parole_player_terminate (ParolePlayer *player)
@@ -3482,37 +3489,37 @@ void parole_player_terminate (ParolePlayer *player)
 }
 
 
-static gboolean	parole_player_dbus_play (ParolePlayer *player,
-					 GError *error);
+static gboolean     parole_player_dbus_play             (ParolePlayer *player, 
+                                                         GError *error);
 
-static gboolean	parole_player_dbus_stop (ParolePlayer *player,
-					 GError *error);
+static gboolean     parole_player_dbus_stop             (ParolePlayer *player, 
+                                                         GError *error);
 
-static gboolean	parole_player_dbus_next_track (ParolePlayer *player,
-					       GError *error);
+static gboolean     parole_player_dbus_next_track       (ParolePlayer *player,
+                                                         GError *error);
 
-static gboolean	parole_player_dbus_prev_track (ParolePlayer *player,
-					       GError *error);
+static gboolean     parole_player_dbus_prev_track       (ParolePlayer *player,
+                                                         GError *error);
 
-static gboolean	parole_player_dbus_seek_forward (ParolePlayer *player,
-					         GError *error);
+static gboolean     parole_player_dbus_seek_forward     (ParolePlayer *player,
+                                                         GError *error);
 
-static gboolean	parole_player_dbus_seek_backward (ParolePlayer *player,
-					          GError *error);
+static gboolean     parole_player_dbus_seek_backward    (ParolePlayer *player,
+                                                         GError *error);
 
-static gboolean	parole_player_dbus_raise_volume (ParolePlayer *player,
-						 GError *error);
+static gboolean     parole_player_dbus_raise_volume     (ParolePlayer *player,
+                                                         GError *error);
 
-static gboolean	parole_player_dbus_lower_volume (ParolePlayer *player,
-						 GError *error);
-					 
-static gboolean	parole_player_dbus_mute (ParolePlayer *player,
-					 GError *error);
+static gboolean     parole_player_dbus_lower_volume     (ParolePlayer *player,
+                                                         GError *error);
+                     
+static gboolean     parole_player_dbus_mute             (ParolePlayer *player,
+                                                         GError *error);
 
-static gboolean parole_player_dbus_play_disc (ParolePlayer *player,
-					      gchar *in_uri,
-					      gchar *in_device,
-					      GError **error);
+static gboolean     parole_player_dbus_play_disc        (ParolePlayer *player,
+                                                         gchar *in_uri,
+                                                         gchar *in_device,
+                                                         GError **error);
 
 #include "org.parole.media.player.h"
 
@@ -3522,96 +3529,93 @@ static gboolean parole_player_dbus_play_disc (ParolePlayer *player,
 static void 
 parole_player_dbus_class_init (ParolePlayerClass *klass)
 {
-    
     dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (klass),
-				     &dbus_glib_parole_player_object_info);
-				     
+                                     &dbus_glib_parole_player_object_info);
 }
 
 static void
 parole_player_dbus_init (ParolePlayer *player)
 {
     dbus_g_connection_register_g_object (player->priv->bus,
-					 PAROLE_DBUS_PATH,
-					 G_OBJECT (player));
+                                         PAROLE_DBUS_PATH,
+                                         G_OBJECT (player));
 }
 
-static gboolean	parole_player_dbus_play (ParolePlayer *player,
-					 GError *error)
+static gboolean parole_player_dbus_play (ParolePlayer *player,
+                                         GError *error)
 {
-    
     parole_player_play_pause_clicked (NULL, player);
     return TRUE;
 }
 
-static gboolean	parole_player_dbus_stop (ParolePlayer *player,
-					 GError *error)
+static gboolean parole_player_dbus_stop (ParolePlayer *player,
+                                         GError *error)
 {
     parole_gst_stop (PAROLE_GST (player->priv->gst));
     return TRUE;
 }
 
-static gboolean	parole_player_dbus_next_track (ParolePlayer *player,
-					       GError *error)
+static gboolean parole_player_dbus_next_track (ParolePlayer *player,
+                                               GError *error)
 {
-	parole_player_play_next (player, TRUE);
+    parole_player_play_next (player, TRUE);
     return TRUE;
 }
 
-static gboolean	parole_player_dbus_prev_track (ParolePlayer *player,
-					       GError *error)
+static gboolean parole_player_dbus_prev_track (ParolePlayer *player,
+                                               GError *error)
 {
-	parole_player_play_prev (player);
+    parole_player_play_prev (player);
     return TRUE;
 }
 
-static gboolean	parole_player_dbus_seek_forward (ParolePlayer *player,
-					         GError *error)
+static gboolean parole_player_dbus_seek_forward (ParolePlayer *player,
+                                                 GError *error)
 {
     parole_player_forward_cb (NULL, player);
     return TRUE;
 }
 
-static gboolean	parole_player_dbus_seek_backward (ParolePlayer *player,
-					          GError *error)
+static gboolean parole_player_dbus_seek_backward (ParolePlayer *player,
+                                                  GError *error)
 {
     parole_player_back_cb (NULL, player);
     return TRUE;
 }
-					 
-static gboolean	parole_player_dbus_raise_volume (ParolePlayer *player,
-						 GError *error)
+                     
+static gboolean parole_player_dbus_raise_volume (ParolePlayer *player,
+                                                 GError *error)
 {
     parole_player_volume_up (NULL, player);
     return TRUE;
 }
 
-static gboolean	parole_player_dbus_lower_volume (ParolePlayer *player,
-						 GError *error)
+static gboolean parole_player_dbus_lower_volume (ParolePlayer *player,
+                                                 GError *error)
 {
     parole_player_volume_down (NULL, player);
     return TRUE;
 }
-					 
-static gboolean	parole_player_dbus_mute (ParolePlayer *player,
-					 GError *error)
+                     
+static gboolean parole_player_dbus_mute (ParolePlayer *player,
+                                         GError *error)
 {
     gtk_scale_button_set_value (GTK_SCALE_BUTTON (player->priv->volume), 0);
     return TRUE;
 }
 
 static gboolean parole_player_dbus_play_disc (ParolePlayer *player,
-					      gchar *in_uri,
-					      gchar *in_device,
-					      GError **error)
+                                              gchar *in_uri,
+                                              gchar *in_device,
+                                              GError **error)
 {
     TRACE ("uri : %s", in_uri);
     
     gtk_window_present (GTK_WINDOW (player->priv->window));
     
     if ( parole_is_uri_disc (in_uri) )
-	parole_player_disc_selected_cb (NULL, in_uri, in_device, player);
-	
+        parole_player_disc_selected_cb (NULL, in_uri, in_device, player);
+    
     return TRUE;
 }
 
diff --git a/src/parole-player.h b/src/parole-player.h
index 54861c8..f1b5c6c 100644
--- a/src/parole-player.h
+++ b/src/parole-player.h
@@ -36,39 +36,38 @@ typedef struct ParolePlayerPrivate ParolePlayerPrivate;
 
 typedef struct
 {
-    GObject         		 parent;
-    ParolePlayerPrivate     	*priv;
+    GObject                     parent;
+    ParolePlayerPrivate        *priv;
     
 } ParolePlayer;
 
 typedef struct
 {
-    GObjectClass 		 parent_class;
+    GObjectClass                parent_class;
     
-    void			(*shuffle_toggled)		    (ParolePlayer *list,
-								     gboolean shuffle_toggled);
-								     
-	void			(*repeat_toggled)		    (ParolePlayer *list,
-								     gboolean repeat_toggled);
+    void                        (*shuffle_toggled)              (ParolePlayer *list,
+                                                                 gboolean shuffle_toggled);
+                                     
+    void                        (*repeat_toggled)               (ParolePlayer *list,
+                                                                 gboolean repeat_toggled);
 
-    
 } ParolePlayerClass;
 
-GType        			 parole_player_get_type        (void) G_GNUC_CONST;
-ParolePlayer       		*parole_player_new             (const gchar *client_id);
+GType                           parole_player_get_type          (void) G_GNUC_CONST;
+ParolePlayer                   *parole_player_new               (const gchar *client_id);
 
-ParoleMediaList			*parole_player_get_media_list  (ParolePlayer *player);
+ParoleMediaList                *parole_player_get_media_list    (ParolePlayer *player);
 
-void				 parole_player_play_uri_disc   (ParolePlayer *player,
-								const gchar *uri,
-								const gchar *device);
+void                            parole_player_play_uri_disc     (ParolePlayer *player,
+                                                                 const gchar *uri,
+                                                                 const gchar *device);
 
-void				 parole_player_terminate       (ParolePlayer *player);
+void                            parole_player_terminate         (ParolePlayer *player);
 
-void                parole_player_embedded (ParolePlayer *player);
+void                            parole_player_embedded          (ParolePlayer *player);
 
-void				 parole_player_full_screen     (ParolePlayer *player, 
-								gboolean fullscreen);
+void                            parole_player_full_screen       (ParolePlayer *player, 
+                                                                 gboolean fullscreen);
 
 G_END_DECLS
 
diff --git a/src/parole-plugin-player.c b/src/parole-plugin-player.c
index 51f8a2a..6f14269 100644
--- a/src/parole-plugin-player.c
+++ b/src/parole-plugin-player.c
@@ -55,7 +55,7 @@ struct ParolePluginPlayerPrivate
 };
 
 G_DEFINE_TYPE_WITH_CODE (ParolePluginPlayer, parole_plugin_player, G_TYPE_OBJECT,
-    G_IMPLEMENT_INTERFACE (PAROLE_TYPE_PROVIDER_PLAYER, parole_plugin_player_iface_init))
+                         G_IMPLEMENT_INTERFACE (PAROLE_TYPE_PROVIDER_PLAYER, parole_plugin_player_iface_init))
 
 static GtkWidget *
 parole_plugin_player_get_main_window (ParoleProviderPlayer *provider)
@@ -68,7 +68,7 @@ parole_plugin_player_get_main_window (ParoleProviderPlayer *provider)
 
 static void
 parole_plugin_player_pack_widget (ParoleProviderPlayer *provider, GtkWidget *widget, 
-				  const gchar *title, ParolePluginContainer container_type)
+                                  const gchar *title, ParolePluginContainer container_type)
 {
     ParolePluginPlayer *player;
     ParolePluginsManager *manager;
@@ -104,7 +104,7 @@ parole_plugin_player_get_stream (ParoleProviderPlayer *provider)
     return parole_gst_get_stream (PAROLE_GST (player->priv->gst));
 }
 
-static gboolean	
+static gboolean 
 parole_plugin_player_play_uri (ParoleProviderPlayer *provider, const gchar *uri)
 {
     ParolePluginPlayer *player;
@@ -116,7 +116,7 @@ parole_plugin_player_play_uri (ParoleProviderPlayer *provider, const gchar *uri)
     return TRUE;
 }
 
-static gboolean	
+static gboolean 
 parole_plugin_player_pause (ParoleProviderPlayer *provider)
 {
     ParolePluginPlayer *player;
@@ -128,7 +128,7 @@ parole_plugin_player_pause (ParoleProviderPlayer *provider)
     return TRUE;
 }
 
-static gboolean	
+static gboolean 
 parole_plugin_player_resume (ParoleProviderPlayer *provider)
 {
     ParolePluginPlayer *player;
@@ -140,7 +140,7 @@ parole_plugin_player_resume (ParoleProviderPlayer *provider)
     return TRUE;
 }
 
-static gboolean	
+static gboolean 
 parole_plugin_player_stop (ParoleProviderPlayer *provider)
 {
     ParolePluginPlayer *player;
@@ -152,7 +152,7 @@ parole_plugin_player_stop (ParoleProviderPlayer *provider)
     return TRUE;
 }
 
-static gboolean	
+static gboolean 
 parole_plugin_player_seek (ParoleProviderPlayer *provider, gdouble pos)
 {
     ParolePluginPlayer *player;
@@ -190,7 +190,7 @@ static void parole_plugin_player_iface_init (ParoleProviderPlayerIface *iface)
 
 static void 
 parole_plugin_player_media_state_changed_cb (ParoleGst *gst, const ParoleStream *stream, 
-					     ParoleState state, ParolePluginPlayer *player)
+                                             ParoleState state, ParolePluginPlayer *player)
 {
     g_signal_emit_by_name (G_OBJECT (player), "state-changed", stream, state);
 }
@@ -219,10 +219,10 @@ parole_plugin_player_init (ParolePluginPlayer *player)
     player->priv->gst = parole_gst_get ();
     
     player->priv->state_changed = g_signal_connect (G_OBJECT (player->priv->gst), "media-state",
-					    G_CALLBACK (parole_plugin_player_media_state_changed_cb), player);
-		      
+                        G_CALLBACK (parole_plugin_player_media_state_changed_cb), player);
+              
     player->priv->tag_message = g_signal_connect (G_OBJECT (player->priv->gst), "media-tag",
-					  G_CALLBACK (parole_plugin_player_media_tag_cb), player);
+                        G_CALLBACK (parole_plugin_player_media_tag_cb), player);
 
     player->priv->packed = FALSE;
     player->priv->box = NULL;
@@ -237,15 +237,15 @@ parole_plugin_player_finalize (GObject *object)
     
     if ( G_IS_OBJECT (player->priv->gst) )
     {
-	if (g_signal_handler_is_connected (player->priv->gst, player->priv->state_changed)) 
-	    g_signal_handler_disconnect (player->priv->gst, player->priv->state_changed);
+        if (g_signal_handler_is_connected (player->priv->gst, player->priv->state_changed)) 
+            g_signal_handler_disconnect (player->priv->gst, player->priv->state_changed);
 
-	if (g_signal_handler_is_connected (player->priv->gst, player->priv->tag_message)) 
-	    g_signal_handler_disconnect (player->priv->gst, player->priv->tag_message);
+        if (g_signal_handler_is_connected (player->priv->gst, player->priv->tag_message)) 
+            g_signal_handler_disconnect (player->priv->gst, player->priv->tag_message);
     }
     
     if ( player->priv->packed && GTK_IS_WIDGET (player->priv->box))
-	gtk_widget_destroy (player->priv->box);
+        gtk_widget_destroy (player->priv->box);
 
     G_OBJECT_CLASS (parole_plugin_player_parent_class)->finalize (object);
 }
diff --git a/src/parole-plugin-player.h b/src/parole-plugin-player.h
index 5c124e9..c90b65a 100644
--- a/src/parole-plugin-player.h
+++ b/src/parole-plugin-player.h
@@ -35,20 +35,20 @@ typedef struct ParolePluginPlayerPrivate ParolePluginPlayerPrivate;
 
 typedef struct
 {
-    GObject         		   parent;
-    ParolePluginPlayerPrivate     *priv;
+    GObject                     parent;
+    ParolePluginPlayerPrivate  *priv;
     
 } ParolePluginPlayer;
 
 typedef struct
 {
-    GObjectClass 		   parent_class;
+    GObjectClass                parent_class;
     
 } ParolePluginPlayerClass;
 
-GType        			   parole_plugin_player_get_type        (void) G_GNUC_CONST;
+GType                           parole_plugin_player_get_type        (void) G_GNUC_CONST;
 
-ParolePluginPlayer                *parole_plugin_player_new             (void);
+ParolePluginPlayer             *parole_plugin_player_new             (void);
 
 G_END_DECLS
 
diff --git a/src/parole-plugins-manager.h b/src/parole-plugins-manager.h
index 3adbf79..302b195 100644
--- a/src/parole-plugins-manager.h
+++ b/src/parole-plugins-manager.h
@@ -36,29 +36,29 @@ typedef struct ParolePluginsManagerPrivate ParolePluginsManagerPrivate;
 
 typedef struct
 {
-    GObject         		     parent;
-    ParolePluginsManagerPrivate     *priv;
+    GObject                         parent;
+    ParolePluginsManagerPrivate    *priv;
     
 } ParolePluginsManager;
 
 typedef struct
 {
-    GObjectClass 		    parent_class;
+    GObjectClass                    parent_class;
     
 } ParolePluginsManagerClass;
 
-GType        			    parole_plugins_manager_get_type       (void) G_GNUC_CONST;
+GType                               parole_plugins_manager_get_type   (void) G_GNUC_CONST;
 
-ParolePluginsManager               *parole_plugins_manager_new            (gboolean load_plugins);
+ParolePluginsManager               *parole_plugins_manager_new        (gboolean load_plugins);
 
-ParolePluginsManager 		   *parole_plugins_manager_get 		  (void);
+ParolePluginsManager               *parole_plugins_manager_get        (void);
 
-void				    parole_plugins_manager_load		  (ParolePluginsManager *manager);
+void                                parole_plugins_manager_load       (ParolePluginsManager *manager);
 
-void 				    parole_plugins_manager_pack 	  (ParolePluginsManager *manager, 
-									   GtkWidget *widget, 
-									   const gchar *title,
-									   ParolePluginContainer container);
+void                                parole_plugins_manager_pack       (ParolePluginsManager *manager, 
+                                                                       GtkWidget *widget, 
+                                                                       const gchar *title,
+                                                                       ParolePluginContainer container);
 
 G_END_DECLS
 
diff --git a/src/parole-subtitle-encoding.h b/src/parole-subtitle-encoding.h
index 8a4315d..dd430e9 100644
--- a/src/parole-subtitle-encoding.h
+++ b/src/parole-subtitle-encoding.h
@@ -32,9 +32,9 @@
 
 #include <gtk/gtk.h>
 
-void 		parole_subtitle_encoding_init 		(GtkComboBox *combo);
+void            parole_subtitle_encoding_init           (GtkComboBox *combo);
 
-void 		parole_subtitle_encoding_set 		(GtkComboBox *combo, const char *encoding);
+void            parole_subtitle_encoding_set            (GtkComboBox *combo, const char *encoding);
 
 const char     *parole_subtitle_encoding_get_selected   (GtkComboBox *combo);
 
diff --git a/src/parole-utils.c b/src/parole-utils.c
index 4f5fbff..acd1543 100644
--- a/src/parole-utils.c
+++ b/src/parole-utils.c
@@ -52,13 +52,13 @@
 
 /* List from xine-lib's demux_sputext.c */
 static const char subtitle_ext[][4] = {
-	"asc",
-	"txt",
-	"sub",
-	"srt",
-	"smi",
-	"ssa",
-	"ass"
+    "asc",
+    "txt",
+    "sub",
+    "srt",
+    "smi",
+    "ssa",
+    "ass"
 };
 
 /*
@@ -80,9 +80,9 @@ compare_by_name_using_number (const gchar *ap,
 
     /* compare the numbers */
     if (anum < bnum)
-	return -1;
+        return -1;
     else if (anum > bnum)
-	return 1;
+        return 1;
 
     /* the numbers are equal, and so the higher first digit should
     * be sorted first, i.e. 'file10' before 'file010', since we
@@ -115,75 +115,75 @@ thunar_file_compare_by_name (ParoleFile *file_a,
     /* check if we should ignore case */
     if (G_LIKELY (case_sensitive))
     {
-	/* try simple (fast) ASCII comparison first */
-	for (;; ++ap, ++bp)
-        {
-	    /* check if the characters differ or we have a non-ASCII char */
-	    ac = *((const guchar *) ap);
-	    bc = *((const guchar *) bp);
-	    if (ac != bc || ac == 0 || ac > 127)
-		break;
-	}
-
-	/* fallback to Unicode comparison */
-	if (G_UNLIKELY (ac > 127 || bc > 127))
-        {
-	    for (;; ap = g_utf8_next_char (ap), bp = g_utf8_next_char (bp))
+        /* try simple (fast) ASCII comparison first */
+        for (;; ++ap, ++bp)
             {
-		/* check if characters differ or end of string */
-		ac = g_utf8_get_char (ap);
-		bc = g_utf8_get_char (bp);
-		if (ac != bc || ac == 0)
-		    break;
-	    }
+            /* check if the characters differ or we have a non-ASCII char */
+            ac = *((const guchar *) ap);
+            bc = *((const guchar *) bp);
+            if (ac != bc || ac == 0 || ac > 127)
+            break;
         }
+
+        /* fallback to Unicode comparison */
+        if (G_UNLIKELY (ac > 127 || bc > 127))
+            {
+                for (;; ap = g_utf8_next_char (ap), bp = g_utf8_next_char (bp))
+                {
+                /* check if characters differ or end of string */
+                ac = g_utf8_get_char (ap);
+                bc = g_utf8_get_char (bp);
+                if (ac != bc || ac == 0)
+                    break;
+                }
+            }
     }
     else
     {
-	/* try simple (fast) ASCII comparison first (case-insensitive!) */
-	for (;; ++ap, ++bp)
+        /* try simple (fast) ASCII comparison first (case-insensitive!) */
+        for (;; ++ap, ++bp)
         {
-	    /* check if the characters differ or we have a non-ASCII char */
-	    ac = *((const guchar *) ap);
-	    bc = *((const guchar *) bp);
-	    if (g_ascii_tolower (ac) != g_ascii_tolower (bc) || ac == 0 || ac > 127)
-		break;
+            /* check if the characters differ or we have a non-ASCII char */
+            ac = *((const guchar *) ap);
+            bc = *((const guchar *) bp);
+            if (g_ascii_tolower (ac) != g_ascii_tolower (bc) || ac == 0 || ac > 127)
+            break;
         }
 
-	/* fallback to Unicode comparison (case-insensitive!) */
-	if (G_UNLIKELY (ac > 127 || bc > 127))
-	{
-	    for (;; ap = g_utf8_next_char (ap), bp = g_utf8_next_char (bp))
+        /* fallback to Unicode comparison (case-insensitive!) */
+        if (G_UNLIKELY (ac > 127 || bc > 127))
+        {
+            for (;; ap = g_utf8_next_char (ap), bp = g_utf8_next_char (bp))
             {
-		/* check if characters differ or end of string */
-		ac = g_utf8_get_char (ap);
-		bc = g_utf8_get_char (bp);
-		if (g_unichar_tolower (ac) != g_unichar_tolower (bc) || ac == 0)
-		    break;
+                /* check if characters differ or end of string */
+                ac = g_utf8_get_char (ap);
+                bc = g_utf8_get_char (bp);
+                if (g_unichar_tolower (ac) != g_unichar_tolower (bc) || ac == 0)
+                    break;
             }
         }
     }
 
     /* if both strings are equal, we're done */
     if (G_UNLIKELY (ac == bc || (!case_sensitive && g_unichar_tolower (ac) == g_unichar_tolower (bc))))
-	return 0;
+        return 0;
 
     /* check if one of the characters that differ is a digit */
     if (G_UNLIKELY (g_ascii_isdigit (ac) || g_ascii_isdigit (bc)))
     {
-	/* if both strings differ in a digit, we use a smarter comparison
-	 * to get sorting 'file1', 'file5', 'file10' done the right way.
-	 */
-	if (g_ascii_isdigit (ac) && g_ascii_isdigit (bc))
-	    return compare_by_name_using_number (ap, bp);
-
-	/* a second case is '20 file' and '2file', where comparison by number
-	 * makes sense, if the previous char for both strings is a digit.
-	 */
-	if (ap > parole_file_get_display_name (file_a) && bp > parole_file_get_display_name (file_b)
-	    && g_ascii_isdigit (*(ap - 1)) && g_ascii_isdigit (*(bp - 1)))
+        /* if both strings differ in a digit, we use a smarter comparison
+         * to get sorting 'file1', 'file5', 'file10' done the right way.
+         */
+        if (g_ascii_isdigit (ac) && g_ascii_isdigit (bc))
+            return compare_by_name_using_number (ap, bp);
+
+        /* a second case is '20 file' and '2file', where comparison by number
+         * makes sense, if the previous char for both strings is a digit.
+         */
+        if (ap > parole_file_get_display_name (file_a) && bp > parole_file_get_display_name (file_b)
+            && g_ascii_isdigit (*(ap - 1)) && g_ascii_isdigit (*(bp - 1)))
         {
-	    return compare_by_name_using_number (ap - 1, bp - 1);
+            return compare_by_name_using_number (ap - 1, bp - 1);
         }
     }
 
@@ -195,40 +195,40 @@ thunar_file_compare_by_name (ParoleFile *file_a,
 #ifdef HAVE_STRCOLL
     if ((ac > 127 || bc > 127) && g_get_charset (NULL))
     {
-	/* case-sensitive is easy, case-insensitive is expensive,
-         * but we use a simple optimization to make it fast.
-         */
-	if (G_LIKELY (case_sensitive))
+        /* case-sensitive is easy, case-insensitive is expensive,
+             * but we use a simple optimization to make it fast.
+             */
+        if (G_LIKELY (case_sensitive))
         {
-	    return strcoll (ap, bp);
+            return strcoll (ap, bp);
         }
-	else
+        else
         {
-	    /* we use a trick here, so we don't need to allocate
-             * and transform the two strings completely first (8
-             * byte for each buffer, so all compilers should align
-             * them properly)
+            /* we use a trick here, so we don't need to allocate
+                 * and transform the two strings completely first (8
+                 * byte for each buffer, so all compilers should align
+                 * them properly)
+                 */
+            gchar abuf[8];
+            gchar bbuf[8];
+
+            /* transform the unicode chars to strings and
+                 * make sure the strings are nul-terminated.
              */
-	    gchar abuf[8];
-	    gchar bbuf[8];
-
-	    /* transform the unicode chars to strings and
-             * make sure the strings are nul-terminated.
-	     */
-	    abuf[g_unichar_to_utf8 (ac, abuf)] = '\0';
-	    bbuf[g_unichar_to_utf8 (bc, bbuf)] = '\0';
+            abuf[g_unichar_to_utf8 (ac, abuf)] = '\0';
+            bbuf[g_unichar_to_utf8 (bc, bbuf)] = '\0';
 
-	    /* compare the unicode chars (as strings) */
-	    return strcoll (abuf, bbuf);
+            /* compare the unicode chars (as strings) */
+            return strcoll (abuf, bbuf);
         }
     }
 #endif
 
     /* else, they differ in an ASCII character */
     if (G_UNLIKELY (!case_sensitive))
-	return (g_unichar_tolower (ac) > g_unichar_tolower (bc)) ? 1 : -1;
+        return (g_unichar_tolower (ac) > g_unichar_tolower (bc)) ? 1 : -1;
     else
-	return (ac > bc) ? 1 : -1;
+        return (ac > bc) ? 1 : -1;
 }
 
 gchar *
@@ -241,8 +241,8 @@ parole_get_name_without_extension (const gchar *name)
     
     for ( suffix = len -1; suffix > 0;  suffix--)
     {
-	if ( name [suffix] == '.' )
-	    break;
+        if ( name [suffix] == '.' )
+            break;
     }
     
     ret = g_strndup (name, sizeof (char) * (suffix));
@@ -260,13 +260,13 @@ parole_get_subtitle_in_dir (const gchar *dir_path, const gchar *file)
     
     for ( i = 0; i < G_N_ELEMENTS (subtitle_ext); i++)
     {
-	sub_path = g_strdup_printf ("%s%c%s.%s", dir_path, G_DIR_SEPARATOR, file_no_ext, subtitle_ext[i]);
-	
-	if ( g_file_test (sub_path, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR ) )
-	    break;
+        sub_path = g_strdup_printf ("%s%c%s.%s", dir_path, G_DIR_SEPARATOR, file_no_ext, subtitle_ext[i]);
+        
+        if ( g_file_test (sub_path, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR ) )
+            break;
 
-	g_free (sub_path);
-	sub_path = NULL;
+        g_free (sub_path);
+        sub_path = NULL;
     }
 
     g_free (file_no_ext);
@@ -290,21 +290,21 @@ gchar *parole_get_subtitle_path (const gchar *uri)
     
     if ( !parent )
     {
-	g_object_unref (file);
-	return NULL;
+        g_object_unref (file);
+        return NULL;
     }
     
     info = g_file_query_info (file, 
-			      "standard::*,",
-			      0,
-			      NULL,
-			      &error);
+                  "standard::*,",
+                  0,
+                  NULL,
+                  &error);
     
     if ( error )
     {
-	g_warning ("%s: \n", error->message);
-	g_error_free (error);
-	return NULL;
+        g_warning ("%s: \n", error->message);
+        g_error_free (error);
+        return NULL;
     }
     
     file_name = g_strdup (g_file_info_get_display_name (info));
@@ -328,9 +328,9 @@ parole_is_uri_disc (const gchar *uri)
 {
     if (   g_str_has_prefix (uri, "dvd:/")  || g_str_has_prefix (uri, "vcd:/") 
         || g_str_has_prefix (uri, "svcd:/") || g_str_has_prefix (uri, "cdda:/"))
-	return TRUE;
+        return TRUE;
     else
-	return FALSE;
+        return FALSE;
 }
 
 GdkPixbuf *parole_icon_load (const gchar *icon_name, gint size)
@@ -339,15 +339,15 @@ GdkPixbuf *parole_icon_load (const gchar *icon_name, gint size)
     GError *error = NULL;
     
     pix = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (), 
-				    icon_name, 
-				    size,
-				    GTK_ICON_LOOKUP_USE_BUILTIN,
-				    &error);
-				    
+                                    icon_name, 
+                                    size,
+                                    GTK_ICON_LOOKUP_USE_BUILTIN,
+                                    &error);
+                    
     if ( error )
     {
-	g_warning ("Unable to load icon : %s : %s", icon_name, error->message);
-	g_error_free (error);
+        g_warning ("Unable to load icon : %s : %s", icon_name, error->message);
+        g_error_free (error);
     }
     
     return pix;
@@ -355,7 +355,7 @@ GdkPixbuf *parole_icon_load (const gchar *icon_name, gint size)
 }
 
 void parole_get_media_files (GtkFileFilter *filter, const gchar *path, 
-			     gboolean recursive, GSList **list)
+                 gboolean recursive, GSList **list)
 {
     GtkFileFilter *playlist_filter;
     GSList *list_internal = NULL;
@@ -372,63 +372,63 @@ void parole_get_media_files (GtkFileFilter *filter, const gchar *path,
 
     if ( g_file_test (path, G_FILE_TEST_IS_REGULAR ) )
     {
-	file = parole_file_new (path);
-	if ( parole_file_filter (playlist_filter, file) && 
-	     parole_pl_parser_guess_format_from_extension (path) != PAROLE_PL_FORMAT_UNKNOWN )
-	{
-	    playlist = parole_pl_parser_parse_from_file_by_extension (path);
-	    g_object_unref (file);
-	    if ( playlist)
-	    {
-		*list = g_slist_concat (*list, playlist);
-	    }
-	}
-	else if ( parole_file_filter (filter, file) )
-	{
-	    *list = g_slist_append (*list, file);
-	}
-	else
-	    g_object_unref (file);
+        file = parole_file_new (path);
+        if ( parole_file_filter (playlist_filter, file) && 
+             parole_pl_parser_guess_format_from_extension (path) != PAROLE_PL_FORMAT_UNKNOWN )
+        {
+            playlist = parole_pl_parser_parse_from_file_by_extension (path);
+            g_object_unref (file);
+            if ( playlist)
+            {
+                *list = g_slist_concat (*list, playlist);
+            }
+        }
+        else if ( parole_file_filter (filter, file) )
+        {
+            *list = g_slist_append (*list, file);
+        }
+        else
+            g_object_unref (file);
     }
     else if ( g_file_test (path, G_FILE_TEST_IS_DIR ) )
     {
-	dir = g_dir_open (path, 0, NULL);
-    
-	if ( G_UNLIKELY (dir == NULL) )
-	    return;
-	
-	while ( (name = g_dir_read_name (dir)) )
-	{
-	    gchar *path_internal = g_build_filename (path, name, NULL);
-	    if ( g_file_test (path_internal, G_FILE_TEST_IS_DIR) && recursive)
-	    {
-		parole_get_media_files (filter, path_internal, TRUE, list);
-	    }
-	    else if ( g_file_test (path_internal, G_FILE_TEST_IS_REGULAR) )
-	    {
-		file = parole_file_new (path_internal);
-		if ( parole_file_filter (playlist_filter, file) &&
-		     parole_pl_parser_guess_format_from_extension (path) != PAROLE_PL_FORMAT_UNKNOWN)
-		{
-		    playlist = parole_pl_parser_parse_from_file_by_extension (path_internal);
-		    g_object_unref (file);
-		    if ( playlist)
-		    {
-			*list = g_slist_concat (*list, playlist);
-		    }
-		}
-		else if ( parole_file_filter (filter, file) )
-		{
-		    list_internal = g_slist_append (list_internal, file);
-		}
-		else
-		    g_object_unref (file);
-	    }
-	    g_free (path_internal);
-	}
-	list_internal = g_slist_sort (list_internal, (GCompareFunc) thunar_file_compare_by_name);
-	g_dir_close (dir);
-	*list = g_slist_concat (*list, list_internal);
+        dir = g_dir_open (path, 0, NULL);
+        
+        if ( G_UNLIKELY (dir == NULL) )
+            return;
+        
+        while ( (name = g_dir_read_name (dir)) )
+        {
+            gchar *path_internal = g_build_filename (path, name, NULL);
+            if ( g_file_test (path_internal, G_FILE_TEST_IS_DIR) && recursive)
+            {
+                parole_get_media_files (filter, path_internal, TRUE, list);
+            }
+            else if ( g_file_test (path_internal, G_FILE_TEST_IS_REGULAR) )
+            {
+                file = parole_file_new (path_internal);
+                if ( parole_file_filter (playlist_filter, file) &&
+                     parole_pl_parser_guess_format_from_extension (path) != PAROLE_PL_FORMAT_UNKNOWN)
+                {
+                    playlist = parole_pl_parser_parse_from_file_by_extension (path_internal);
+                    g_object_unref (file);
+                    if ( playlist)
+                    {
+                        *list = g_slist_concat (*list, playlist);
+                    }
+                }
+                else if ( parole_file_filter (filter, file) )
+                {
+                    list_internal = g_slist_append (list_internal, file);
+                }
+                else
+                    g_object_unref (file);
+                }
+            g_free (path_internal);
+        }
+        list_internal = g_slist_sort (list_internal, (GCompareFunc) thunar_file_compare_by_name);
+        g_dir_close (dir);
+        *list = g_slist_concat (*list, list_internal);
     }
     g_object_unref (playlist_filter);
 }
@@ -452,26 +452,26 @@ parole_device_has_cdda (const gchar *device)
     
     if ( (fd = open (device, O_RDONLY)) < 0 )
     {
-	g_debug ("Failed to open device : %s", device);
-	return FALSE;
+        g_debug ("Failed to open device : %s", device);
+        return FALSE;
     }
     
     if ( (drive = ioctl (fd, CDROM_DRIVE_STATUS, NULL)) )
     {
-	if ( drive == CDS_DRIVE_NOT_READY )
-	{
-	    g_debug ("Drive :%s is not yet ready\n", device);
-	}
-	else if ( drive == CDS_DISC_OK )
-	{
-	    if ( (drive = ioctl (fd, CDROM_DISC_STATUS, NULL)) > 0 )
-	    {
-		if ( drive == CDS_AUDIO )
-		{
-		    ret_val = TRUE;
-		}
-	    }
-	}
+        if ( drive == CDS_DRIVE_NOT_READY )
+        {
+            g_debug ("Drive :%s is not yet ready\n", device);
+        }
+        else if ( drive == CDS_DISC_OK )
+        {
+            if ( (drive = ioctl (fd, CDROM_DISC_STATUS, NULL)) > 0 )
+            {
+                if ( drive == CDS_AUDIO )
+                {
+                    ret_val = TRUE;
+                }
+            }
+        }
     }
     
     close (fd);
@@ -491,49 +491,49 @@ parole_guess_uri_from_mount (GMount *mount)
     
     if ( g_file_has_uri_scheme (file, "cdda") )
     {
-	uri = g_strdup ("cdda://");
+        uri = g_strdup ("cdda://");
     }
     else
     {
-	gchar **content_type;
-	int i;
-	
-	content_type = g_content_type_guess_for_tree (file);
-    
-	for ( i = 0; content_type && content_type[i]; i++)
-	{
-	    TRACE ("Checking disc content type : %s", content_type[i]);
-		
-	    if ( !g_strcmp0 (content_type[i], "x-content/video-dvd") )
-	    {
-		uri = g_strdup ("dvd:/");
-		break;
-	    }
-	    else if ( !g_strcmp0 (content_type[i], "x-content/video-vcd") )
-	    {
-		uri = g_strdup ("vcd:/");
-		break;
-	    }
-	    else if ( !g_strcmp0 (content_type[i], "x-content/video-svcd") )
-	    {
-		uri = g_strdup ("svcd:/");
-		break;
-	    }
-	    else if ( !g_strcmp0 (content_type[i], "x-content/audio-cdda") )
-	    {
-		uri = g_strdup ("cdda://");
-		break;
-	    }
-	}
-	
-	if ( content_type )
-	    g_strfreev (content_type);
+        gchar **content_type;
+        int i;
+        
+        content_type = g_content_type_guess_for_tree (file);
+        
+        for ( i = 0; content_type && content_type[i]; i++)
+        {
+            TRACE ("Checking disc content type : %s", content_type[i]);
+            
+            if ( !g_strcmp0 (content_type[i], "x-content/video-dvd") )
+            {
+                uri = g_strdup ("dvd:/");
+                break;
+            }
+            else if ( !g_strcmp0 (content_type[i], "x-content/video-vcd") )
+            {
+                uri = g_strdup ("vcd:/");
+                break;
+            }
+            else if ( !g_strcmp0 (content_type[i], "x-content/video-svcd") )
+            {
+                uri = g_strdup ("svcd:/");
+                break;
+            }
+            else if ( !g_strcmp0 (content_type[i], "x-content/audio-cdda") )
+            {
+                uri = g_strdup ("cdda://");
+                break;
+            }
+        }
+        
+        if ( content_type )
+            g_strfreev (content_type);
     }
     
     g_object_unref (file);
     
     TRACE ("Got uri=%s for mount=%s", uri, g_mount_get_name (mount));
-	   
+       
     return uri;
 }
 
@@ -547,12 +547,12 @@ parole_get_uri_from_unix_device (const gchar *device)
     gchar *uri = NULL;
     
     if ( device == NULL )
-	return NULL;
-	
+        return NULL;
+    
     /*Check for cdda */
     if ( parole_device_has_cdda (device) )
     {
-	return g_strdup ("cdda://");
+        return g_strdup ("cdda://");
     }
     
     monitor = g_volume_monitor_get ();
@@ -563,36 +563,36 @@ parole_get_uri_from_unix_device (const gchar *device)
     
     for ( i = 0; i < len; i++)
     {
-	GVolume *volume;
-	GDrive *drive;
-	
-	volume = g_list_nth_data (list, i);
-	
-	drive = g_volume_get_drive (volume);
-	
-	if ( g_drive_can_eject (drive) && g_drive_has_media (drive) )
-	{
-	    gchar *unix_device;
-	    unix_device = g_volume_get_identifier (volume, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE);
-
-	    if ( !g_strcmp0 (unix_device, device) )
-	    {
-		GMount *mount;
-		mount = g_volume_get_mount (volume);
-		
-		if ( mount )
-		{
-		    uri = parole_guess_uri_from_mount (mount);
-		    g_object_unref (mount);
-		    g_object_unref (drive);
-		    g_free (unix_device);
-		    break;
-		}
-	    }
-	    g_free (unix_device);
-	}
-	
-	g_object_unref (drive);
+        GVolume *volume;
+        GDrive *drive;
+        
+        volume = g_list_nth_data (list, i);
+        
+        drive = g_volume_get_drive (volume);
+        
+        if ( g_drive_can_eject (drive) && g_drive_has_media (drive) )
+        {
+            gchar *unix_device;
+            unix_device = g_volume_get_identifier (volume, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE);
+
+            if ( !g_strcmp0 (unix_device, device) )
+            {
+                GMount *mount;
+                mount = g_volume_get_mount (volume);
+                
+                if ( mount )
+                {
+                    uri = parole_guess_uri_from_mount (mount);
+                    g_object_unref (mount);
+                    g_object_unref (drive);
+                    g_free (unix_device);
+                    break;
+                }
+            }
+            g_free (unix_device);
+        }
+        
+        g_object_unref (drive);
     }
     
     g_list_foreach (list, (GFunc) g_object_unref, NULL);
diff --git a/src/parole-utils.h b/src/parole-utils.h
index 07d2ebc..63a7741 100644
--- a/src/parole-utils.h
+++ b/src/parole-utils.h
@@ -28,32 +28,32 @@
 
 #include <src/misc/parole-file.h>
 
-gint            thunar_file_compare_by_name 		(ParoleFile *file_a,
-							 ParoleFile *file_b,
-							 gboolean         case_sensitive);
+gint        thunar_file_compare_by_name         (ParoleFile *file_a,
+                                                 ParoleFile *file_b,
+                                                 gboolean    case_sensitive);
 
-gchar          *parole_get_name_without_extension 	(const gchar *name) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+gchar      *parole_get_name_without_extension   (const gchar *name) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
 
-gchar          *parole_get_subtitle_path		(const gchar *uri) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+gchar      *parole_get_subtitle_path            (const gchar *uri) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
 
-gboolean	parole_is_uri_disc			(const gchar *uri);
+gboolean    parole_is_uri_disc                  (const gchar *uri);
 
-GdkPixbuf      *parole_icon_load			(const gchar *icon_name,
-							 gint size);
+GdkPixbuf  *parole_icon_load                    (const gchar *icon_name,
+                                                 gint size);
 
-void		parole_get_media_files			(GtkFileFilter *filter,
-							 const gchar *path,
-							 gboolean recursive,
-							 GSList **list);
-							 
-gboolean	parole_device_has_cdda 			(const gchar *device);
+void        parole_get_media_files              (GtkFileFilter *filter,
+                                                 const gchar *path,
+                                                 gboolean recursive,
+                                                 GSList **list);
+                             
+gboolean    parole_device_has_cdda              (const gchar *device);
 
-gchar 	       *parole_guess_uri_from_mount 		(GMount *mount);
-							 
-gchar          *parole_get_uri_from_unix_device		(const gchar *device);
+gchar      *parole_guess_uri_from_mount         (GMount *mount);
+                             
+gchar      *parole_get_uri_from_unix_device     (const gchar *device);
 
-gchar          *parole_format_media_length              (gint total_seconds);
+gchar      *parole_format_media_length          (gint total_seconds);
 
-gchar          *parole_taglibc_get_media_length         (ParoleFile *file);
+gchar      *parole_taglibc_get_media_length     (ParoleFile *file);
 
 #endif /* __PAROLE_UTILS_ */
diff --git a/src/parole-vis.c b/src/parole-vis.c
index 32d78c5..d206457 100644
--- a/src/parole-vis.c
+++ b/src/parole-vis.c
@@ -39,13 +39,13 @@ parole_vis_filter (GstPluginFeature *feature, gpointer data)
     GstElementFactory *factory;
     
     if ( !GST_IS_ELEMENT_FACTORY (feature) )
-	return FALSE;
-	
+        return FALSE;
+    
     factory = GST_ELEMENT_FACTORY (feature);
     
     if ( !g_strrstr (gst_element_factory_get_klass (factory), "Visualization"))
-	return FALSE;
-	
+        return FALSE;
+    
     return TRUE;
 }
 
@@ -67,10 +67,10 @@ GHashTable *parole_vis_get_plugins (void)
 #else
     plugins = gst_registry_feature_filter (gst_registry_get_default (),
 #endif
-					   parole_vis_filter,
-					   FALSE,
-					   NULL);
-					   
+                                           parole_vis_filter,
+                                           FALSE,
+                                           NULL);
+                       
     g_list_foreach (plugins, (GFunc) parole_vis_get_name, &hash);
     
     gst_plugin_feature_list_free (plugins);
diff --git a/src/parole-vis.h b/src/parole-vis.h
index f9b9fb7..66a46f2 100644
--- a/src/parole-vis.h
+++ b/src/parole-vis.h
@@ -26,6 +26,6 @@
 #include <gst/gst.h>
 #include <glib.h>
 
-GHashTable        *parole_vis_get_plugins			(void);
+GHashTable        *parole_vis_get_plugins           (void);
 
 #endif /* __PAROLE_VIS_H_ */
diff --git a/src/plugins/notify/notify-plugin.c b/src/plugins/notify/notify-plugin.c
index 8fc83c4..ebf7bb2 100644
--- a/src/plugins/notify/notify-plugin.c
+++ b/src/plugins/notify/notify-plugin.c
@@ -26,12 +26,12 @@
 
 #include "notify-provider.h"
 
-G_MODULE_EXPORT GType	parole_plugin_initialize (ParoleProviderPlugin *plugin);
-						  
-G_MODULE_EXPORT void	parole_plugin_shutdown   (void);
+G_MODULE_EXPORT GType       parole_plugin_initialize (ParoleProviderPlugin *plugin);
+                          
+G_MODULE_EXPORT void        parole_plugin_shutdown   (void);
 
 G_MODULE_EXPORT GType
-parole_plugin_initialize (ParoleProviderPlugin *plugin)
+parole_plugin_initialize    (ParoleProviderPlugin *plugin)
 {
     xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
     
diff --git a/src/plugins/notify/notify-provider.c b/src/plugins/notify/notify-provider.c
index 9f0f1f2..d04ac19 100644
--- a/src/plugins/notify/notify-provider.c
+++ b/src/plugins/notify/notify-provider.c
@@ -49,11 +49,11 @@ struct _NotifyProvider
     NotifyNotification     *notification;
 };
 
-PAROLE_DEFINE_TYPE_WITH_CODE (NotifyProvider, 
-                        notify_provider, 
-                        G_TYPE_OBJECT,
-                        PAROLE_IMPLEMENT_INTERFACE (PAROLE_TYPE_PROVIDER_PLUGIN, 
-					    notify_provider_iface_init));
+PAROLE_DEFINE_TYPE_WITH_CODE   (NotifyProvider, 
+                                notify_provider, 
+                                G_TYPE_OBJECT,
+                                PAROLE_IMPLEMENT_INTERFACE (PAROLE_TYPE_PROVIDER_PLUGIN, 
+                                notify_provider_iface_init));
 
 static void
 notification_closed_cb (NotifyNotification *n, NotifyProvider *notify)
@@ -67,15 +67,15 @@ close_notification (NotifyProvider *notify)
 {
     if ( notify->notification )
     {
-	GError *error = NULL;
-	notify_notification_close (notify->notification, &error);
-	if ( error )
-	{
-	    g_warning ("Failed to close notification : %s", error->message);
-	    g_error_free (error);
-	}
-	g_object_unref (notify->notification);
-	notify->notification = NULL;
+        GError *error = NULL;
+        notify_notification_close (notify->notification, &error);
+        if ( error )
+        {
+            g_warning ("Failed to close notification : %s", error->message);
+            g_error_free (error);
+        }
+        g_object_unref (notify->notification);
+        notify->notification = NULL;
     }
 }
 
@@ -89,41 +89,41 @@ notify_playing (NotifyProvider *notify, const ParoleStream *stream)
     ParoleMediaType media_type;
     
     g_object_get (G_OBJECT (stream), 
-		  "title", &title,
-		  "album", &album,
-		  "artist", &artist,
-		  "year", &year,
-		  "has-video", &has_video,
-          "media-type", &media_type,	
-          "uri", &stream_uri,  
-		  NULL);
-		  
+                  "title", &title,
+                  "album", &album,
+                  "artist", &artist,
+                  "year", &year,
+                  "has-video", &has_video,
+                  "media-type", &media_type,    
+                  "uri", &stream_uri,  
+                  NULL);
+          
     if ( g_strcmp0(stream_uri, notify->last_played_uri) == 0 )
-    return;
+        return;
     
     notify->last_played_uri = g_strdup(stream_uri);
     g_free(stream_uri);
-		  
+          
     if ( has_video )
-    return;
+        return;
 
     if ( !title )
     {
-	gchar *uri;
-	gchar *filename;
-	g_object_get (G_OBJECT (stream),
-		      "uri", &uri,
-		      NULL);
-		      
-	filename = g_filename_from_uri (uri, NULL, NULL);
-	g_free (uri);
-	if ( filename )
-	{
-	    title  = g_path_get_basename (filename);
-	    g_free (filename);
-	    if ( !title )
-		return;
-	}
+        gchar *uri;
+        gchar *filename;
+        g_object_get (G_OBJECT (stream),
+                      "uri", &uri,
+                      NULL);
+                  
+        filename = g_filename_from_uri (uri, NULL, NULL);
+        g_free (uri);
+        if ( filename )
+        {
+            title  = g_path_get_basename (filename);
+            g_free (filename);
+            if ( !title )
+            return;
+        }
     }
     
     if (!album)
@@ -132,11 +132,11 @@ notify_playing (NotifyProvider *notify, const ParoleStream *stream)
         artist = g_strdup( _("Unknown Artist") );
     
     if (!year)
-    message = g_strdup_printf ("%s %s\n%s %s", _("<i>on</i>"), album, _("<i>by</i>"), artist);
+        message = g_strdup_printf ("%s %s\n%s %s", _("<i>on</i>"), album, _("<i>by</i>"), artist);
     else
     {
-    message = g_strdup_printf ("%s %s (%s)\n%s %s", _("<i>on</i>"), album, year, _("<i>by</i>"), artist);
-    g_free(year);
+        message = g_strdup_printf ("%s %s (%s)\n%s %s", _("<i>on</i>"), album, year, _("<i>by</i>"), artist);
+        g_free(year);
     }
     
     g_free(artist);
@@ -172,25 +172,25 @@ notify_playing (NotifyProvider *notify, const ParoleStream *stream)
 
     if ( pix )
     {
-	notify_notification_set_icon_from_pixbuf (notify->notification, pix);
-	g_object_unref (pix);
+        notify_notification_set_icon_from_pixbuf (notify->notification, pix);
+        g_object_unref (pix);
     }
     notify_notification_set_urgency (notify->notification, NOTIFY_URGENCY_LOW);
     notify_notification_set_timeout (notify->notification, 5000);
     
     notify_notification_show (notify->notification, NULL);
     g_signal_connect (notify->notification, "closed",
-		      G_CALLBACK (notification_closed_cb), notify);
+                      G_CALLBACK (notification_closed_cb), notify);
 }
 
 static void
 state_changed_cb (ParoleProviderPlayer *player, const ParoleStream *stream, ParoleState state, NotifyProvider *notify)
 {
     if ( state == PAROLE_STATE_PLAYING )
-	    notify_playing (notify, stream);
-	    
+        notify_playing (notify, stream);
+        
     else if ( state <= PAROLE_STATE_PAUSED )
-	    close_notification (notify);
+        close_notification (notify);
 }
 
 static gboolean notify_provider_is_configurable (ParoleProviderPlugin *plugin)
@@ -209,9 +209,9 @@ notify_provider_set_player (ParoleProviderPlugin *plugin, ParoleProviderPlayer *
 
     notify->notification = NULL;
     notify_init ("parole-notify");
-				  
+                  
     g_signal_connect (player, "state_changed", 
-		      G_CALLBACK (state_changed_cb), notify);
+                      G_CALLBACK (state_changed_cb), notify);
 }
 
 static void
diff --git a/src/plugins/notify/notify-provider.h b/src/plugins/notify/notify-provider.h
index 3771211..26234d0 100644
--- a/src/plugins/notify/notify-provider.h
+++ b/src/plugins/notify/notify-provider.h
@@ -35,9 +35,9 @@ typedef struct _NotifyProvider      NotifyProvider;
 #define NOTIFY_IS_PROVIDER_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), NOTIFY_TYPE_PROVIDER))
 #define NOTIFY_PROVIDER_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), NOTIFY_TYPE_PROVIDER, NotifyProviderClass))
 
-GType notify_provider_get_type      	(void) G_GNUC_CONST G_GNUC_INTERNAL;
+GType notify_provider_get_type           (void) G_GNUC_CONST G_GNUC_INTERNAL;
 
-void  notify_provider_register_type	(ParoleProviderPlugin *provider);
+void  notify_provider_register_type (ParoleProviderPlugin *provider);
 
 G_END_DECLS
 
diff --git a/src/plugins/sample/sample-plugin.c b/src/plugins/sample/sample-plugin.c
index 2faa298..f842459 100644
--- a/src/plugins/sample/sample-plugin.c
+++ b/src/plugins/sample/sample-plugin.c
@@ -26,9 +26,9 @@
 
 #include "sample-provider.h"
 
-G_MODULE_EXPORT GType	parole_plugin_initialize (ParoleProviderPlugin *plugin);
-						  
-G_MODULE_EXPORT void	parole_plugin_shutdown   (void);
+G_MODULE_EXPORT GType   parole_plugin_initialize (ParoleProviderPlugin *plugin);
+                          
+G_MODULE_EXPORT void    parole_plugin_shutdown   (void);
 
 G_MODULE_EXPORT GType
 parole_plugin_initialize (ParoleProviderPlugin *plugin)
diff --git a/src/plugins/sample/sample-provider.c b/src/plugins/sample/sample-provider.c
index 2a9ca0d..b786155 100644
--- a/src/plugins/sample/sample-provider.c
+++ b/src/plugins/sample/sample-provider.c
@@ -24,8 +24,8 @@
 
 #include "sample-provider.h"
 
-static void   sample_provider_iface_init 	   (ParoleProviderPluginIface *iface);
-static void   sample_provider_finalize             (GObject 	              *object);
+static void   sample_provider_iface_init       (ParoleProviderPluginIface *iface);
+static void   sample_provider_finalize             (GObject                   *object);
 
 
 struct _SampleProviderClass
@@ -35,16 +35,16 @@ struct _SampleProviderClass
 
 struct _SampleProvider
 {
-    GObject      parent;
-    ParoleProviderPlayer *player;
+    GObject                 parent;
+    ParoleProviderPlayer   *player;
 };
 
-PAROLE_DEFINE_TYPE_WITH_CODE (SampleProvider, 
-			      sample_provider, 
-			      G_TYPE_OBJECT,
-			      PAROLE_IMPLEMENT_INTERFACE (PAROLE_TYPE_PROVIDER_PLUGIN, 
-							  sample_provider_iface_init));
-							  
+PAROLE_DEFINE_TYPE_WITH_CODE   (SampleProvider, 
+                                sample_provider, 
+                                G_TYPE_OBJECT,
+                                PAROLE_IMPLEMENT_INTERFACE (PAROLE_TYPE_PROVIDER_PLUGIN, 
+                                sample_provider_iface_init));
+                              
 static gboolean sample_provider_is_configurable (ParoleProviderPlugin *plugin)
 {
     return FALSE;
diff --git a/src/plugins/sample/sample-provider.h b/src/plugins/sample/sample-provider.h
index eb01100..393d057 100644
--- a/src/plugins/sample/sample-provider.h
+++ b/src/plugins/sample/sample-provider.h
@@ -35,9 +35,9 @@ typedef struct _SampleProvider      SampleProvider;
 #define SAMPLE_IS_PROVIDER_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), SAMPLE_TYPE_PROVIDER))
 #define SAMPLE_PROVIDER_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), SAMPLE_TYPE_PROVIDER, SampleProviderClass))
 
-GType sample_provider_get_type      	(void) G_GNUC_CONST G_GNUC_INTERNAL;
+GType sample_provider_get_type          (void) G_GNUC_CONST G_GNUC_INTERNAL;
 
-void  sample_provider_register_type	(ParoleProviderPlugin *plugin);
+void  sample_provider_register_type (ParoleProviderPlugin *plugin);
 
 G_END_DECLS
 
diff --git a/src/plugins/tray/tray-plugin.c b/src/plugins/tray/tray-plugin.c
index 402427b..2d98f50 100644
--- a/src/plugins/tray/tray-plugin.c
+++ b/src/plugins/tray/tray-plugin.c
@@ -26,9 +26,9 @@
 
 #include "tray-provider.h"
 
-G_MODULE_EXPORT GType	parole_plugin_initialize (ParoleProviderPlugin *plugin);
-						  
-G_MODULE_EXPORT void	parole_plugin_shutdown   (void);
+G_MODULE_EXPORT GType   parole_plugin_initialize (ParoleProviderPlugin *plugin);
+                          
+G_MODULE_EXPORT void    parole_plugin_shutdown   (void);
 
 G_MODULE_EXPORT GType
 parole_plugin_initialize (ParoleProviderPlugin *plugin)
diff --git a/src/plugins/tray/tray-provider.c b/src/plugins/tray/tray-provider.c
index 613dc35..b3f6d1f 100644
--- a/src/plugins/tray/tray-provider.c
+++ b/src/plugins/tray/tray-provider.c
@@ -34,8 +34,8 @@
 
 #include "tray-provider.h"
 
-static void   tray_provider_iface_init 	   (ParoleProviderPluginIface *iface);
-static void   tray_provider_finalize       (GObject 	              *object);
+static void   tray_provider_iface_init     (ParoleProviderPluginIface *iface);
+static void   tray_provider_finalize       (GObject                   *object);
 
 
 struct _TrayProviderClass
@@ -55,12 +55,12 @@ struct _TrayProvider
     GtkWidget              *menu;
 };
 
-PAROLE_DEFINE_TYPE_WITH_CODE (TrayProvider, 
-                        tray_provider, 
-                        G_TYPE_OBJECT,
-                        PAROLE_IMPLEMENT_INTERFACE (PAROLE_TYPE_PROVIDER_PLUGIN, 
-					    tray_provider_iface_init));
-	
+PAROLE_DEFINE_TYPE_WITH_CODE   (TrayProvider, 
+                                tray_provider, 
+                                G_TYPE_OBJECT,
+                                PAROLE_IMPLEMENT_INTERFACE (PAROLE_TYPE_PROVIDER_PLUGIN, 
+                                tray_provider_iface_init));
+    
 static void
 menu_selection_done_cb (TrayProvider *tray)
 {
@@ -89,9 +89,9 @@ play_pause_activated_cb (TrayProvider *tray)
     menu_selection_done_cb (tray);
     
     if ( tray->state == PAROLE_STATE_PLAYING )
-	parole_provider_player_pause (tray->player);
+        parole_provider_player_pause (tray->player);
     else if ( tray->state == PAROLE_STATE_PAUSED )
-	parole_provider_player_resume (tray->player);
+        parole_provider_player_resume (tray->player);
 }
 
 static void
@@ -112,7 +112,7 @@ popup_menu_cb (GtkStatusIcon *icon, guint button,
      * Play pause.
      */
     mi = gtk_image_menu_item_new_from_stock (tray->state == PAROLE_STATE_PLAYING ? GTK_STOCK_MEDIA_PAUSE : 
-					     GTK_STOCK_MEDIA_PLAY, NULL);
+                                             GTK_STOCK_MEDIA_PLAY, NULL);
     gtk_widget_set_sensitive (mi, TRUE);
     gtk_widget_show (mi);
     g_signal_connect_swapped (mi, "activate", G_CALLBACK (play_pause_activated_cb), tray);
@@ -147,7 +147,7 @@ popup_menu_cb (GtkStatusIcon *icon, guint button,
                     icon, button, activate_time);
 
     g_signal_connect_swapped (menu, "selection-done",
-			      G_CALLBACK (menu_selection_done_cb), tray);
+                  G_CALLBACK (menu_selection_done_cb), tray);
 
     tray->menu = menu;
 }
@@ -155,10 +155,7 @@ popup_menu_cb (GtkStatusIcon *icon, guint button,
 static void
 tray_activate_cb (GtkStatusIcon *tray_icon, TrayProvider *tray)
 {
-    if ( gtk_widget_get_visible (tray->window) )
-	gtk_widget_hide (tray->window);
-    else
-	gtk_widget_show (tray->window);
+    gtk_widget_set_visible( tray->window, gtk_widget_get_visible (tray->window) );
 }
 
 static void
@@ -168,9 +165,9 @@ state_changed_cb (ParoleProviderPlayer *player, const ParoleStream *stream, Paro
     
     if ( tray->menu )
     {
-	gtk_widget_destroy (tray->menu);
-	tray->menu = NULL;
-	g_signal_emit_by_name (G_OBJECT (tray->tray), "popup-menu", 0, gtk_get_current_event_time ());
+        gtk_widget_destroy (tray->menu);
+        tray->menu = NULL;
+        g_signal_emit_by_name (G_OBJECT (tray->tray), "popup-menu", 0, gtk_get_current_event_time ());
     }
 }
 
@@ -226,12 +223,12 @@ configure_plugin (TrayProvider *tray, GtkWidget *widget)
     GtkWidget *hide_on_delete;
     gboolean hide_on_delete_b;
     
-    dialog = gtk_dialog_new_with_buttons (_("Tray icon plugin"), 
-					  GTK_WINDOW (widget),
-					  GTK_DIALOG_DESTROY_WITH_PARENT,
-					  GTK_STOCK_CLOSE,
-                                          GTK_RESPONSE_CANCEL,
-                                          NULL);
+    dialog = gtk_dialog_new_with_buttons   (_("Tray icon plugin"), 
+                                            GTK_WINDOW (widget),
+                                            GTK_DIALOG_DESTROY_WITH_PARENT,
+                                            GTK_STOCK_CLOSE,
+                                            GTK_RESPONSE_CANCEL,
+                                            NULL);
 
     content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
 
@@ -240,12 +237,12 @@ configure_plugin (TrayProvider *tray, GtkWidget *widget)
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (hide_on_delete), hide_on_delete_b);
     
     g_signal_connect (hide_on_delete, "toggled",
-		      G_CALLBACK (hide_on_delete_toggled_cb), NULL);
+              G_CALLBACK (hide_on_delete_toggled_cb), NULL);
     
     gtk_box_pack_start (GTK_BOX (content_area), hide_on_delete, TRUE, TRUE, 0);
-	
+    
     g_signal_connect (dialog, "response",
-		      G_CALLBACK (gtk_widget_destroy), NULL);
+              G_CALLBACK (gtk_widget_destroy), NULL);
     
     gtk_widget_show_all (dialog);
 }
@@ -272,20 +269,20 @@ delete_event_cb (GtkWidget *widget, GdkEvent *ev, TrayProvider *tray)
     
     if ( confirmed )
     {
-	return minimize_to_tray ? gtk_widget_hide_on_delete (widget) : FALSE;
+        return minimize_to_tray ? gtk_widget_hide_on_delete (widget) : FALSE;
     }
 
-	dialog = gtk_message_dialog_new(GTK_WINDOW(widget),
-	                                GTK_DIALOG_MODAL,
-	                                GTK_MESSAGE_QUESTION,
-	                                GTK_BUTTONS_NONE,
-	                                NULL);
-	                                
+    dialog = gtk_message_dialog_new(GTK_WINDOW(widget),
+                                    GTK_DIALOG_MODAL,
+                                    GTK_MESSAGE_QUESTION,
+                                    GTK_BUTTONS_NONE,
+                                    NULL);
+                                    
     gtk_message_dialog_set_markup  (GTK_MESSAGE_DIALOG(dialog),
                                     g_strdup_printf("<big><b>%s</b></big>", _("Are you sure you want to quit?")));
                                     
     gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG(dialog),
-        _("Parole can be minimized to the system tray instead."));
+            _("Parole can be minimized to the system tray instead."));
     
     minimize = gtk_dialog_add_button(   GTK_DIALOG(dialog),
                                         _("Minimize to tray"),
@@ -309,34 +306,34 @@ delete_event_cb (GtkWidget *widget, GdkEvent *ev, TrayProvider *tray)
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), FALSE);
     
     g_signal_connect (check, "toggled",
-		      G_CALLBACK (action_on_hide_confirmed_cb), NULL);
+              G_CALLBACK (action_on_hide_confirmed_cb), NULL);
          
     gtk_box_pack_start (GTK_BOX (content_area), check, TRUE, TRUE, 0);
-			         
+                     
     gtk_widget_show_all( GTK_WIDGET(dialog) );
 
     switch ( gtk_dialog_run (GTK_DIALOG (dialog)) )
     {
-	case GTK_RESPONSE_OK:
-	    {
-		gtk_widget_hide_on_delete (widget);
-		confirmed = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check));
-		if ( confirmed )
-		    write_entry_bool ("minimize-to-tray", TRUE);
-		break;
-	    }
-	case GTK_RESPONSE_CLOSE:
-	    {
-		confirmed = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check));
-		if ( confirmed )
-		    write_entry_bool ("minimize-to-tray", FALSE);
-		ret_val = FALSE;
-	    }
-	    break;
-	case GTK_RESPONSE_CANCEL:
-	    break;
-	default:
-	    break;
+        case GTK_RESPONSE_OK:
+            {
+            gtk_widget_hide_on_delete (widget);
+            confirmed = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check));
+            if ( confirmed )
+                write_entry_bool ("minimize-to-tray", TRUE);
+            break;
+            }
+        case GTK_RESPONSE_CLOSE:
+            {
+            confirmed = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check));
+            if ( confirmed )
+                write_entry_bool ("minimize-to-tray", FALSE);
+            ret_val = FALSE;
+            }
+            break;
+        case GTK_RESPONSE_CANCEL:
+            break;
+        default:
+            break;
     }
     
     gtk_widget_destroy (dialog);
@@ -374,21 +371,21 @@ tray_provider_set_player (ParoleProviderPlugin *plugin, ParoleProviderPlayer *pl
     
     if ( pix )
     {
-	gtk_status_icon_set_from_pixbuf (tray->tray, pix);
-	g_object_unref (pix);
+        gtk_status_icon_set_from_pixbuf (tray->tray, pix);
+        g_object_unref (pix);
     }
     
     g_signal_connect (tray->tray, "popup-menu",
-		      G_CALLBACK (popup_menu_cb), tray);
+              G_CALLBACK (popup_menu_cb), tray);
     
     g_signal_connect (tray->tray, "activate",
-		      G_CALLBACK (tray_activate_cb), tray);
+              G_CALLBACK (tray_activate_cb), tray);
     
     tray->sig = g_signal_connect (tray->window, "delete-event",
-			          G_CALLBACK (delete_event_cb), NULL);
-				  
+              G_CALLBACK (delete_event_cb), NULL);
+                  
     g_signal_connect (player, "state_changed", 
-		      G_CALLBACK (state_changed_cb), tray);
+              G_CALLBACK (state_changed_cb), tray);
 }
 
 static void
@@ -426,7 +423,7 @@ static void tray_provider_finalize (GObject *object)
     tray = TRAY_PROVIDER (object);
     
     if ( GTK_IS_WIDGET (tray->window) && g_signal_handler_is_connected (tray->window, tray->sig) )
-	g_signal_handler_disconnect (tray->window, tray->sig);
+        g_signal_handler_disconnect (tray->window, tray->sig);
 
     g_object_unref (G_OBJECT (tray->tray));
     
diff --git a/src/plugins/tray/tray-provider.h b/src/plugins/tray/tray-provider.h
index cc90e62..0a83558 100644
--- a/src/plugins/tray/tray-provider.h
+++ b/src/plugins/tray/tray-provider.h
@@ -35,9 +35,9 @@ typedef struct _TrayProvider      TrayProvider;
 #define TRAY_IS_PROVIDER_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), TRAY_TYPE_PROVIDER))
 #define TRAY_PROVIDER_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), TRAY_TYPE_PROVIDER, TrayProviderClass))
 
-GType tray_provider_get_type      	(void) G_GNUC_CONST G_GNUC_INTERNAL;
+GType tray_provider_get_type        (void) G_GNUC_CONST G_GNUC_INTERNAL;
 
-void  tray_provider_register_type	(ParoleProviderPlugin *provider);
+void  tray_provider_register_type   (ParoleProviderPlugin *provider);
 
 G_END_DECLS
 


More information about the Xfce4-commits mailing list