gnome-session r5151 - in trunk: . compat po

[nnielsen svn gnome org]

Author: nnielsen
Date: Fri Nov 14 16:10:13 2008
New Revision: 5151
URL: http://svn.gnome.org/viewvc/gnome-session?rev=5151&view=rev

Log:
	* configure.in:
	* compat/Makefile.am:
	* compat/README:
	* gnome-keyring-daemon-wrapper.c: (removed)
	* gnome-keyring-daemon-wrapper.desktop.in.in.in: (removed)
	Remove compat wrapper for gnome-keyring session interaction.

Removed:
   trunk/compat/gnome-keyring-daemon-wrapper.c
   trunk/compat/gnome-keyring-daemon-wrapper.desktop.in.in.in
Modified:
   trunk/ChangeLog
   trunk/compat/Makefile.am
   trunk/compat/README
   trunk/configure.in
   trunk/po/POTFILES.in
   trunk/po/POTFILES.skip

Modified: trunk/compat/Makefile.am
==============================================================================
--- trunk/compat/Makefile.am	(original)
+++ trunk/compat/Makefile.am	Fri Nov 14 16:10:13 2008
@@ -2,12 +2,10 @@
 	$(WARN_CFLAGS)				\
 	$(DBUS_GLIB_CFLAGS)			\
 	$(GCONF_CFLAGS)				\
-	$(GNOME_KEYRING_CFLAGS)			\
 	$(GTK_CFLAGS)				\
 	-I$(top_srcdir)/egg			\
 	-DAT_SPI_REGISTRYD_DIR=\""$(AT_SPI_REGISTRYD_DIR)"\" \
 	-DDEFAULT_SESSION_DIR=\""$(default_sessiondir)"\" \
-	-DGNOME_KEYRING_DAEMON=\""$(GNOME_KEYRING_DAEMON)"\" \
 	-DSYSCONFDIR=\""$(sysconfdir)"\"
 
 LDADD =						\
@@ -17,13 +15,11 @@
 helperdir = $(pkglibdir)/helpers
 helper_PROGRAMS =				\
 	at-spi-registryd-wrapper		\
-	gnome-keyring-daemon-wrapper		\
 	gnome-settings-daemon-helper
 
 default_sessiondir = $(datadir)/gnome/autostart
 default_session_in_in_files = 				\
 	at-spi-registryd-wrapper.desktop.in.in	\
-	gnome-keyring-daemon-wrapper.desktop.in.in	\
 	gnome-settings-daemon-helper.desktop.in.in
 default_session_in_files = $(default_session_in_in_files:.desktop.in.in=.desktop.in)
 default_session_DATA = $(default_session_in_files:.desktop.in=.desktop)
@@ -31,13 +27,6 @@
 at_spi_registryd_wrapper_SOURCES =		\
 	at-spi-registryd-wrapper.c
 
-gnome_keyring_daemon_wrapper_SOURCES =		\
-	gnome-keyring-daemon-wrapper.c
-gnome_keyring_daemon_wrapper_LDADD =		\
-	$(top_builddir)/egg/libeggsmclient.la	\
-	$(GNOME_KEYRING_LIBS)			\
-	$(LDADD)
-
 gnome_settings_daemon_helper_SOURCES =		\
 	gnome-settings-daemon-helper.c
 gnome_settings_daemon_helper_LDADD =		\

Modified: trunk/compat/README
==============================================================================
--- trunk/compat/README	(original)
+++ trunk/compat/README	Fri Nov 14 16:10:13 2008
@@ -15,22 +15,6 @@
     it should register for XSMP auto-restart, so that if it crashes,
     gnome-session will restart it.
 
-  * gnome-keyring-daemon-wrapper: As with at-spi-registryd-wrapper,
-    this translates between XSMP and gnome-keyring's own custom
-    protocol. Unlike at-spi-registryd-wrapper, it actually hangs
-    around for the entire session, so that it can force
-    gnome-keyring-daemon to exit when the session ends.
-
-    It also uses gnome-session's new Setenv D-Bus interface to set the
-    GNOME_KEYRING_SOCKET environment variable in gnome-session's (and
-    its children's) environment.
-
-    In the future, gnome-keyring-daemon should just link to
-    EggSMClient (or its replacement) and use the Setenv D-Bus
-    interface itself. (Or perhaps GNOME_KEYRING_SOCKET is unnecessary
-    in the shiny new future since libgnomekeyring uses D-Bus to find
-    the daemon as well.)
-
   * gnome-settings-daemon-helper: This does two things that have
     traditionally been done by gnome-session, but which ought to be
     done by gnome-settings-daemon: setting the screen resolution, and

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri Nov 14 16:10:13 2008
@@ -55,7 +55,6 @@
 GTK_REQUIRED=2.11.1
 GLADE_REQUIRED=2.3.6
 DBUS_GLIB_REQUIRED=0.76
-GNOME_KEYRING_REQUIRED=2.21.92
 POLKIT_GNOME_REQUIRED=0.7
 
 dnl ====================================================================
@@ -123,16 +122,6 @@
 PATH=$old_path
 
 dnl ====================================================================
-dnl GNOME Keyring Checks
-dnl ====================================================================
-AC_PATH_PROG(GNOME_KEYRING_DAEMON, gnome-keyring-daemon, no)
-if test x"$GNOME_KEYRING_DAEMON" = xno; then
-  AC_MSG_ERROR([gnome-keyring-daemon executable not found in your path - should be installed with gnome-keyring])
-fi
-AC_SUBST(GNOME_KEYRING_DAEMON)
-PKG_CHECK_MODULES(GNOME_KEYRING, gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED)
-
-dnl ====================================================================
 dnl X development libraries check
 dnl ====================================================================
 
@@ -361,7 +350,6 @@
 capplet/Makefile
 compat/Makefile
 compat/at-spi-registryd-wrapper.desktop.in.in
-compat/gnome-keyring-daemon-wrapper.desktop.in.in
 compat/gnome-settings-daemon-helper.desktop.in.in
 doc/Makefile
 doc/dbus/Makefile

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Fri Nov 14 16:10:13 2008
@@ -5,7 +5,6 @@
 capplet/main.c
 compat/at-spi-registryd-wrapper.c
 compat/at-spi-registryd-wrapper.desktop.in.in.in
-compat/gnome-keyring-daemon-wrapper.desktop.in.in.in
 compat/gnome-settings-daemon-helper.desktop.in.in.in
 data/gnome.desktop.in
 data/gnome-session.schemas.in

Modified: trunk/po/POTFILES.skip
==============================================================================
--- trunk/po/POTFILES.skip	(original)
+++ trunk/po/POTFILES.skip	Fri Nov 14 16:10:13 2008
@@ -3,8 +3,6 @@
 # Please keep this file sorted alphabetically.
 compat/at-spi-registryd-wrapper.desktop.in
 compat/at-spi-registryd-wrapper.desktop.in.in
-compat/gnome-keyring-daemon-wrapper.desktop.in
-compat/gnome-keyring-daemon-wrapper.desktop.in.in
 compat/gnome-settings-daemon-helper.desktop.in
 compat/gnome-settings-daemon-helper.desktop.in.in
 data/gnome-wm.desktop.in