Index: configure.in
===================================================================
RCS file: /cvs/gnome/evolution-data-server/configure.in,v
retrieving revision 1.70
diff -u -r1.70 configure.in
--- configure.in	30 Sep 2004 16:47:45 -0000	1.70
+++ configure.in	14 Oct 2004 06:39:33 -0000
@@ -205,7 +205,7 @@
 AC_SUBST(E_NAME_CFLAGS)
 AC_SUBST(E_NAME_LIBS)
 
-EVO_SET_COMPILE_FLAGS(E_DATA_SERVER, libxml-2.0 libbonobo-2.0 >= $LIBBONOBO_REQUIRED libgnome-2.0, $THREADS_CFLAGS, $THREADS_LIBS)
+EVO_SET_COMPILE_FLAGS(E_DATA_SERVER, libxml-2.0 libbonobo-2.0 >= $LIBBONOBO_REQUIRED libgnome-2.0 libgalago, $THREADS_CFLAGS, $THREADS_LIBS)
 AC_SUBST(E_DATA_SERVER_CFLAGS)
 AC_SUBST(E_DATA_SERVER_LIBS)
 
Index: src/server.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/src/server.c,v
retrieving revision 1.21
diff -u -r1.21 server.c
--- src/server.c	30 Sep 2004 16:47:45 -0000	1.21
+++ src/server.c	14 Oct 2004 06:39:36 -0000
@@ -46,6 +46,8 @@
 #include <libedata-book/e-data-book-factory.h>
 #include <libedata-cal/e-data-cal-factory.h>
 
+#include <libgalago/galago.h>
+
 #include "server-interface-check.h"
 #include "server-logging.h"
 
@@ -268,6 +270,19 @@
 	return result == Bonobo_ACTIVATION_REG_SUCCESS;
 }
 
+static void
+setup_galago(void)
+{
+	if (!galago_glib_init("evolution-data-server", TRUE, NULL))
+		return;
+
+	galago_service_new("aim",       _("AOL Instant Messenger"), TRUE, 0);
+	galago_service_new("jabber",    _("Jabber"),                TRUE, 0);
+	galago_service_new("yahoo",     _("Yahoo!"),                TRUE, 0);
+	galago_service_new("msn",       _("MSN Messenger"),         TRUE, 0);
+	galago_service_new("icq",       _("ICQ"),                   TRUE, 0);
+	galago_service_new("groupwise", _("Novell GroupWise"),      TRUE, 0);
+}
 
 
 #ifdef DEBUG_BACKENDS
@@ -303,7 +318,8 @@
 			  bonobo_activation_orb_get(),
 			  CORBA_OBJECT_NIL,
 			  CORBA_OBJECT_NIL);
-	
+
+	setup_galago();
 	setup_segv_handler ();
 
 	e_data_server_module_init ();