applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove screensaver

Browse source 
2002-03-26  jacob berkman  <jacob@ximian.com>

	* capplets/Makefile.am (always_built_SUBDIRS): remove screensaver

	* capplets/screensaver/: remove as xscreensaver provides these
	things

	* configure.in: remove xscreensaver check again as xscreensaver
	supplies the .desktop file for itself
	(AC_OUTPUT): remove capplets/screensaver/Makefile
This commit is contained in:
jacob berkman 2002-03-27 00:10:38 +00:00 • committed by Jacob Berkman
parent ff128913a4
commit 51829bd809
10 changed files with 16 additions and 1156 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
2002-03-26 jacob berkman <jacob@ximian.com>
* capplets/Makefile.am (always_built_SUBDIRS): remove screensaver
* capplets/screensaver/: remove as xscreensaver provides these
things
* configure.in: remove xscreensaver check again as xscreensaver
supplies the .desktop file for itself
(AC_OUTPUT): remove capplets/screensaver/Makefile
2002-03-26 Richard Hestilow <hestilow@ximian.com> 2002-03-26 Richard Hestilow <hestilow@ximian.com>
* configure.in: The check for xscreensaver got removed, add it back * configure.in: The check for xscreensaver got removed, add it back

2
capplets/Makefile.am
View file

@ -3,6 +3,6 @@ always_built_SUBDIRS = \
default-applications desktop-links \ default-applications desktop-links \
background keyboard mouse sound \ background keyboard mouse sound \
file-types theme-switcher ui-properties \ file-types theme-switcher ui-properties \
screensaver font keybindings font keybindings
SUBDIRS = $(always_built_SUBDIRS) SUBDIRS = $(always_built_SUBDIRS)

3
capplets/screensaver/.cvsignore
View file

@ -1,3 +0,0 @@
Makefile
Makefile.in
screensaver.desktop

1123
capplets/screensaver/ChangeLog
View file

File diff suppressed because it is too large Load diff

14
capplets/screensaver/Makefile.am
View file

@ -1,14 +0,0 @@
@INTLTOOL_DESKTOP_RULE@
iconsdir = $(GNOMECC_ICONS_DIR)
icons_DATA = screensaver-capplet.png
desktop_iconsdir = $(datadir)/pixmaps
desktop_icons_DATA = screensaver-capplet.png
desktopdir = $(GNOMECC_DESKTOP_DIR)
Desktop_in_files = screensaver.desktop.in
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
EXTRA_DIST = $(icons_DATA) $(Desktop_in_files)

BIN
capplets/screensaver/screensaver-capplet.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 3.1 KiB

8
capplets/screensaver/screensaver.desktop.in
View file

@ -1,8 +0,0 @@
[Desktop Entry]
_Name=Screensaver
_Comment=Configure the settings of the screensaver
Exec=xscreensaver-demo --crapplet
Icon=screensaver-capplet.png
Terminal=0
Type=Application
Categories=Application;Settings;

6
configure.in
View file

@ -53,11 +53,6 @@ PKG_CHECK_MODULES(GNOME, libgnomeui-2.0)
PKG_CHECK_MODULES(VFS_CAPPLET, $COMMON_MODULES gnome-vfs-module-2.0 gnome-vfs-2.0) PKG_CHECK_MODULES(VFS_CAPPLET, $COMMON_MODULES gnome-vfs-module-2.0 gnome-vfs-2.0)
PKG_CHECK_MODULES(SOUND_CAPPLET, esound) PKG_CHECK_MODULES(SOUND_CAPPLET, esound)
AC_PATH_PROG(XSCREENSAVER, xscreensaver, no)
if test "$XSCREENSAVER" = no ; then
AC_MSG_ERROR(xscreensaver was not found. It can be downloaded from http://www.jwz.org/xscreensaver/.)
fi
AC_PATH_PROG(GCONFTOOL, gconftool-2) AC_PATH_PROG(GCONFTOOL, gconftool-2)
dnl ============================================== dnl ==============================================
@ -202,7 +197,6 @@ capplets/font/Makefile
capplets/keybindings/Makefile capplets/keybindings/Makefile
capplets/keyboard/Makefile capplets/keyboard/Makefile
capplets/mouse/Makefile capplets/mouse/Makefile
capplets/screensaver/Makefile
capplets/sound/Makefile capplets/sound/Makefile
capplets/theme-switcher/Makefile capplets/theme-switcher/Makefile
capplets/theme-switcher/control/Makefile capplets/theme-switcher/control/Makefile

4
po/ChangeLog
View file

@ -1,3 +1,7 @@
2002-03-26 jacob berkman <jacob@ximian.com>
* POTFILES.in: remove screensaver .desktop file
2002-03-26 Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz> 2002-03-26 Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>
* sk.po: Updated Slovak translation. * sk.po: Updated Slovak translation.

1
po/POTFILES.in
View file

@ -50,7 +50,6 @@ capplets/keyboard/keyboard.desktop.in
capplets/mouse/gnome-mouse-properties.c capplets/mouse/gnome-mouse-properties.c
capplets/mouse/gnome-mouse-properties.glade capplets/mouse/gnome-mouse-properties.glade
capplets/mouse/mouse.desktop.in capplets/mouse/mouse.desktop.in
capplets/screensaver/screensaver.desktop.in
capplets/sound/sound.desktop.in capplets/sound/sound.desktop.in
capplets/sound/sound-properties-capplet.c capplets/sound/sound-properties-capplet.c
capplets/sound/sound-properties.glade capplets/sound/sound-properties.glade