Prefix the session server stuff with gsm, makes things a lot less confusing.

src/sugar/Makefile.am

@@ -23,12 +23,16 @@ _sugarext_la_LIBADD = $(EXT_LIBS) -lSM -lICE
 _sugarext_la_SOURCES =			\
 	$(BUILT_SOURCES)		\
 	_sugarextmodule.c		\
-        app.h				\
-	app.c				\
-	client.h			\
-	client.c			\
-	client-xsmp.h			\
-	client-xsmp.c			\
+        gsm-app.h			\
+	gsm-app.c			\
+	gsm-client.h			\
+	gsm-client.c			\
+	gsm-client-xsmp.h		\
+	gsm-client-xsmp.c		\
+	gsm-xsmp.h			\
+	gsm-xsmp.c			\
+	gsm-session.h			\
+	gsm-session.c			\
 	eggaccelerators.c		\
 	eggaccelerators.h		\
 	eggdesktopfile.h		\
@@ -37,8 +41,6 @@ _sugarext_la_SOURCES =			\
 	eggsmclient.c			\
 	eggsmclient-private.h		\
 	eggsmclient-xsmp.c		\
-	session.h			\
-	session.c			\
 	sexy-icon-entry.h		\
 	sexy-icon-entry.c		\
 	sugar-address-entry.c		\
@@ -48,9 +50,7 @@ _sugarext_la_SOURCES =			\
 	sugar-menu.h			\
 	sugar-menu.c			\
 	sugar-preview.h			\
-	sugar-preview.c			\
-	xsmp.h				\
-	xsmp.c
+	sugar-preview.c
 
 BUILT_SOURCES = 			\
 	_sugarext.c			\

src/sugar/_sugarext.override

@@ -9,7 +9,7 @@ headers
 #include "sugar-menu.h"
 #include "sugar-preview.h"
 #include "sexy-icon-entry.h"
-#include "session.h"
+#include "gsm-session.h"
 
 #define EGG_SM_CLIENT_BACKEND_XSMP
 #include "eggsmclient.h"

src/sugar/gsm-app.c

@@ -25,7 +25,7 @@
 #include <string.h>
 #include <sys/wait.h>
 
-#include "app.h"
+#include "gsm-app.h"
 
 enum {
   EXITED,

src/sugar/gsm-app.h

@@ -10,7 +10,7 @@
 #include <sys/types.h>
 
 #include "eggdesktopfile.h"
-#include "session.h"
+#include "gsm-session.h"
 
 G_BEGIN_DECLS
 

src/sugar/gsm-client-xsmp.c

@@ -27,8 +27,8 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "client-xsmp.h"
-#include "session.h"
+#include "gsm-client-xsmp.h"
+#include "gsm-session.h"
 
 /* FIXME */
 #define GsmDesktopFile "_Gsm_DesktopFile"

src/sugar/gsm-client-xsmp.h

@@ -20,7 +20,7 @@
 #ifndef __GSM_CLIENT_XSMP_H__
 #define __GSM_CLIENT_XSMP_H__
 
-#include "client.h"
+#include "gsm-client.h"
 
 #include <X11/SM/SMlib.h>
 

src/sugar/gsm-client.c

@@ -21,7 +21,7 @@
 #include "config.h"
 #endif
 
-#include "client.h"
+#include "gsm-client.h"
 
 enum {
   SAVED_STATE,

src/sugar/gsm-session.c

@@ -19,9 +19,9 @@
 
 #include <string.h>
 
-#include "session.h"
-#include "app.h"
-#include "xsmp.h"
+#include "gsm-session.h"
+#include "gsm-app.h"
+#include "gsm-xsmp.h"
 
 GsmSession *global_session;
 

src/sugar/gsm-session.h

@@ -21,7 +21,7 @@
 #define __GSM_SESSION_H__
 
 #include <glib.h>
-#include "client.h"
+#include "gsm-client.h"
 
 G_BEGIN_DECLS
 

src/sugar/gsm-xsmp.c

@@ -32,10 +32,8 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 
-#include "client-xsmp.h"
-//#include "gsm.h"
-//#include "util.h"
-#include "xsmp.h"
+#include "gsm-client-xsmp.h"
+#include "gsm-xsmp.h"
 
 #include <X11/ICE/ICElib.h>
 #include <X11/ICE/ICEutil.h>