Re: patch #4 (Was: [Rhythmbox-devel] music sharing patch #3)

[Peter Robinson <pbrobinson gmail com>]

> A recent CVS commit that hasn't filtered through to anonymous CVS
> removed that function from rb-playlist-source.c & .h.   Until it filters
> through and/or I get real CVS access, a temporary fix is to add:

Ahhh! Love the anon cvs lag. I'm getting a couple of other
errors/warnings now. A couple of the warnings seems to guff even
though they were unused declared variables (go figure - small patch
attached) and the other error is icluded below.

Cheers,
Pete

 gcc -DHAVE_CONFIG_H -I. -I. -I..
-DGNOMELOCALEDIR=\"/usr/share/locale\" -DG_LOG_DOMAIN=\"Rhythmbox\"
-I.. -I../lib -I../lib -I../corba -I../corba -I../rhythmdb
-I../library -I../iradio -I../widgets -I../shell -I../sources
-DPIXMAP_DIR=\"/usr/share/pixmaps\"
-DSHARE_DIR=\"/usr/share/rhythmbox\" -DDATADIR=\"/usr/share\" -O2 -g
-pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -m32 -march=i386
-mtune=pentium4 -fasynchronous-unwind-tables -DXTHREADS -D_REENTRANT
-DXUSE_MTSAFE_API -DORBIT2=1 -pthread -DDBUS_API_SUBJECT_TO_CHANGE
-I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/X11R6/include
-I/usr/include/atk-1.0 -I/usr/include/pango-1.0
-I/usr/include/freetype2 -I/usr/include/freetype2/config
-I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
-I/usr/include/libgnomeui-2.0 -I/usr/include/libgnome-2.0
-I/usr/include/libgnomecanvas-2.0 -I/usr/include/libart-2.0
-I/usr/include/gconf/2 -I/usr/include/libbonoboui-2.0
-I/usr/include/orbit-2.0 -I/usr/include/libbonobo-2.0
-I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include
-I/usr/include/bonobo-activation-2.0 -I/usr/include/libxml2
-I/usr/include/libglade-2.0 -I/usr/include/gnome-vfs-module-2.0
-I/usr/include/totem/1/plparser -I/usr/include/dbus-1.0
-I/usr/lib/dbus-1.0/include -I/usr/include/hal -D_LARGEFILE_SOURCE
-D_FILE_OFFSET_BITS=64 -pthread -DORBIT2=1
-I/usr/include/gstreamer-0.8 -I/usr/include/glib-2.0
-I/usr/lib/glib-2.0/include -I/usr/include/libxml2
-I/usr/include/gconf/2 -I/usr/include/orbit-2.0
-I/usr/include/libsoup-2.2 -I/usr/include/libxml2
-I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
-I/usr/include/howl-0.9.8 -I/usr/X11R6/include -Wcomment -Wformat
-Wnonnull -Wimplicit-int -Wimplicit -Wmain -Wmissing-braces
-Wparentheses -Wsequence-point -Wreturn-type -Wswitch -Wtrigraphs
-Wunused-function -Wunused-label -Wunused-value -Wchar-subscripts
-Wmissing-declarations -Wmissing-prototypes -Wnested-externs
-Wpointer-arith -Wcast-align -Wall -Werror -std=gnu89 -MT
rb-daap-share.lo -MD -MP -MF .deps/rb-daap-share.Tpo -c
rb-daap-share.c  -fPIC -DPIC -o .libs/rb-daap-share.o
cc1: warnings being treated as errors
rb-daap-share.c: In function 'databases_cb':
rb-daap-share.c:924: warning: implicit declaration of function
'rb_playlist_source_get_model'
rb-daap-share.c:924: warning: nested extern declaration of
'rb_playlist_source_get_model'
rb-daap-share.c:924: warning: assignment makes pointer from integer
without a cast
make[2]: *** [rb-daap-share.lo] Error 1
make[2]: Leaving directory `/usr/src/redhat/BUILD/rhythmbox-0.9.0/daapsharing'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory `/usr/src/redhat/BUILD/rhythmbox-0.9.0'
make: *** [all] Error 2

--- rhythmbox-0.9.0/sources/rb-daap-source.c	2005-08-24 19:30:24.000000000 +0100
+++ rhythmbox-0.9.0-mod/sources/rb-daap-source.c	2005-08-24 19:28:31.000000000 +0100
@@ -344,7 +344,6 @@
 RBSource * 
 rb_daap_sources_init (RBShell *shell)
 {
-	GnomeVFSResult result;
 	gboolean enabled;
 	
 	g_object_ref (shell);
--- rhythmbox-0.9.0/daapsharing/rb-daap-share.c	2005-08-24 19:30:24.000000000 +0100
+++ rhythmbox-0.9.0-mod/daapsharing/rb-daap-share.c	2005-08-24 19:33:23.000000000 +0100
@@ -769,7 +769,6 @@
 {
 	gchar *path;
 	gchar *rest_of_path;
-	guint revision_number;
 	
 	path = soup_uri_to_string (soup_message_get_uri (message), TRUE);