$NetBSD: patch-aa,v 1.7 2006/04/01 17:36:41 jmmv Exp $

http://bugzilla.gnome.org/show_bug.cgi?id=336237
The GONFTOOL_CMD change does not belong to the bug report!

--- gnome-session/Makefile.in.orig	2006-03-13 21:53:02.000000000 +0100
+++ gnome-session/Makefile.in
@@ -65,7 +65,7 @@ am__objects_1 = egg-screen-exec.$(OBJEXT
 am_gnome_session_OBJECTS = manager.$(OBJEXT) ice.$(OBJEXT) \
 	main.$(OBJEXT) prop.$(OBJEXT) save.$(OBJEXT) command.$(OBJEXT) \
 	remote.$(OBJEXT) logout.$(OBJEXT) splash-widget.$(OBJEXT) \
-	gsm-xrandr.$(OBJEXT) gsm-keyring.$(OBJEXT) gsm-gsd.$(OBJEXT) \
+	gsm-xrandr.$(OBJEXT) gsm-dbus.$(OBJEXT) gsm-keyring.$(OBJEXT) gsm-gsd.$(OBJEXT) \
 	gsm-protocol.$(OBJEXT) gsm-remote-desktop.$(OBJEXT) \
 	gsm-sound.$(OBJEXT) gsm-at-startup.$(OBJEXT) \
 	gsm-multiscreen.$(OBJEXT) gsm-typebuiltins.$(OBJEXT) \
@@ -323,7 +323,7 @@ INCLUDES = \
 	-DREBOOT_COMMAND=\""$(REBOOT_COMMAND)\""	\
 	-DHALT_COMMAND=\""$(HALT_COMMAND)\""		\
 	-DRSH_COMMAND=\""$(RSH_COMMAND)\""		\
-	-DGCONFTOOL_CMD=\""$(GCONFTOOL)\""		\
+	-DGCONFTOOL_CMD=\""$(REAL_GCONFTOOL)\""		\
 	-DDEFAULTDIR="\"$(defaultdir)\""		\
 	-DESD_SERVER="\"$(ESD_SERVER)\""
 
@@ -386,6 +386,8 @@ gnome_session_SOURCES = \
 	splash-widget.h		\
 	gsm-xrandr.c		\
 	gsm-xrandr.h		\
+	gsm-dbus.c		\
+	gsm-dbus.h		\
 	gsm-keyring.c		\
 	gsm-keyring.h		\
 	gsm-gsd.c		\
@@ -602,6 +604,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-client-list.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-client-row.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-gsd.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-dbus.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-keyring.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-multiscreen.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-protocol.Po@am__quote@
