Index: GNOME_Evolution_Shell.server.in.in
===================================================================
RCS file: /cvs/gnome/evolution/shell/GNOME_Evolution_Shell.server.in.in,v
retrieving revision 1.6
diff -u -r1.6 GNOME_Evolution_Shell.server.in.in
--- GNOME_Evolution_Shell.server.in.in	9 Dec 2003 17:26:30 -0000	1.6
+++ GNOME_Evolution_Shell.server.in.in	10 Feb 2005 00:14:47 -0000
@@ -10,6 +10,10 @@
 
     <oaf_attribute name="name" type="string"
 		   _value="Evolution Shell"/>
+
+    <oaf_attribute name="bonobo:environment" type="stringv">
+      <item value="DISPLAY"/>
+    </oaf_attribute>
   </oaf_server>
 
   <oaf_server iid="OAFIID:GNOME_Evolution_Shell_Config_Factory:@VERSION@"
Index: main.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/main.c,v
retrieving revision 1.165
diff -u -r1.165 main.c
--- main.c	29 Dec 2004 16:01:23 -0000	1.165
+++ main.c	10 Feb 2005 00:14:47 -0000
@@ -61,6 +61,7 @@
 #include <libgnomeui/gnome-ui-init.h>
 
 #include <bonobo/bonobo-main.h>
+#include <bonobo/bonobo-ui-main.h>
 #include <bonobo/bonobo-moniker-util.h>
 #include <bonobo/bonobo-exception.h>
 
@@ -514,7 +515,7 @@
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	textdomain (GETTEXT_PACKAGE);
 
-	program = gnome_program_init (PACKAGE "-" BASE_VERSION, VERSION, LIBGNOMEUI_MODULE, argc, argv, 
+	program = gnome_program_init (PACKAGE "-" BASE_VERSION, VERSION, BONOBO_UI_GTK_MODULE, argc, argv, 
 				      GNOME_PROGRAM_STANDARD_PROPERTIES,
 				      GNOME_PARAM_POPT_TABLE, options,
 				      GNOME_PARAM_HUMAN_READABLE_NAME, _("Evolution"),