[nautilus] smclient: remove XSMP support

[Cosimo Cecchi <cosimoc src gnome org>]

commit f42d5aa97de09de7052fa80abda62fabe17dfb13
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Mon Dec 20 18:39:24 2010 +0100

    smclient: remove XSMP support
    
    EggSmClient is not well-maintained, and it doesn't seem like it will
    ever hit GTK+, and the overall implementation seems to be poorly tested
    and buggy.
    
    Moreover, moving to 3.0 with nautilus being an application, it makes
    less sense to have it save opened windows state, as it might not be
    always running at all.

 cut-n-paste-code/libegg/Makefile.am           |   17 +-
 cut-n-paste-code/libegg/eggdesktopfile.c      | 1475 -------------------------
 cut-n-paste-code/libegg/eggdesktopfile.h      |  159 ---
 cut-n-paste-code/libegg/eggsmclient-private.h |   53 -
 cut-n-paste-code/libegg/eggsmclient-xsmp.c    | 1370 -----------------------
 cut-n-paste-code/libegg/eggsmclient.c         |  609 ----------
 cut-n-paste-code/libegg/eggsmclient.h         |  117 --
 po/POTFILES.in                                |    2 -
 src/Makefile.am                               |    2 -
 src/nautilus-application-smclient.c           |  459 --------
 src/nautilus-application-smclient.h           |   33 -
 src/nautilus-application.c                    |   14 -
 src/nautilus-application.h                    |    2 -
 src/nautilus-main.c                           |    5 -
 14 files changed, 1 insertions(+), 4316 deletions(-)
---
diff --git a/cut-n-paste-code/libegg/Makefile.am b/cut-n-paste-code/libegg/Makefile.am
index ea39f63..fff263f 100644
--- a/cut-n-paste-code/libegg/Makefile.am
+++ b/cut-n-paste-code/libegg/Makefile.am
@@ -9,38 +9,23 @@ EGG_TREE_DND_FILES = 		\
 	eggtreemultidnd.h	\
 	$(NULL)
 
-EGG_SMCLIENT_FILES = 		\
-	eggdesktopfile.c	\
-	eggdesktopfile.h	\
-	eggsmclient.c		\
-	eggsmclient.h		\
-	eggsmclient-private.h	\
-	eggsmclient-xsmp.c	\
-	$(NULL)
-
 libegg_la_SOURCES = 		\
 	$(EGG_TREE_DND_FILES)	\
-	$(EGG_SMCLIENT_FILES)	\
 	$(NULL)
 
 libegg_la_CFLAGS =				\
-	-DEGG_SM_CLIENT_BACKEND_XSMP		\
-	-DG_LOG_DOMAIN=\""EggSMClient"\"	\
 	$(BASE_CFLAGS)			\
 	$(WARNING_CFLAGS)			\
 	$(DISABLE_DEPRECATED)
 
 libegg_la_LIBADD = 	\
-	$(LIBEGG_LIBS)	\
-	-lSM -lICE
+	$(BASE_LIBS)
 
 EXTRA_DIST = 			\
 	update-from-egg.sh	\
 	$(NULL)
 
 EGG_TREE_DND_DIR = $(srcdir)/../../../libegg/libegg/treeviewutils
-EGG_SMCLIENT_DIR = $(srcdir)/../../../libegg/libegg/smclient
 
 regenerate-built-sources:
 	EGGFILES="$(EGG_TREE_DND_FILES)" EGGDIR="$(EGG_TREE_DND_DIR)" $(srcdir)/update-from-egg.sh
-	EGGFILES="$(EGG_SMCLIENT_FILES)" EGGDIR="$(EGG_SMCLIENT_DIR)" $(srcdir)/update-from-egg.sh
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 096b04a..1da0075 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,8 +1,6 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
 [encoding: UTF-8]
-cut-n-paste-code/libegg/eggdesktopfile.c
-cut-n-paste-code/libegg/eggsmclient.c
 data/nautilus.xml.in
 eel/eel-canvas.c
 eel/eel-editable-label.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 4254604..baba538 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -64,8 +64,6 @@ nautilus_SOURCES = \
 	nautilus-actions.h			\
 	nautilus-application.c			\
 	nautilus-application.h			\
-	nautilus-application-smclient.c		\
-	nautilus-application-smclient.h		\
 	nautilus-bookmark-list.c		\
 	nautilus-bookmark-list.h		\
 	nautilus-bookmarks-window.c		\
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index e68ecc6..5035b61 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -37,7 +37,6 @@
 #include "file-manager/fm-empty-view.h"
 #endif /* ENABLE_EMPTY_VIEW */
 
-#include "nautilus-application-smclient.h"
 #include "nautilus-desktop-window.h"
 #include "nautilus-image-properties-page.h"
 #include "nautilus-navigation-window.h"
@@ -1334,15 +1333,8 @@ nautilus_application_command_line (GApplication *app,
 	g_option_context_add_main_entries (context, options, NULL);
 	g_option_context_add_group (context, gtk_get_option_group (TRUE));
 
-	if (!self->initialized) {
-		g_option_context_add_group (context, egg_sm_client_get_option_group ());
-	}
-
 	argv = g_application_command_line_get_arguments (command_line, &argc);
 
-	/* we need to do this here, as parsing the EggSMClient option context,
-	 * unsets this variable.
-	 */
 	autostart_id = g_getenv ("DESKTOP_AUTOSTART_ID");
 	if (autostart_id != NULL && *autostart_id != '\0') {
 		autostart_mode = TRUE;
@@ -1451,9 +1443,6 @@ nautilus_application_command_line (GApplication *app,
 			g_signal_connect (gtk_accel_map_get (), "changed",
 					  G_CALLBACK (queue_accel_map_save_callback), NULL);
 
-			/* Initialize SMClient and load session info if availible */
-			nautilus_application_smclient_load (self, &no_default_window);
-
 			self->initialized = TRUE;
 		}
 
@@ -1536,9 +1525,6 @@ nautilus_application_startup (GApplication *app)
 	/* create an undo manager */
 	self->undo_manager = nautilus_undo_manager_new ();
 
-	/* initialize the session manager client */
-	nautilus_application_smclient_startup (self);
-
 	/* Initialize preferences. This is needed to create the
 	 * global GSettings objects.
 	 */
diff --git a/src/nautilus-application.h b/src/nautilus-application.h
index 59d0d67..ea6cd60 100644
--- a/src/nautilus-application.h
+++ b/src/nautilus-application.h
@@ -28,7 +28,6 @@
 #include <gio/gio.h>
 #include <gtk/gtk.h>
 
-#include <libegg/eggsmclient.h>
 #include <libnautilus-private/nautilus-undo-manager.h>
 
 #define NAUTILUS_DESKTOP_ICON_VIEW_IID	"OAFIID:Nautilus_File_Manager_Desktop_Icon_View"
@@ -58,7 +57,6 @@ typedef struct _NautilusSpatialWindow NautilusSpatialWindow;
 typedef struct {
 	GtkApplication parent;
 
-        EggSMClient *smclient;
 	NautilusUndoManager *undo_manager;
 	GVolumeMonitor *volume_monitor;
 	GDBusProxy *proxy;
diff --git a/src/nautilus-main.c b/src/nautilus-main.c
index f356f55..6b0dd50 100644
--- a/src/nautilus-main.c
+++ b/src/nautilus-main.c
@@ -34,7 +34,6 @@
 
 #include <libnautilus-private/nautilus-debug.h>
 #include <eel/eel-debug.h>
-#include <libegg/eggdesktopfile.h>
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
@@ -93,10 +92,6 @@ main (int argc, char *argv[])
 
 	g_set_prgname ("nautilus");
 
-	if (g_file_test (DATADIR "/applications/nautilus.desktop", G_FILE_TEST_EXISTS)) {
-		egg_set_desktop_file (DATADIR "/applications/nautilus.desktop");
-	}
-	
 #ifdef HAVE_EXEMPI
 	xmp_init();
 #endif