--- gnome-media-2.10.2/cddb-slave2/main.c	2004-05-11 01:29:12.000000000 +0530
+++ gnome-media-2.10.2-new/cddb-slave2/main.c	2005-05-17 17:07:31.472422000 +0530
@@ -132,11 +132,14 @@ cddbslave_init (gpointer data)
 {
 	BonoboGenericFactory *factory;
 	char *display_iid;
+	const char *current_disp = NULL;
+
+	current_disp = g_getenv ("DISPLAY");
 
 	factory = (BonoboGenericFactory*)bonobo_activation_activate_from_id (CDDBSLAVE_IID, Bonobo_ACTIVATION_FLAG_EXISTING_ONLY, NULL, NULL);
 
 	if (!factory) {
-		display_iid = bonobo_activation_make_registration_id (CDDBSLAVE_IID, DisplayString (gdk_display));
+		display_iid = bonobo_activation_make_registration_id (CDDBSLAVE_IID, current_disp);
 		factory = bonobo_generic_factory_new (display_iid, factory_fn, NULL);
 		g_free (display_iid);
 		if (factory == NULL) {
--- gnome-media-2.10.2/cddb-slave2/cddb-track-editor.c	2005-01-20 04:09:18.000000000 +0530
+++ gnome-media-2.10.2-new/cddb-slave2/cddb-track-editor.c	2005-05-17 17:07:31.541183000 +0530
@@ -1032,8 +1032,11 @@ track_editor_init (gpointer data)
 {
 	BonoboGenericFactory *factory;
 	char *display_iid;
+	const gchar *current_disp = NULL;
 
-	display_iid = bonobo_activation_make_registration_id (CDDBSLAVE_TRACK_EDITOR_IID, DisplayString (gdk_display));
+	current_disp = g_getenv ("DISPLAY");
+
+	display_iid = bonobo_activation_make_registration_id (CDDBSLAVE_TRACK_EDITOR_IID, current_disp);
 	factory = bonobo_generic_factory_new (display_iid,
 					      factory_fn, NULL);
 	g_free (display_iid);