rhythmbox 0.9.2 and dbus-0.6

[Eduard Carreras i Nadal <ecarreras gmail com>]

Actually rhythmbox 0.9.2 doesn't compile with dbus-0.6 [1] there is a
patch to solve it [2], I've adapted it for garnome, and attached the
patch to rhythmbox dir.


Regards,


P.D. Sorry for my english

[1] http://mail.gnome.org/archives/rhythmbox-devel/2005-December/msg00033.html
[2] http://bugzilla.gnome.org/show_bug.cgi?id=322936
--
Eduard Carreras i Nadal <ecarreras gmail com>
http://iesdecelra.xtec.net/eduard

diff -ruN -x CVS rhythmbox/checksums rhythmbox-dbus-0.6/checksums
--- rhythmbox/checksums	2005-11-28 22:00:37.000000000 +0100
+++ rhythmbox-dbus-0.6/checksums	2005-12-08 01:18:45.000000000 +0100
@@ -1 +1,2 @@
 533223578c9c37bd72634755b33beab7  download/rhythmbox-0.9.2.tar.bz2
+3a320c45b2551e7f02bd96dfd2ab184b  files/dbus-0.6.diff
diff -ruN -x CVS rhythmbox/files/dbus-0.6.diff rhythmbox-dbus-0.6/files/dbus-0.6.diff
--- rhythmbox/files/dbus-0.6.diff	1970-01-01 01:00:00.000000000 +0100
+++ rhythmbox-dbus-0.6/files/dbus-0.6.diff	2005-12-08 01:18:29.000000000 +0100
@@ -0,0 +1,69 @@
+diff -ruN rhythmbox-0.9.2/shell/main.c rhythmbox-0.9.2-patched/shell/main.c
+--- rhythmbox-0.9.2/shell/main.c	2005-11-21 11:19:19.000000000 +0100
++++ rhythmbox-0.9.2-patched/shell/main.c	2005-12-08 01:03:38.000000000 +0100
+@@ -1,4 +1,5 @@
+-/*
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
++ *
+  *  arch-tag: The Rhythmbox main entrypoint
+  *
+  *  Copyright (C) 2002 Jorn Baayen
+@@ -21,18 +22,21 @@
+  */
+ 
+ #include <config.h>
+-#include <libintl.h>
+-#include <locale.h>
+-#include <libgnome/gnome-program.h>
+-#include <libgnome/gnome-i18n.h>
+-#include <libgnomeui/gnome-ui-init.h>
+-#include <gtk/gtk.h>
+-#include <gdk/gdkx.h> /* For _get_user_time... */
+-#include <glade/glade-init.h>
++
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <time.h>
+ #include <string.h>
++#include <libintl.h>
++#include <locale.h>
++
++#include <glib/gi18n.h>
++#include <gdk/gdkx.h> /* For _get_user_time... */
++#include <gtk/gtk.h>
++#include <glade/glade-init.h>
++#include <libgnome/gnome-program.h>
++#include <libgnomeui/gnome-ui-init.h>
++
+ #ifdef HAVE_GSTREAMER
+ #include <gst/gst.h>
+ #include <gst/gconf/gconf.h>
+@@ -254,19 +258,27 @@
+ 		g_clear_error (&error);
+ 	} else if (!no_registration) {
+ 		guint request_name_reply;
++		int flags;
+ 		DBusGProxy *bus_proxy;
+ 
+ 		bus_proxy = dbus_g_proxy_new_for_name (session_bus,
+ 						       "org.freedesktop.DBus",
+ 						       "/org/freedesktop/DBus",
+ 						       "org.freedesktop.DBus");
++
++#ifndef DBUS_NAME_FLAG_DO_NOT_QUEUE
++		flags = DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT;
++#else
++		flags = DBUS_NAME_FLAG_DO_NOT_QUEUE;
++#endif                
++
+ 		if (!dbus_g_proxy_call (bus_proxy,
+ 					"RequestName",
+ 					&error,
+ 					G_TYPE_STRING,
+ 					"org.gnome.Rhythmbox",
+ 					G_TYPE_UINT,
+-					DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT,
++					flags,
+ 					G_TYPE_INVALID,
+ 					G_TYPE_UINT,
+ 					&request_name_reply,
diff -ruN -x CVS rhythmbox/Makefile rhythmbox-dbus-0.6/Makefile
--- rhythmbox/Makefile	2005-11-28 22:00:37.000000000 +0100
+++ rhythmbox-dbus-0.6/Makefile	2005-12-08 01:15:00.000000000 +0100
@@ -2,6 +2,7 @@
 GARVERSION = 0.9.2
 CATEGORIES = fifth-toe
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
+PATCHFILES = dbus-0.6.diff
 
 LIBDEPS = platform/libbonoboui desktop/gst-plugins-base