From: wrobell <wrobell@pld-linux.org>
Date: Sun, 22 May 2005 23:53:49 +0000 (+0000)
Subject: - out of date (in sources now)
X-Git-Tag: auto/ac/rhythmbox-0_9_4_1-1~3
X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=556f81ca23f815c0a40b6623d28adae71b1417c1;p=packages%2Frhythmbox.git

- out of date (in sources now)

Changed files:
    rhythmbox-dbus.patch -> 1.2
    rhythmbox-hal.patch -> 1.2
---

diff --git a/rhythmbox-dbus.patch b/rhythmbox-dbus.patch
deleted file mode 100644
index 6b3331b..0000000
--- a/rhythmbox-dbus.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- rhythmbox-0.9.0/remote/dbus/Makefile.am.orig	2005-05-17 20:06:29.000000000 +0100
-+++ rhythmbox-0.9.0/remote/dbus/Makefile.am	2005-05-17 20:53:32.000000000 +0100
-@@ -13,10 +13,10 @@
- rb_dbus_intf = org_gnome_Rhythmbox.xml
- 
- $(rb_dbus_glue_h): $(rb_dbus_intf)
--	$(DBUS_GLIB_BIN)/bin/dbus-binding-tool --mode=glib-server --output=$@ $^
-+	dbus-binding-tool --mode=glib-server --output=$@ $^
- 
- $(rb_dbus_binding_h): $(rb_dbus_intf)
--	$(DBUS_GLIB_BIN)/bin/dbus-binding-tool --mode=glib-client --output=$@ $^
-+	dbus-binding-tool --mode=glib-client --output=$@ $^
- 
- CLEANFILES = $(rb_dbus_glue_h) $(rb_dbus_binding_h)
- BUILT_SOURCES = $(rb_dbus_glue_h) $(rb_dbus_binding_h)
diff --git a/rhythmbox-hal.patch b/rhythmbox-hal.patch
deleted file mode 100644
index 6ff8867..0000000
--- a/rhythmbox-hal.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- rhythmbox-0.9.0/sources/rb-ipod-source.c.orig	2005-05-20 20:01:51.000000000 +0100
-+++ rhythmbox-0.9.0/sources/rb-ipod-source.c	2005-05-20 20:01:31.000000000 +0100
-@@ -568,19 +568,20 @@
- 	LibHalContext *ctx;
- 	char *parent_udi, *parent_name;
- 	gboolean result;
-+	DBusError error;
- 
- 	result = FALSE;
--	ctx = hal_initialize (NULL, FALSE);
-+	ctx = libhal_ctx_new ();
- 	if (ctx == NULL) {
- 		/* FIXME: should we return an error somehow so that we can 
- 		 * fall back to a check for iTunesDB presence instead ?
- 		 */
- 		return FALSE;
- 	}
--	parent_udi = hal_device_get_property_string (ctx, udi,
--			"info.parent");
--	parent_name = hal_device_get_property_string (ctx, parent_udi,
--			"storage.model");
-+	parent_udi = libhal_device_get_property_string (ctx, udi,
-+			"info.parent", &error);
-+	parent_name = libhal_device_get_property_string (ctx, parent_udi,
-+			"storage.model", &error);
- 	g_free (parent_udi);
- 
- 	if (parent_name != NULL && strcmp (parent_name, "iPod") == 0) {
-@@ -588,7 +589,8 @@
- 	}
- 
- 	g_free (parent_name);
--	hal_shutdown (ctx);
-+	libhal_ctx_shutdown (ctx, &error);
-+	libhal_ctx_free(ctx);
- 
- 	return result;
- }