[goobox] removed use of libegg code

[Paolo Bacchilega <paobac src gnome org>]

commit f37b84d7cf108eb43ad368c6fa53d63100a34628
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Sun Jan 19 16:23:29 2014 +0100

    removed use of libegg code

 Makefile.am                        |    2 +-
 configure.ac                       |   39 -
 copy-n-paste/Makefile.am           |   31 -
 copy-n-paste/eggdesktopfile.c      | 1522 ------------------------------------
 copy-n-paste/eggdesktopfile.h      |  163 ----
 copy-n-paste/eggsmclient-private.h |   59 --
 copy-n-paste/eggsmclient-xsmp.c    | 1370 --------------------------------
 copy-n-paste/eggsmclient.c         |  604 --------------
 copy-n-paste/eggsmclient.h         |  117 ---
 po/POTFILES.in                     |   11 +-
 src/Makefile.am                    |    2 -
 src/goo-application.c              |  132 ----
 12 files changed, 5 insertions(+), 4047 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 5cca9cd..516b314 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = copy-n-paste data help src po
+SUBDIRS = data help src po
 ACLOCAL_AMFLAGS = -I m4
 
 
diff --git a/configure.ac b/configure.ac
index cf54333..9894988 100644
--- a/configure.ac
+++ b/configure.ac
@@ -172,43 +172,6 @@ AC_MSG_RESULT($enable_media_keys)
 
 dnl ===========================================================================
 
-GDK_TARGET="$($PKG_CONFIG --variable targets gdk-3.0)"
-
-AC_MSG_CHECKING([which smclient backend to use])
-AC_ARG_WITH([smclient],
-  [AS_HELP_STRING([--with-smclient=no|auto|xsmp],
-                  [Setting smclient backend (default:no)])],,
-                  [with_smclient=no])
-
-if test "$with_smclient" == "auto"; then
-  case "$GDK_TARGET" in
-    *x11*) with_smclient=xsmp ;;
-    *) with_smclient=no ;;
-  esac
-fi
-
-AC_MSG_RESULT([$with_smclient])
-
-if test "$with_smclient" != "no"; then
-  AC_DEFINE([WITH_SMCLIENT],[1],[Define if smclient is enabled])
-
-  case "$with_smclient" in
-    xsmp) SMCLIENT_PKGS="sm >= 1.0.0 ice" ;;
-    *) SMCLIENT_PKGS="" ;;
-  esac
-
-  PKG_CHECK_MODULES([SMCLIENT],[$SMCLIENT_PKGS])
-  AC_SUBST([SMCLIENT_CFLAGS])
-  AC_SUBST([SMCLIENT_LIBS])
-  AC_DEFINE(USE_SMCLIENT, 1, [Use a session menager])
-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"])
-
-dnl ===========================================================================
-
 SYSTEM_LIBS=""
 host=`uname -s`
 case "$host" in
@@ -264,7 +227,6 @@ dnl ===========================================================================
 
 AC_CONFIG_FILES([
 Makefile
-copy-n-paste/Makefile
 data/Makefile
 data/goobox.desktop.in
 data/appdata/Makefile
@@ -294,5 +256,4 @@ Configuration:
        Enable notification  : ${enable_notification}
        Enable media keys    : ${enable_media_keys}
        Use libcoverart      : ${enable_libcoverart}
-       SM client support    : ${with_smclient}
 "
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9832e59..6da6197 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,12 +1,9 @@
-# DO NOT EDIT.  This file is automatically generated.
 # List of source files which contain translatable strings.
+#
+# DO NOT EDIT.  This file is automatically generated, to
+# update the content run the following command:
+# sh update-potfiles.sh > POTFILES.in
 [encoding: UTF-8]
-copy-n-paste/eggdesktopfile.c
-copy-n-paste/eggdesktopfile.h
-copy-n-paste/eggsmclient.c
-copy-n-paste/eggsmclient.h
-copy-n-paste/eggsmclient-private.h
-copy-n-paste/eggsmclient-xsmp.c
 data/appdata/goobox.appdata.xml.in
 data/goobox.desktop.in.in
 data/org.gnome.Goobox.gschema.xml.in
diff --git a/src/Makefile.am b/src/Makefile.am
index a1c8044..33ae162 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,7 +9,6 @@ uidir = $(datadir)/goobox/ui
 endif
 
 AM_CPPFLAGS =                                          \
-       -I$(top_srcdir)/copy-n-paste/                   \
        -DGOO_PREFIX=\"$(prefix)\"                      \
         -DGOO_SYSCONFDIR=\"$(sysconfdir)\"             \
         -DGOO_DATADIR=\"$(datadir)\"                   \
@@ -97,7 +96,6 @@ goo-resources.h: goobox.gresource.xml $(RESOURCES_DEP)
        $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name goo 
$(srcdir)/goobox.gresource.xml
 
 goobox_LDADD =                                                 \
-       $(top_builddir)/copy-n-paste/libeggsmclient.la  \
        $(GOO_LIBS)                                     \
        $(M_LIBS)                                       \
        $(SMCLIENT_LIBS)                                \
diff --git a/src/goo-application.c b/src/goo-application.c
index 59e2042..c62de0e 100644
--- a/src/goo-application.c
+++ b/src/goo-application.c
@@ -25,9 +25,6 @@
 #include <glib/gi18n.h>
 #include <glib/gprintf.h>
 #include <gst/gst.h>
-#ifdef USE_SMCLIENT
-#  include "eggsmclient.h"
-#endif
 #include "goo-application.h"
 #include "goo-application-actions-callbacks.h"
 #include "goo-application-actions-entries.h"
@@ -85,118 +82,6 @@ static const GOptionEntry options[] = {
 };
 
 
-/* -- session management -- */
-
-
-#ifdef USE_SMCLIENT
-
-
-static void
-client_save_state (EggSMClient *client,
-                  GKeyFile    *state,
-                  gpointer     user_data)
-{
-       GApplication *application = user_data;
-       const char   *argv[2] = { NULL };
-       guint         i;
-       GList        *scan;
-
-       argv[0] = program_argv0;
-       argv[1] = NULL;
-       egg_sm_client_set_restart_command (client, 1, argv);
-
-       i = 0;
-       for (scan = gtk_application_get_windows (GTK_APPLICATION (application)); scan; scan = scan->next) {
-               GtkWidget *window = scan->data;
-               char      *key;
-
-               key = g_strdup_printf ("device%d", ++i);
-               g_key_file_set_string (state,
-                                      "Session",
-                                      key,
-                                      goo_player_get_device (goo_window_get_player (GOO_WINDOW (window))));
-
-               g_free (key);
-       }
-
-       g_key_file_set_integer (state, "Session", "devices", i);
-}
-
-
-static void
-client_quit_requested_cb (EggSMClient *client,
-                         gpointer     data)
-{
-       egg_sm_client_will_quit (client, TRUE);
-}
-
-
-static void
-client_quit_cb (EggSMClient *client,
-               gpointer     data)
-{
-       gtk_main_quit ();
-}
-
-
-static EggSMClient *
-goo_session_manager_init (GApplication *application)
-{
-       EggSMClient *client = NULL;
-
-       client = egg_sm_client_get ();
-       g_signal_connect (client,
-                         "save_state",
-                         G_CALLBACK (client_save_state),
-                         application);
-       g_signal_connect (client,
-                         "quit_requested",
-                         G_CALLBACK (client_quit_requested_cb),
-                         application);
-       g_signal_connect (client,
-                         "quit",
-                         G_CALLBACK (client_quit_cb),
-                         application);
-
-       return client;
-}
-
-
-static void
-goo_restore_session (EggSMClient  *client,
-                    GApplication *application)
-{
-       GKeyFile *state = NULL;
-       guint     i;
-
-       state = egg_sm_client_get_state_file (client);
-       i = g_key_file_get_integer (state, "Session", "devices", NULL);
-       g_assert (i > 0);
-       for (/* void */; i > 0; i--) {
-               char         *key;
-               char         *device;
-               BraseroDrive *drive;
-               GtkWidget    *window;
-
-               key = g_strdup_printf ("device%d", i);
-               device = g_key_file_get_string (state, "Session", key, NULL);
-               g_free (key);
-
-               g_assert (device != NULL);
-
-               drive = main_get_drive_for_device (device);
-               window = goo_window_new (drive);
-               gtk_widget_show (window);
-
-               g_object_unref (drive);
-               g_free (device);
-       }
-}
-
-
-#endif
-
-
 /* -- GooApplication --  */
 
 
@@ -278,9 +163,6 @@ goo_application_create_option_context (void)
 
        if (g_once_init_enter (&initialized)) {
                g_option_context_add_group (options_context, gtk_get_option_group (TRUE));
-#if USE_SMCLIENT
-               g_option_context_add_group (options_context, egg_sm_client_get_option_group ());
-#endif
                g_option_context_add_group (options_context, gst_init_get_option_group ());
 
                g_once_init_leave (&initialized, TRUE);
@@ -330,20 +212,6 @@ goo_application_command_line (GApplication            *application,
                return goo_application_command_line_finished (application, EXIT_FAILURE);
        }
 
-       /* restore the session */
-
-#if USE_SMCLIENT
-       {
-               EggSMClient *client;
-
-               client = goo_session_manager_init (application);
-               if (egg_sm_client_is_resumed (client)) {
-                       goo_restore_session (client, application);
-                       return goo_application_command_line_finished (application, EXIT_SUCCESS);
-               }
-       }
-#endif
-
        /* execute the command line */
 
        window = _gtk_application_get_current_window (GTK_APPLICATION (application));