Re: [Rhythmbox-devel] State Of The Rhythmbox]

[Yann Rouillard <y rouillard laposte net>]

Yann Rouillard a écrit :
> Ok, so no painful renaming task !
> Anyway my previous patch I for configure was not perfect, this new one 
> should work fine (the configure option is now 
> "--enable-gtktreemodelsort-workaround")
> Rhythmbox compiled with this workaround works fine for me but it would 
> be nice if other people could test it to be sure it doesn't cause bugs.
> 
> Yann
> 

Oops, I forgot to attach the patch, here it is.

Yann
? c
? lib/widgets/gtkintl.h
? lib/widgets/gtktreedatalist.c
? lib/widgets/gtktreedatalist.h
? lib/widgets/gtktreemodelsort.c
? lib/widgets/gtktreemodelsort.h
Index: configure.ac
===================================================================
RCS file: /cvs/gnome/rhythmbox/configure.ac,v
retrieving revision 1.6
diff -b -u -2 -r1.6 configure.ac
--- configure.ac	2 Aug 2003 01:32:20 -0000	1.6
+++ configure.ac	3 Aug 2003 22:48:48 -0000
@@ -38,4 +38,5 @@
 RHYTHMBOX_CFLAGS="$CFLAGS $RHYTHMBOX_CFLAGS"
 
+
 dnl Sound system
 WANT_XINE=
@@ -117,4 +118,19 @@
 fi
 
+
+dnl Workaround for the gtktreemodelsort bug
+
+AC_ARG_ENABLE(gtktreemodelsort_workaround,
+              AC_HELP_STRING([--enable-gtktreemodelsort-workaround],
+	                     [Enable use of a workaround for the gtk tree model sort bug which causes song jumping]),
+	      enable_gtktreemodelsort_workaround=yes)
+
+if test "x$enable_gtktreemodelsort_workaround" = "xyes"; then
+  AC_DEFINE(USE_GTK_TREE_MODEL_SORT_WORKAROUND,,[Define to enable the Gtk Tree Model Sort workaround])
+fi
+
+AM_CONDITIONAL(GTK_TREE_MODEL_SORT_WORKAROUND, test "x$enable_gtktreemodelsort_workaround" = "xyes")
+
+
 dnl Check for zlib
 
Index: lib/widgets/Makefile.am
===================================================================
RCS file: /cvs/gnome/rhythmbox/lib/widgets/Makefile.am,v
retrieving revision 1.28
diff -b -u -2 -r1.28 Makefile.am
--- lib/widgets/Makefile.am	31 Jul 2003 19:37:35 -0000	1.28
+++ lib/widgets/Makefile.am	3 Aug 2003 22:48:53 -0000
@@ -43,4 +43,14 @@
 	rb-tree-view-column.h
 
+
+if GTK_TREE_MODEL_SORT_WORKAROUND
+librbwidgets_la_SOURCES += gtktreemodelsort.c
+librbwidgets_la_SOURCES += gtktreemodelsort.h
+librbwidgets_la_SOURCES += gtktreedatalist.c
+librbwidgets_la_SOURCES += gtktreedatalist.h
+librbwidgets_la_SOURCES += gtkintl.h
+endif
+
+
 INCLUDES =						\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
Index: lib/widgets/rb-node-view.c
===================================================================
RCS file: /cvs/gnome/rhythmbox/lib/widgets/rb-node-view.c,v
retrieving revision 1.101
diff -b -u -2 -r1.101 rb-node-view.c
--- lib/widgets/rb-node-view.c	30 Jul 2003 23:26:31 -0000	1.101
+++ lib/widgets/rb-node-view.c	3 Aug 2003 22:49:01 -0000
@@ -20,5 +20,11 @@
 
 #include <gtk/gtktreeview.h>
-#include <gtk/gtktreemodelsort.h>
+
+#ifdef USE_GTK_TREE_MODEL_SORT_WORKAROUND
+	#include "gtktreemodelsort.h"
+#else
+	#include <gtk/gtktreemodelsort.h>
+#endif
+
 #include <gtk/gtktreeselection.h>
 #include <gtk/gtkcellrenderertext.h>
Index: lib/widgets/rb-tree-model-sort.h
===================================================================
RCS file: /cvs/gnome/rhythmbox/lib/widgets/rb-tree-model-sort.h,v
retrieving revision 1.3
diff -b -u -2 -r1.3 rb-tree-model-sort.h
--- lib/widgets/rb-tree-model-sort.h	24 Aug 2002 10:41:52 -0000	1.3
+++ lib/widgets/rb-tree-model-sort.h	3 Aug 2003 22:49:02 -0000
@@ -23,5 +23,9 @@
 #include <glib-object.h>
 
-#include <gtk/gtktreemodelsort.h>
+#ifdef USE_GTK_TREE_MODEL_SORT_WORKAROUND
+	#include "gtktreemodelsort.h"
+#else
+	#include <gtk/gtktreemodelsort.h>
+#endif
 
 G_BEGIN_DECLS