--- a/src/playlist.c
+++ b/src/playlist.c
@@ -471,7 +471,7 @@
 
       if (!strcasecmp (node->name, "SETTINGS"))
       {
-        /* gxine-specific */
+	/* gxine-specific */
 	gtk_toggle_button_set_active
 	  (random_button, xml_parser_get_property_bool (node, "RANDOM", 0));
 	gtk_toggle_button_set_active
@@ -552,7 +552,7 @@
 
     fprintf
       (f, "<ASX VERSION=\"3.0\">\n"
-          "  <SETTINGS REPEAT='%s' REPEAT-TRACK='%s' RANDOM='%s'/>\n",
+	  "  <SETTINGS REPEAT='%s' REPEAT-TRACK='%s' RANDOM='%s'/>\n",
        tf[!!gtk_toggle_button_get_active (repeat_button)],
        tf[!!gtk_toggle_button_get_active (repeat_track_button)],
        tf[!!gtk_toggle_button_get_active (random_button)]);
@@ -614,7 +614,7 @@
       ((pos = playlist_clip (pos)) >= 0 /* nth item */
        && gtk_tree_model_iter_nth_child (pl_model, &iter, NULL, pos)))
     return peek_play_item (&iter);
-    
+
   else
     return NULL;
 }
@@ -703,7 +703,7 @@
   if (ins_pos < 0)
     for (i = 0; i < playlist_size (); ++i)
       if (!strcmp (playlist_get_item (i)->mrl, mrl))
-        return i;
+	return i;
 
   play_item = play_item_new (NULL, mrl, 0, 0);
   play_item_check_autoplay (play_item);
@@ -886,12 +886,12 @@
       }
 
       if (ins_pos < 0)
-        ins_pos = playlist_add (item, -1);
+	ins_pos = playlist_add (item, -1);
       else
-        playlist_add (item, ins_pos);
+	playlist_add (item, ins_pos);
 
       if (retval == -1)
-        retval = ins_pos;
+	retval = ins_pos;
 
       ++ins_pos;
       ++index;
@@ -949,8 +949,8 @@
       {
 	if (!info->node->child)
 	  continue;
-        info->data = 2;
-        pl_push (info);
+	info->data = 2;
+	pl_push (info);
       }
 
     case 2: /* SWITCH */
@@ -1192,10 +1192,10 @@
       /* look for mms:// in a line */
       if (strstr(lines[i], "mms://"))
       {
-        remove_trailing_cr (lines[i]);
-        /* add to playlist */
+	remove_trailing_cr (lines[i]);
+	/* add to playlist */
 	if (ret >= 0)
-          playlist_add_mrl (strstr(lines[i], "mms://"), ins_pos);
+	  playlist_add_mrl (strstr(lines[i], "mms://"), ins_pos);
 	else
 	  ret = playlist_add_mrl (strstr(lines[i], "mms://"), ins_pos);
       }
@@ -1699,7 +1699,7 @@
     {
       const char *colon = strchr (host, ':');
       if (colon >= at)
-        at = NULL;
+	at = NULL;
     }
 
     if (at)
@@ -1738,8 +1738,8 @@
     for (pos = 0; pos < playlist_size (); ++pos)
       if (!strcmp ((play_item = playlist_get_item (pos))->mrl, mrl))
       {
-        play_item->played = play_item->ignore = TRUE;
-        break;
+	play_item->played = play_item->ignore = TRUE;
+	break;
       }
   }
 
@@ -1915,39 +1915,39 @@
       switch (data->type)
       {
       default:
-        g_print (_("xine_event_cb: unknown XINE_MSG_*\n"));
+	g_print (_("xine_event_cb: unknown XINE_MSG_*\n"));
       case XINE_MSG_NO_ERROR:
       case XINE_MSG_AUDIO_OUT_UNAVAILABLE:
-        msg = display_info;
-        break;
-      
+	msg = display_info;
+	break;
+
       case XINE_MSG_ENCRYPTED_SOURCE:
-        msg = display_info_combinable;
-        break;
+	msg = display_info_combinable;
+	break;
 
       case XINE_MSG_GENERAL_WARNING:
       case XINE_MSG_NETWORK_UNREACHABLE:
-        msg = display_warning;
-        break;
+	msg = display_warning;
+	break;
 
       case 13 /* UNCOMMENTME: XINE_MSG_FILE_EMPTY */:
-        fallback = _("File is empty:"); /* missing in xine-lib < 1.1.2 */
+	fallback = _("File is empty:"); /* missing in xine-lib < 1.1.2 */
       case XINE_MSG_UNKNOWN_HOST:
-        msg = display_warning_combinable;
-        break;
+	msg = display_warning_combinable;
+	break;
 
       case XINE_MSG_LIBRARY_LOAD_ERROR:
       case XINE_MSG_SECURITY:
       case XINE_MSG_UNKNOWN_DEVICE:
-        msg = display_error;
-        break;
+	msg = display_error;
+	break;
 
       case XINE_MSG_READ_ERROR:
       case XINE_MSG_CONNECTION_REFUSED:
       case XINE_MSG_FILE_NOT_FOUND:
       case XINE_MSG_PERMISSION_ERROR:
-        msg = display_error_combinable;
-        break;
+	msg = display_error_combinable;
+	break;
 
 #ifdef XINE_MSG_AUTHENTICATION_NEEDED
       /* new in xine-lib 1.2 */
@@ -1975,7 +1975,7 @@
 	/**/;
       else if (data->num_parameters)
       {
-        int i;
+	int i;
 	const char *param = (char *)data + data->parameters;
 	char *txt = strdup ("");
 	for (i = 0; i < data->num_parameters; ++i)
@@ -2384,7 +2384,7 @@
       "<menuitem action='prev' />\n"
       "<menuitem action='next' />\n"
     "</popup>\n"
-  "</ui>"; 
+  "</ui>";
 
 static void sel_changed_cb (GtkTreeSelection *sel, gpointer data)
 {