[aisleriot] sol: Remove smclient support

[Christian Persch <chpe src gnome org>]

commit a6793cf4f757c0688a29b6c8bceda8c44cf5d284
Author: Christian Persch <chpe gnome org>
Date:   Mon Dec 5 21:41:23 2011 +0100

    sol: Remove smclient support

 configure.ac                       |   45 --
 po/POTFILES.in                     |    2 -
 src/Makefile.am                    |    9 -
 src/smclient/Makefile.am           |   41 -
 src/smclient/eggdesktopfile.c      | 1518 ------------------------------------
 src/smclient/eggdesktopfile.h      |  160 ----
 src/smclient/eggsmclient-dbus.c    |  294 -------
 src/smclient/eggsmclient-osx.c     |  235 ------
 src/smclient/eggsmclient-private.h |   59 --
 src/smclient/eggsmclient-win32.c   |  353 ---------
 src/smclient/eggsmclient-xsmp.c    | 1411 ---------------------------------
 src/smclient/eggsmclient.c         |  625 ---------------
 src/smclient/eggsmclient.h         |  123 ---
 src/smclient/eggsmclient.patch     |  202 -----
 src/sol.c                          |   60 --
 15 files changed, 0 insertions(+), 5137 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 68fb046..d72a328 100644
--- a/configure.ac
+++ b/configure.ac
@@ -389,49 +389,6 @@ fi
 
 AM_CONDITIONAL([ENABLE_SOUND],[test "$enable_sound" = "yes"])
 
-# SMClient
-
-SMCLIENT_PKGS=
-
-AC_MSG_CHECKING([for GDK target])
-case "$with_gtk" in
-  3.0) for target in $($PKG_CONFIG --variable targets gdk-$GTK_API_VERSION); do
-          GDK_TARGET="$target"
-          break
-        done
-        ;;
-esac
-AC_MSG_RESULT([$GDK_TARGET])
-
-case "$GDK_TARGET" in
-  x11|win32|quartz) ;;
-  *) AC_MSG_ERROR([unknown GDK target])
-esac
-
-AC_MSG_CHECKING([which smclient backend to use])
-AC_ARG_WITH([smclient],
-  [AS_HELP_STRING([--with-smclient],[which smclient backend to use (xsmp|win32|quartz|no)])],
-  [],
-  [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
-  if test -n "$SMCLIENT_PKGS"; then
-    PKG_CHECK_MODULES([SMCLIENT],[$SMCLIENT_PKGS])
-  fi
-
-  AC_DEFINE([WITH_SMCLIENT],[1],[Define if smclient is enabled])
-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"])
-
 # *****************
 # Extra build tools
 # *****************
@@ -661,7 +618,6 @@ help/Makefile
 po/Makefile.in
 src/Makefile
 src/lib/Makefile
-src/smclient/Makefile
 ])
 AC_OUTPUT
 
@@ -675,7 +631,6 @@ Configuration:
     GTK+ API version:      ${GTK_API_VERSION}
     Platform:              ${with_platform}
     Help method:           ${with_help_method} ${with_help_file_format}
-    Using SM Client:       ${with_smclient}
     Using RSVG:            ${have_rsvg}
     Card theme formats:    ${with_card_theme_formats}
     Default theme format:  ${with_default_card_theme_format}
diff --git a/po/POTFILES.in b/po/POTFILES.in
index fed3841..777c503 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -21,8 +21,6 @@ src/lib/ar-runtime.c
 src/lib/ar-show.c
 src/lib/org.gnome.Patience.WindowState.gschema.xml.in
 src/lib/ar-card.c
-src/smclient/eggdesktopfile.c
-src/smclient/eggsmclient.c
 games/api.scm
 games/accordion.scm
 games/agnes.scm
diff --git a/src/Makefile.am b/src/Makefile.am
index 73d5831..cf9ea38 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,9 +1,5 @@
 SUBDIRS = lib
 
-if WITH_SMCLIENT
-SUBDIRS += smclient
-endif
-
 NULL =
 
 # Same as in help/Makefile.am
@@ -72,11 +68,6 @@ sol_LDADD = \
 	$(GUILE_LIBS) \
 	-lm
 
-if WITH_SMCLIENT
-sol_CPPFLAGS += -I$(srcdir)/smclient -Ismclient
-sol_LDADD += smclient/libsmclient.la
-endif
-
 if HAVE_GNOME
 sol_CFLAGS += $(GNOME_CFLAGS)
 sol_LDADD += $(GNOME_LIBS)
diff --git a/src/sol.c b/src/sol.c
index 82aca9d..0974696 100644
--- a/src/sol.c
+++ b/src/sol.c
@@ -39,10 +39,6 @@
 #include "ar-runtime.h"
 #include "ar-sound.h"
 
-#ifdef WITH_SMCLIENT
-#include "eggsmclient.h"
-#endif /* WITH_SMCLIENT */
-
 #include "ar-string-utils.h"
 #include "conf.h"
 #include "window.h"
@@ -63,43 +59,6 @@ typedef struct {
   gboolean freecell;
 } AppData;
 
-#ifdef WITH_SMCLIENT
-
-static void
-save_state_cb (EggSMClient *client,
-               GKeyFile *key_file,
-               AppData *data)
-{
-  char *argv[5];
-  const char *game_name;
-  int argc = 0;
-
-  game_name = aisleriot_window_get_game_module (data->window);
-
-  argv[argc++] = g_get_prgname ();
-
-  if (data->freecell) {
-    argv[argc++] = (char *) "--freecell";
-  } else {
-    argv[argc++] = (char *) "--variation";
-    argv[argc++] = (char *) game_name;
-  }
-
-  /* FIXMEchpe: save game state too? */
-
-  egg_sm_client_set_restart_command (client, argc, (const char **) argv);
-}
-
-static void
-quit_cb (EggSMClient *client,
-         AppData *data)
-{
-  /* This will cause gtk_main_quit */
-  gtk_widget_destroy (GTK_WIDGET (data->window));
-}
-
-#endif /* WITH_SMCLIENT */
-
 static void
 add_main_options (GOptionContext *option_context,
                   AppData *data)
@@ -128,9 +87,6 @@ main_prog (void *closure, int argc, char *argv[])
   GOptionContext *option_context;
   GError *error = NULL;
   gboolean retval;
-#ifdef WITH_SMCLIENT
-  EggSMClient *sm_client;
-#endif /* WITH_SMCLIENT */
 
   memset (&data, 0, sizeof (AppData));
 
@@ -142,9 +98,6 @@ main_prog (void *closure, int argc, char *argv[])
   ar_sound_enable (FALSE);
 
   g_option_context_add_group (option_context, gtk_get_option_group (TRUE));
-#ifdef WITH_SMCLIENT
-  g_option_context_add_group (option_context, egg_sm_client_get_option_group ());
-#endif /* WITH_SMCLIENT */
 
 #ifdef HAVE_CLUTTER
   g_option_context_add_group (option_context, cogl_get_option_group ());
@@ -196,14 +149,6 @@ main_prog (void *closure, int argc, char *argv[])
   g_signal_connect (data.window, "destroy",
 		    G_CALLBACK (gtk_main_quit), NULL);
 
-#ifdef WITH_SMCLIENT
-  sm_client = egg_sm_client_get ();
-  g_signal_connect (sm_client, "save-state",
-		    G_CALLBACK (save_state_cb), &data);
-  g_signal_connect (sm_client, "quit",
-                    G_CALLBACK (quit_cb), &data);
-#endif /* WITH_SMCLIENT */
-
   if (data.freecell) {
     aisleriot_window_set_game_module (data.window, FREECELL_VARIATION, NULL);
   } else {
@@ -216,11 +161,6 @@ main_prog (void *closure, int argc, char *argv[])
 
   aisleriot_conf_shutdown ();
 
-#ifdef WITH_SMCLIENT
-  g_signal_handlers_disconnect_matched (sm_client, G_SIGNAL_MATCH_DATA,
-                                        0, 0, NULL, NULL, &data);
-#endif /* WITH_SMCLIENT */
-
 cleanup:
   g_free (data.variation);