[totem] main: Remove eggsmclient code



commit 040b118a86ac5a1f4e44d3f7662102b5afbce3d7
Author: Bastien Nocera <hadess hadess net>
Date:   Sat Mar 9 00:29:18 2013 +0100

    main: Remove eggsmclient code
    
    We now save our own session.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=672735

 configure.ac              |   45 --
 po/POTFILES.in            |    1 -
 src/Makefile.am           |   24 -
 src/eggsmclient-1.patch   |  195 -------
 src/eggsmclient-osx.c     |  235 --------
 src/eggsmclient-private.h |   59 --
 src/eggsmclient-win32.c   |  353 -----------
 src/eggsmclient-xsmp.c    | 1410 ---------------------------------------------
 src/eggsmclient.c         |  625 --------------------
 src/eggsmclient.h         |  123 ----
 src/update-from-egg.sh    |   26 -
 11 files changed, 0 insertions(+), 3096 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index fd94e57..17fad2f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -191,51 +191,6 @@ dnl Check for elements from gst-plugins-bad
 dnl Set plugins which contain below elements
 PKG_CHECK_MODULES(GST_PLUGINS_BAD, gstreamer-plugins-bad-1.0 >= 1.0.2)
 
-dnl Check the smclient backend
-AC_MSG_CHECKING([which smclient backend to use])
-AC_ARG_WITH([smclient],
-  [AS_HELP_STRING([--with-smclient],[which smclient backend to use (auto/no/xsmp/win32/quartz)])],
-  [],
-  [with_smclient=auto])
-
-if test "$with_smclient" = "auto"; then
-       # There could be several targets, given in any order (see bgo#652999)
-       gdk_targets=`$PKG_CONFIG --variable targets gdk-3.0`
-       for target in $gdk_targets; do
-               case "$target" in
-                       x11)
-                               with_smclient=xsmp
-                               PKG_CHECK_MODULES([SMCLIENT],[sm ice])
-                               break
-                               ;;
-                       win32)
-                               with_smclient=win32
-                               break
-                               ;;
-                       quartz)
-                               with_smclient=quartz
-                               break
-                               ;;
-                       *)
-                               with_smclient=no
-                               # Loop around and see if we find a better target next time
-                               ;;
-               esac
-       done
-fi
-
-AC_MSG_RESULT([$with_smclient])
-
-if test "$with_smclient" != "no"; then
-       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"])
-
-
 # ================================================================
 # Python plugins
 # ================================================================
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8126429..4f42e9f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -13,7 +13,6 @@ data/totem.desktop.in.in.in
 src/backend/bacon-video-widget.c
 src/eggdesktopfile.c
 src/eggfileformatchooser.c
-src/eggsmclient.c
 src/gst/totem-time-helpers.c
 src/properties/bacon-video-widget-properties.c
 src/totem-audio-preview.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 9222c7c..92893b8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -109,30 +109,6 @@ libtotem_la_LIBADD = \
        backend/libbaconvideowidget.la  \
        $(PLAYER_LIBS)
 
-if WITH_SMCLIENT
-libtotem_la_SOURCES += \
-       eggsmclient.c \
-       eggsmclient.h \
-       eggsmclient-private.h \
-       $(NULL)
-libtotem_la_CFLAGS += $(SMCLIENT_CFLAGS)
-libtotem_la_LIBADD += $(SMCLIENT_LIBS)
-
-if WITH_SMCLIENT_XSMP
-libtotem_la_SOURCES += \
-       eggdesktopfile.c \
-       eggdesktopfile.h \
-       eggsmclient-xsmp.c
-libtotem_la_CPPFLAGS += -DEGG_SM_CLIENT_BACKEND_XSMP
-endif
-if WITH_SMCLIENT_WIN32
-libtotem_la_SOURCES += eggsmclient-win32.c
-endif
-if WITH_SMCLIENT_QUARTZ
-libtotem_la_SOURCES += eggsmclient-osx.c
-endif
-endif
-
 # Totem
 totem_SOURCES = totem.c
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]