[gnome-terminal] Remove smclient support

[Christian Persch <chpe src gnome org>]

commit 364115335f4e43908da3dba936e5d42edad4d8d0
Author: Christian Persch <chpe gnome org>
Date:   Mon Dec 5 20:03:03 2011 +0100

    Remove smclient support

 configure.ac              |   33 -
 src/Makefile.am           |   25 -
 src/eggdesktopfile.c      | 1520 ---------------------------------------------
 src/eggdesktopfile.h      |  163 -----
 src/eggsmclient-osx.c     |  235 -------
 src/eggsmclient-private.h |   59 --
 src/eggsmclient-win32.c   |  353 -----------
 src/eggsmclient-xsmp.c    | 1411 -----------------------------------------
 src/eggsmclient.c         |  625 -------------------
 src/eggsmclient.h         |  123 ----
 src/terminal-app.c        |   56 --
 11 files changed, 0 insertions(+), 4603 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 20cf02f..45eb3e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -101,37 +101,6 @@ AC_SUBST([dbusservicedir])
 
 GLIB_GSETTINGS
 
-# ********
-# smclient
-# ********
-
-SMCLIENT_PKGS=
-AC_MSG_CHECKING([which smclient backend to use])
-AC_ARG_WITH([smclient],
-  [AS_HELP_STRING([--with-smclient-backend],[which smclient backend to use (xsmp/win32/quartz)])],
-  [],
-  [case "$GDK_TARGET" in
-    x11) with_smclient=xsmp SMCLIENT_PKGS="sm ice" ;;
-    win32|quartz) with_smclient=$GDK_TARGET ;;
-    *) with_smclient=no ;;
-   esac])
-AC_MSG_RESULT([$with_smclient])
-
-if test "$with_smclient" != "no"; then
-  AC_DEFINE([WITH_SMCLIENT],[1],[Define if smclient is enabled])
-fi
-
-if test -n "$SMCLIENT_PKGS"; then
-  PKG_CHECK_MODULES([SMCLIENT],[$SMCLIENT_PKGS])
-  AC_SUBST([SMCLIENT_CFLAGS])
-  AC_SUBST([SMCLIENT_LIBS])
-fi
-
-AM_CONDITIONAL([WITH_SMCLIENT],[test "$with_smclient" != "no"])
-AM_CONDITIONAL([WITH_SMCLIENT_XSMP],[test "$with_smclient" = "xsmp"])
-AM_CONDITIONAL([WITH_SMCLIENT_WIN32],[test "$with_smclient" = "win32"])
-AM_CONDITIONAL([WITH_SMCLIENT_QUARTZ],[test "$with_smclient" = "quartz"])
-
 # *************************
 # GConf-GSettings Migration
 # *************************
@@ -255,6 +224,4 @@ gnome-terminal-$VERSION:
         DBus service dir:       ${dbusservicedir}
         Nautilus extension:     ${with_nautilus_extension}
         Nautilus extension dir: ${nautilusextensiondir}
-
-        using smclient:         ${with_smclient}
 "
diff --git a/src/Makefile.am b/src/Makefile.am
index ce07dab..dfb2990 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -84,31 +84,6 @@ gnome_terminal_server_LDFLAGS = \
 gnome_terminal_server_LDADD = \
 	$(TERM_LIBS)
 
-if WITH_SMCLIENT
-gnome_terminal_server_SOURCES += \
-	eggsmclient.c \
-	eggsmclient.h \
-	eggsmclient-private.h \
-	$(NULL)
-gnome_terminal_server_CFLAGS += $(SMCLIENT_CFLAGS)
-gnome_terminal_server_LDADD += $(SMCLIENT_LIBS)
-
-if WITH_SMCLIENT_XSMP
-gnome_terminal_server_SOURCES += \
-	eggdesktopfile.c \
-	eggdesktopfile.h \
-	eggsmclient-xsmp.c \
-	$(NULL)
-gnome_terminal_server_CPPFLAGS += -DEGG_SM_CLIENT_BACKEND_XSMP
-endif
-if WITH_SMCLIENT_WIN32
-gnome_terminal_server_SOURCES += eggsmclient-win32.c
-endif
-if WITH_SMCLIENT_QUARTZ
-gnome_terminal_server_SOURCES += eggsmclient-osx.c
-endif
-endif
-
 TYPES_H_FILES = \
 	terminal-enums.h \
 	$(NULL)
diff --git a/src/terminal-app.c b/src/terminal-app.c
index 85ab12e..dab8533 100644
--- a/src/terminal-app.c
+++ b/src/terminal-app.c
@@ -45,13 +45,6 @@
 #include <stdlib.h>
 #include <time.h>
 
-#ifdef WITH_SMCLIENT
-#include "eggsmclient.h"
-#ifdef GDK_WINDOWING_X11
-#include "eggdesktopfile.h"
-#endif
-#endif
-
 #define DESKTOP_INTERFACE_SETTINGS_SCHEMA       "org.gnome.desktop.interface"
 
 #define SYSTEM_PROXY_SETTINGS_SCHEMA            "org.gnome.system.proxy"
@@ -1101,25 +1094,6 @@ terminal_app_manage_profiles (TerminalApp     *app,
 #endif
 }
 
-#ifdef WITH_SMCLIENT
-
-static void
-terminal_app_save_state_cb (EggSMClient *client,
-                            GKeyFile *key_file,
-                            TerminalApp *app)
-{
-  terminal_app_save_config (app, key_file);
-}
-
-static void
-terminal_app_client_quit_cb (EggSMClient *client,
-                             TerminalApp *app)
-{
-  g_signal_emit (app, signals[QUIT], 0);
-}
-
-#endif /* WITH_SMCLIENT */
-
 static void
 screen_destroy_cb (GObject *screen,
                    gpointer user_data)
@@ -1331,28 +1305,6 @@ terminal_app_init (TerminalApp *app)
 #endif
 
   terminal_accels_init ();
-
-#ifdef WITH_SMCLIENT
-{
-  EggSMClient *sm_client;
-#ifdef GDK_WINDOWING_X11
-  char *desktop_file;
-
-  desktop_file = g_build_filename (TERM_DATADIR,
-                                   "applications",
-                                   PACKAGE ".desktop",
-                                   NULL);
-  egg_set_desktop_file_without_defaults (desktop_file);
-  g_free (desktop_file);
-#endif /* GDK_WINDOWING_X11 */
-
-  sm_client = egg_sm_client_get ();
-  g_signal_connect (sm_client, "save-state",
-                    G_CALLBACK (terminal_app_save_state_cb), app);
-  g_signal_connect (sm_client, "quit",
-                    G_CALLBACK (terminal_app_client_quit_cb), app);
-}
-#endif
 }
 
 static void
@@ -1360,14 +1312,6 @@ terminal_app_finalize (GObject *object)
 {
   TerminalApp *app = TERMINAL_APP (object);
 
-#ifdef WITH_SMCLIENT
-  EggSMClient *sm_client;
-
-  sm_client = egg_sm_client_get ();
-  g_signal_handlers_disconnect_matched (sm_client, G_SIGNAL_MATCH_DATA,
-                                        0, 0, NULL, NULL, app);
-#endif
-
   g_hash_table_destroy (app->encodings);
   g_signal_handlers_disconnect_by_func (app->global_settings,
                                         G_CALLBACK (terminal_app_encoding_list_notify_cb),