Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-control-center/gnome-settings-daemon/ChangeLog,v
retrieving revision 1.76
diff -u -p -r1.76 ChangeLog
--- ChangeLog	24 Sep 2002 22:57:29 -0000	1.76
+++ ChangeLog	30 Sep 2002 23:53:03 -0000
@@ -1,3 +1,8 @@
+2002-10-01  Mark McLoughlin  <mark@skynet.ie>
+
+	* factory.c: (main): register g-s-d with bonobo-activation
+	per-display.
+
 Tue Sep 24 15:47:29 2002  HideToshi Tajima  <hidetoshi.tajima@sun.com>
 
 	disable/enable preedit/status in GtkIMContextXIM (#59076)
Index: factory.c
===================================================================
RCS file: /cvs/gnome/gnome-control-center/gnome-settings-daemon/factory.c,v
retrieving revision 1.6
diff -u -p -r1.6 factory.c
--- factory.c	22 May 2002 18:57:11 -0000	1.6
+++ factory.c	30 Sep 2002 23:53:03 -0000
@@ -16,6 +16,7 @@ int main (int argc, char *argv [])
 {
   GnomeClient *session;
   Bonobo_RegistrationResult ret;
+  gchar *iid;
   gchar *restart_argv[] = { "gnome-settings-daemon", *argv, 0 };
 
   bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
@@ -34,8 +35,11 @@ int main (int argc, char *argv [])
   /* start the settings daemon */
   services_server = BONOBO_OBJECT (gnome_settings_daemon_new ());
 
-  ret = bonobo_activation_active_server_register ("OAFIID:GNOME_SettingsDaemon",
-						  BONOBO_OBJREF (services_server));
+  iid = bonobo_activation_make_registration_id (
+		"OAFIID:GNOME_SettingsDaemon", g_getenv ("DISPLAY"));
+  ret = bonobo_activation_active_server_register (iid, BONOBO_OBJREF (services_server));
+  g_free (iid);
+
   if (ret != Bonobo_ACTIVATION_REG_SUCCESS) {
     g_warning ("Encountered problems registering the settings daemon with bonobo-activation. "
 	       "Clients may not detect that the settings daemon is already running.");
