strip eggsmclient from 0.6

3 files changed, 18 insertions, 63 deletions

diff --git a/configure.ac b/configure.ac
index 764df2a2..519938b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -204,8 +204,8 @@ AS_IF([test "${enable_gtk3}" = "yes"], [
     ], [
        PKG_CHECK_MODULES(GTK3_DEPS, gtk+-3.0 >= 3.0 gthread-2.0 glib-2.0, HAVE_GTK3=yes, HAVE_GTK3=no)
     ])
-    AC_CHECK_LIB([SM], [main], [HAVE_SM=yes;SM_LIBS="-lSM";AC_SUBST(SM_LIBS)])
-    AC_CHECK_LIB([ICE], [main], [HAVE_ICE=yes;ICE_LIBS="-lICE";AC_SUBST(ICE_LIBS)])
+dnl    AC_CHECK_LIB([SM], [main], [HAVE_SM=yes;SM_LIBS="-lSM";AC_SUBST(SM_LIBS)])
+dnl    AC_CHECK_LIB([ICE], [main], [HAVE_ICE=yes;ICE_LIBS="-lICE";AC_SUBST(ICE_LIBS)])
     if test "$OS_OSX" = "yes"; then
         PKG_CHECK_MODULES(GTK_MAC, gtk-mac-integration)
         AC_SUBST(GTK_MAC_LIBS)
@@ -223,8 +223,8 @@ AS_IF([test "${enable_gtk2}" = "yes"], [
     ], [
         PKG_CHECK_MODULES(GTK2_DEPS, gtk+-2.0 >= 2.12 gthread-2.0 glib-2.0 gtkglext-1.0, HAVE_GTK2=yes, HAVE_GTK2=no)
     ])
-    AC_CHECK_LIB([SM], [main], [HAVE_SM=yes;SM_LIBS="-lSM";AC_SUBST(SM_LIBS)])
-    AC_CHECK_LIB([ICE], [main], [HAVE_ICE=yes;ICE_LIBS="-lICE";AC_SUBST(ICE_LIBS)])
+dnl    AC_CHECK_LIB([SM], [main], [HAVE_SM=yes;SM_LIBS="-lSM";AC_SUBST(SM_LIBS)])
+dnl    AC_CHECK_LIB([ICE], [main], [HAVE_ICE=yes;ICE_LIBS="-lICE";AC_SUBST(ICE_LIBS)])
 ], [
     HAVE_GTK2=no
 ])
@@ -705,8 +705,8 @@ AM_CONDITIONAL(HAVE_PSF, test "x$HAVE_PSF" = "xyes")
 AM_CONDITIONAL(HAVE_SHN, test "x$HAVE_SHN" = "xyes")
 AM_CONDITIONAL(HAVE_MONO2STEREO, test "x$HAVE_MONO2STEREO" = "xyes")
 AM_CONDITIONAL(HAVE_SHELLEXECUI, test "x$HAVE_SHELLEXECUI" = "xyes")
-AM_CONDITIONAL(HAVE_SM, test "x$HAVE_SM" = "xyes")
-AM_CONDITIONAL(HAVE_ICE, test "x$HAVE_ICE" = "xyes")
+dnl AM_CONDITIONAL(HAVE_SM, test "x$HAVE_SM" = "xyes")
+dnl AM_CONDITIONAL(HAVE_ICE, test "x$HAVE_ICE" = "xyes")
 AM_CONDITIONAL(HAVE_ALAC, test "x$HAVE_ALAC" = "xyes")
 AM_CONDITIONAL(HAVE_WMA, test "x$HAVE_WMA" = "xyes")
 AM_CONDITIONAL(HAVE_PLTBROWSER, test "x$HAVE_PLTBROWSER" = "xyes")
diff --git a/plugins/gtkui/Makefile.am b/plugins/gtkui/Makefile.am
index f39436bb..8d93b1b2 100644
--- a/plugins/gtkui/Makefile.am
+++ b/plugins/gtkui/Makefile.am
@@ -1,17 +1,17 @@
 gtkuidir = $(libdir)/$(PACKAGE)
 
-if HAVE_SM
-if HAVE_ICE
-SM_SOURCES = smclient/eggdesktopfile.h\
-	smclient/eggsmclient-private.h\
-	smclient/eggsmclient.h\
-	smclient/eggdesktopfile.c\
-	smclient/eggsmclient-xsmp.c\
-	smclient/eggsmclient.c
-SM_LIBADD = $(SM_LIBS) $(ICE_LIBS)
-SM_CFLAGS = -DEGG_SM_CLIENT_BACKEND_XSMP -DG_LOG_DOMAIN=\""deadbeef"\"
-endif
-endif
+#if HAVE_SM
+#if HAVE_ICE
+#SM_SOURCES = smclient/eggdesktopfile.h\
+#	smclient/eggsmclient-private.h\
+#	smclient/eggsmclient.h\
+#	smclient/eggdesktopfile.c\
+#	smclient/eggsmclient-xsmp.c\
+#	smclient/eggsmclient.c
+#SM_LIBADD = $(SM_LIBS) $(ICE_LIBS)
+#SM_CFLAGS = -DEGG_SM_CLIENT_BACKEND_XSMP -DG_LOG_DOMAIN=\""deadbeef"\"
+#endif
+#endif
 
 GTKUI_SOURCES =    gtkui.c gtkui.h\
 				   callbacks.c interface.c support.c callbacks.h interface.h support.h\
diff --git a/plugins/gtkui/gtkui.c b/plugins/gtkui/gtkui.c
index b7866b49..84efce7b 100644
--- a/plugins/gtkui/gtkui.c
+++ b/plugins/gtkui/gtkui.c
@@ -59,10 +59,6 @@
 #else
 #include "retina.h"
 #endif
-#undef EGG_SM_CLIENT_BACKEND_XSMP
-#ifdef EGG_SM_CLIENT_BACKEND_XSMP
-#include "smclient/eggsmclient.h"
-#endif
 #include "actionhandlers.h"
 #include "hotkeys.h"
 
@@ -875,26 +871,6 @@ gtkui_message (uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2) {
     return 0;
 }
 
-#ifdef EGG_SM_CLIENT_BACKEND_XSMP
-static void
-smclient_quit_requested (EggSMClient *client, gpointer user_data) {
-    egg_sm_client_will_quit (client, TRUE);
-}
-
-static void
-smclient_quit_cancelled (EggSMClient *client, gpointer user_data) {
-}
-
-static void
-smclient_quit (EggSMClient *client, gpointer user_data) {
-    gtkui_quit ();
-}
-
-static void
-smclient_save_state (EggSMClient *client, const char *state_dir, gpointer user_data) {
-}
-#endif
-
 static gboolean
 unlock_playlist_columns_cb (void *ctx) {
 //    ddb_listview_lock_columns (DDB_LISTVIEW (lookup_widget (mainwin, "playlist")), 0);
@@ -983,27 +959,6 @@ gtkui_thread (void *ctx) {
     }
 
     gtk_disable_setlocale ();
-#ifdef EGG_SM_CLIENT_BACKEND_XSMP
-    g_type_init ();
-    GOptionContext *goption_context;
-    GError *err = NULL;
-    goption_context = g_option_context_new (_("- Test logout functionality"));
-    g_option_context_add_group (goption_context, gtk_get_option_group (TRUE));
-    g_option_context_add_group (goption_context, egg_sm_client_get_option_group ());
-
-    if (!g_option_context_parse (goption_context, &argc, (char ***)&argv, &err))
-    {
-        g_printerr ("Could not parse arguments: %s\n", err->message);
-        g_error_free (err);
-    }
-    else {
-        EggSMClient *client = egg_sm_client_get ();
-        g_signal_connect (client, "quit-requested", G_CALLBACK (smclient_quit_requested), NULL);
-        g_signal_connect (client, "quit-cancelled", G_CALLBACK (smclient_quit_cancelled), NULL);
-        g_signal_connect (client, "quit", G_CALLBACK (smclient_quit), NULL);
-        g_signal_connect (client, "save-state", G_CALLBACK (smclient_save_state), NULL);
-    }
-#endif
 
     gtk_init (&argc, (char ***)&argv);