# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1206672113 -7200
# Node ID a5382bae0eea470a8d0c21b4936e998ec9d1072e
# Parent  4060a83ebf1f88df139b8b3d80907a6930a982e2# Parent  3a9a83c95daf371c8b3ed721e66385872bda8378
Branch merge.

diff -r 4060a83ebf1f -r a5382bae0eea src/audacious/playlist.c
--- a/src/audacious/playlist.c	Fri Mar 28 02:43:25 2008 +0200
+++ b/src/audacious/playlist.c	Fri Mar 28 04:41:53 2008 +0200
@@ -756,6 +756,8 @@
     g_return_val_if_fail(playlist != NULL, FALSE);
     g_return_val_if_fail(filename != NULL, FALSE);
 
+    PLAYLIST_INCR_SERIAL(playlist);
+
     /* load playlist */
     if (is_playlist_name(filename)) {
         playlist->loading_playlist = TRUE;
@@ -2193,6 +2195,7 @@
     playlist->entries =
         g_list_sort(playlist->entries,
                     (GCompareFunc) playlist_compare_func_table[type]);
+    PLAYLIST_INCR_SERIAL(playlist);
     PLAYLIST_UNLOCK(playlist);
 }
 
@@ -2252,6 +2255,7 @@
     playlist->entries = playlist_sort_selected_generic(playlist->entries, (GCompareFunc)
                                                        playlist_compare_func_table
                                                        [type]);
+    PLAYLIST_INCR_SERIAL(playlist);
     PLAYLIST_UNLOCK(playlist);
 }
 
@@ -2260,6 +2264,7 @@
 {
     PLAYLIST_LOCK(playlist);
     playlist->entries = g_list_reverse(playlist->entries);
+    PLAYLIST_INCR_SERIAL(playlist);
     PLAYLIST_UNLOCK(playlist);
 }
 
@@ -2312,6 +2317,7 @@
 {
     PLAYLIST_LOCK(playlist);
     playlist->entries = playlist_shuffle_list(playlist, playlist->entries);
+    PLAYLIST_INCR_SERIAL(playlist);
     PLAYLIST_UNLOCK(playlist);
 }
 
@@ -2341,6 +2347,7 @@
     for (node = playlist->entries; node; node = g_list_next(node), i++) {
         PLAYLIST_ENTRY(node->data)->selected = FALSE;
     }
+    PLAYLIST_INCR_SERIAL(playlist);
     PLAYLIST_UNLOCK(playlist);
     playlist_recalc_total_time(playlist);
     playlist_manager_update();
diff -r 4060a83ebf1f -r a5382bae0eea src/audacious/ui_credits.c
--- a/src/audacious/ui_credits.c	Fri Mar 28 02:43:25 2008 +0200
+++ b/src/audacious/ui_credits.c	Fri Mar 28 04:41:53 2008 +0200
@@ -117,6 +117,7 @@
     "Valentine Sinitsyn",
     "Johan Tavelin",
     "Tim Yamin",
+    "Ivan N. Zlatev",
     NULL,
 
     N_("0.1.x developers:"),
diff -r 4060a83ebf1f -r a5382bae0eea src/audacious/ui_skinned_playlist.c
--- a/src/audacious/ui_skinned_playlist.c	Fri Mar 28 02:43:25 2008 +0200
+++ b/src/audacious/ui_skinned_playlist.c	Fri Mar 28 04:41:53 2008 +0200
@@ -303,6 +303,7 @@
             glist_moveup(list);
         list = g_list_next(list);
     }
+    PLAYLIST_INCR_SERIAL(playlist);
     PLAYLIST_UNLOCK(playlist);
     if (pl->prev_selected != -1)
         pl->prev_selected--;
@@ -338,6 +339,7 @@
         list = g_list_previous(list);
     }
 
+    PLAYLIST_INCR_SERIAL(playlist);
     PLAYLIST_UNLOCK(playlist);
 
     if (pl->prev_selected != -1)