diff options
author | 2013-10-06 18:55:39 +0200 | |
---|---|---|
committer | 2013-10-06 18:55:39 +0200 | |
commit | da2da15dbd758650b28fef194388c81cded5245a (patch) | |
tree | 7593175a3f4ad866b66059ee0b679789bafa9156 /plugins | |
parent | e3a00b2a165b18cda5a34e5542d30d2fe208efb7 (diff) |
strip eggsmclient from 0.6
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/gtkui/Makefile.am | 24 | ||||
-rw-r--r-- | plugins/gtkui/gtkui.c | 45 |
2 files changed, 12 insertions, 57 deletions
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); |