# HG changeset patch
# User yaz
# Date 1173407600 28800
# Node ID deb09bfd716b43f2779e15bebe6a279e186b8026
# Parent  0280eb67fd5d36a4acd8ea01d043f4994773c645
[svn] - now sort by track number and sort by title work even if on display metadata loading is specified.

diff -r 0280eb67fd5d -r deb09bfd716b ChangeLog
--- a/ChangeLog	Wed Mar 07 16:26:51 2007 -0800
+++ b/ChangeLog	Thu Mar 08 18:33:20 2007 -0800
@@ -1,3 +1,10 @@
+2007-03-08 00:26:51 +0000  Giacomo Lozito <james@develia.org>
+  revision [4236]
+  - use gdk_get_default_root_window in place of NULL for gdk_window_get_pointer
+  trunk/src/audacious/ui_fileinfopopup.c |    2 +-
+  1 file changed, 1 insertion(+), 1 deletion(-)
+
+
 2007-03-07 03:04:48 +0000  Kiyoshi Aman <kiyoshi.aman@gmail.com>
   revision [4234]
   remove autotools macros that aren't used in audacious core any more
diff -r 0280eb67fd5d -r deb09bfd716b src/audacious/build_stamp.c
--- a/src/audacious/build_stamp.c	Wed Mar 07 16:26:51 2007 -0800
+++ b/src/audacious/build_stamp.c	Thu Mar 08 18:33:20 2007 -0800
@@ -1,2 +1,2 @@
 #include <glib.h>
-const gchar *svn_stamp = "20070307-4234";
+const gchar *svn_stamp = "20070308-4236";
diff -r 0280eb67fd5d -r deb09bfd716b src/audacious/playlist.c
--- a/src/audacious/playlist.c	Wed Mar 07 16:26:51 2007 -0800
+++ b/src/audacious/playlist.c	Thu Mar 08 18:33:20 2007 -0800
@@ -1926,10 +1926,16 @@
     g_return_val_if_fail(a != NULL, 0);
     g_return_val_if_fail(b != NULL, 0);
 
+    if(!a->tuple)
+        playlist_entry_get_info(a);
+    if(!b->tuple)
+        playlist_entry_get_info(b);
+
     g_return_val_if_fail(a->tuple != NULL, 0);
     g_return_val_if_fail(b->tuple != NULL, 0);
 
-    return (a->tuple->track_number - b->tuple->track_number);
+    return (a->tuple->track_number && b->tuple->track_number ?
+	    a->tuple->track_number - b->tuple->track_number : 0);
 }
 
 static gint
@@ -1971,6 +1977,11 @@
     g_return_val_if_fail(a != NULL, 0);
     g_return_val_if_fail(b != NULL, 0);
 
+    if(!a->tuple)
+        playlist_entry_get_info(a);
+    if(!b->tuple)
+        playlist_entry_get_info(b);
+
     if (a->tuple != NULL && a->tuple->track_name != NULL)
         a_title = a->tuple->track_name;
     if (b->tuple != NULL && b->tuple->track_name != NULL)