[rhythmbox] remove obsolete hal helper functions

[Jonathan Matthew <jmatthew src gnome org>]

commit d8388f496af6754906277cefd75139433b43a621
Author: Jonathan Matthew <jonathan d14n org>
Date:   Tue Aug 4 23:39:35 2009 +1000

    remove obsolete hal helper functions

 lib/Makefile.am |    3 +--
 lib/rb-util.c   |   38 --------------------------------------
 lib/rb-util.h   |    2 --
 3 files changed, 1 insertions(+), 42 deletions(-)
---
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 18b85ae..cee07d4 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -47,10 +47,9 @@ INCLUDES =						\
 	-DEGG_SM_CLIENT_BACKEND_XSMP			\
 	-I$(top_srcdir) 				\
 	-I$(top_srcdir)/widgets				\
-	$(HAL_CFLAGS)					\
 	$(RHYTHMBOX_CFLAGS)
 
-librb_la_LIBADD = $(HAL_LIBS) -lSM -lICE
+librb_la_LIBADD = -lSM -lICE
 
 BUILT_SOURCES=
 
diff --git a/lib/rb-util.c b/lib/rb-util.c
index 30e6003..fc5f7c7 100644
--- a/lib/rb-util.c
+++ b/lib/rb-util.c
@@ -996,41 +996,3 @@ rb_scale_pixbuf_to_size (GdkPixbuf *pixbuf, GtkIconSize size)
 	return gdk_pixbuf_scale_simple (pixbuf, d_width, d_height, GDK_INTERP_BILINEAR);
 }
 
-#ifdef HAVE_HAL
-char *
-rb_gvolume_get_udi (GVolume *volume, gpointer ctx)
-{
-	char *udi, *dev, **udis;
-	int num_udis;
-
-	g_return_val_if_fail (volume != NULL, NULL);
-	g_return_val_if_fail (G_IS_VOLUME (volume), NULL);
-	g_return_val_if_fail (ctx != NULL, NULL);
-
-	udi = g_volume_get_identifier (volume, G_VOLUME_IDENTIFIER_KIND_HAL_UDI);
-	if (udi != NULL)
-		return udi;
-
-	dev = g_volume_get_identifier (volume, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE);
-	udis = libhal_manager_find_device_string_match ((LibHalContext *) ctx,
-							"block.device", dev,
-							&num_udis, NULL);
-
-	if (udis == NULL || num_udis < 1) {
-		libhal_free_string_array (udis);
-		return NULL;
-	}
-
-	udi = g_strdup (udis[0]);
-	libhal_free_string_array (udis);
-
-	return udi;
-}
-#else
-char *
-rb_gvolume_get_udi (GVolume *volume, gpointer ctx)
-{
-	return NULL;
-}
-#endif /* HAVE_HAL */
-
diff --git a/lib/rb-util.h b/lib/rb-util.h
index f96d3e3..4f93112 100644
--- a/lib/rb-util.h
+++ b/lib/rb-util.h
@@ -100,8 +100,6 @@ void rb_set_tree_view_column_fixed_width (GtkWidget *treeview,
 GdkPixbuf *rb_scale_pixbuf_to_size (GdkPixbuf *pixbuf,
 				    GtkIconSize size);
 
-char *rb_gvolume_get_udi (GVolume *volume, gpointer ctx);
-
 G_END_DECLS
 
 #endif /* __RB_UTIL_H */