- cleanup launchers config.in

2 files changed, 1 insertions, 13 deletions

diff --git a/core/launcher/config.in b/core/launcher/config.in
index f974046..31da148 100644
--- a/core/launcher/config.in
+++ b/core/launcher/config.in
@@ -1,16 +1,4 @@
   config LAUNCHER
     boolean "opie-taskbar (program launcher qpe for Opie)"
     default "y"
     depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBQRSYNC
-
-if LAUNCHER
-  config PRELOAD
-    boolean
-    default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2UI && LAUNCHER
-
-  config LAUNCHER_CORE
-    boolean
-    default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2UI && LAUNCHER && PRELOAD
-endif
diff --git a/packages b/packages
index 690cbdb..ee5a641 100644
--- a/packages
+++ b/packages
@@ -1,168 +1,168 @@
 CONFIG_ABOUTAPPLET	core/applets/aboutapplet	aboutapplet.pro
 CONFIG_ADDRESSBOOK	core/pim/addressbook	addressbook.pro
 CONFIG_ADVANCEDFM	noncore/apps/advancedfm	advancedfm.pro
 CONFIG_APPEARANCE2	noncore/settings/appearance2	appearance2.pro
 CONFIG_APPLET_EXAMPLE   examples/applet example.pro
 CONFIG_APPSKEY	noncore/settings/appskey	appskey.pro
 CONFIG_AQPKG	noncore/settings/aqpkg	aqpkg.pro
 CONFIG_AUTOROTATEAPPLET	noncore/applets/autorotateapplet	autorotateapplet.pro
 CONFIG_BACKGAMMON	noncore/games/backgammon backgammon.pro
 CONFIG_BACKUP	noncore/settings/backup	backup.pro
 CONFIG_BARTENDER noncore/apps/opie-bartender	bartender.pro
 CONFIG_BATTERYAPPLET	core/applets/batteryapplet	batteryapplet.pro
 CONFIG_BEND	noncore/unsupported/mail2/bend	bend.pro
 CONFIG_BIGSCREEN_EXAMPLE       libopie/big-screen/example      osplitter_mail.pro
 CONFIG_BINARY	noncore/tools/calc2/binary	binary.pro
 CONFIG_BLUE-PIN	noncore/net/opietooth/blue-pin	blue-pin.pro
 CONFIG_BOUNCE	noncore/games/bounce	bounce.pro
 CONFIG_BUTTON-SETTINGS	core/settings/button	button.pro
 CONFIG_BUZZWORD	noncore/games/buzzword	buzzword.pro
 CONFIG_CALC2	noncore/tools/calc2	calc.pro
 CONFIG_CALCULATOR	noncore/tools/calculator	calculator.pro
 CONFIG_CALIBRATE	core/apps/calibrate	calibrate.pro
 CONFIG_CAMERA	noncore/multimedia/camera	camera.pro
 CONFIG_CARDMON	core/applets/cardmon	cardmon.pro
 CONFIG_CHECKBOOK	noncore/apps/checkbook	checkbook.pro
 CONFIG_CITYTIME	core/settings/citytime	citytime.pro
 CONFIG_CLIPBOARDAPPLET	core/applets/clipboardapplet	clipboardapplet.pro
 CONFIG_CLOCKAPPLET	core/applets/clockapplet	clockapplet.pro
 CONFIG_CLOCK	noncore/tools/clock	clock.pro
 CONFIG_CONFEDIT	noncore/apps/confedit	confedit.pro
 CONFIG_DAGGER noncore/apps/dagger dagger.pro
 CONFIG_DASHER	inputmethods/dasher	dasher.pro
 CONFIG_DATEBOOK	core/pim/datebook	datebook.pro
 CONFIG_DATEBOOK2	core/pim/datebook2	datebook2.pro
 CONFIG_DECO_FLAT	noncore/decorations/flat	flat.pro
 CONFIG_DECO_LIQUID	noncore/decorations/liquid	liquid.pro
 CONFIG_DECO_POLISHED	noncore/decorations/polished	polished.pro
 CONFIG_DICTIONARY	noncore/apps/dictionary	dictionary.pro
 CONFIG_DOCTAB  noncore/settings/doctab doctab.pro
 CONFIG_DRAWPAD	noncore/graphics/drawpad	drawpad.pro
 CONFIG_DVORAK	inputmethods/dvorak	dvorak.pro
 CONFIG_EMBEDDEDKONSOLE	core/apps/embeddedkonsole	embeddedkonsole.pro
 CONFIG_EUROCONV		noncore/tools/euroconv/ euroconv.pro
 CONFIG_EXAMPLE_BOARD    examples/inputmethod    example.pro
 CONFIG_EXAMPLE_MENU     examples/menuapplet menuapplet.pro
 CONFIG_EXAMPLE_VPN      examples/networksettings        example.pro
 CONFIG_FIFTEEN	noncore/games/fifteen	fifteen.pro
 CONFIG_FILEBROWSER	noncore/unsupported/filebrowser	filebrowser.pro
 CONFIG_FLAT	noncore/styles/flat	flat.pro
 CONFIG_FORMATTER	noncore/tools/formatter	formatter.pro
 CONFIG_FREETYPE	freetype	freetype.pro
 CONFIG_FRESH	noncore/styles/fresh	fresh.pro
 CONFIG_FTPLIB	noncore/net/ftplib	ftplib.pro
 CONFIG_GO	noncore/games/go	go.pro
 CONFIG_GSMTOOL	noncore/unsupported/gsmtool	gsmtool.pro
 CONFIG_GUTENBROWSER	noncore/apps/opie-gutenbrowser	opie-gutenbrowser.pro
 CONFIG_HANDWRITING	inputmethods/handwriting	handwriting.pro
 CONFIG_HELPBROWSER	core/apps/helpbrowser	helpbrowser.pro
 CONFIG_HOMEAPPLET	core/applets/homeapplet	homeapplet.pro
 CONFIG_INTERFACES	noncore/settings/networksettings/interfaces	interfaces.pro
 CONFIG_IRDAAPPLET	core/applets/irdaapplet	irdaapplet.pro
 CONFIG_JUMPX	inputmethods/jumpx	jumpx.pro
 CONFIG_KBILL	noncore/games/kbill	kbill.pro
 CONFIG_KCHECKERS	noncore/games/kcheckers	kcheckers.pro
 CONFIG_KEYBOARD	inputmethods/keyboard	keyboard.pro
 CONFIG_KEYPEBBLE	noncore/comm/keypebble	keypebble.pro
 CONFIG_KEYVIEW	development/keyview	keyview.pro
 CONFIG_KEYZCFG  noncore/apps/keyz-cfg  keyz-cfg.pro
 CONFIG_KJUMPX	inputmethods/kjumpx	kjumpx.pro
 CONFIG_KPACMAN	noncore/games/kpacman	kpacman.pro
 CONFIG_LANGUAGE	noncore/settings/language	language.pro
-CONFIG_LAUNCHER_CORE	core/launcher	server.pro
+CONFIG_LAUNCHER		core/launcher	server.pro
 CONFIG_LAUNCHER-SETTINGS	core/settings/launcher	launcher.pro
 CONFIG_LIBFFMPEG	core/multimedia/opieplayer/libffmpeg	libffmpeg.pro
 CONFIG_LIBFLASH	core/multimedia/opieplayer/libflash	libflash.pro
 CONFIG_LIBKATE  noncore/apps/tinykate/libkate libkate.pro
 CONFIG_LIBMAD	core/multimedia/opieplayer/libmad	libmad.pro
 CONFIG_LIBMAIL	noncore/unsupported/mail2/libmail	libmail.pro
 CONFIG_LIBMAILWRAPPER   noncore/net/mail/libmailwrapper  libmailwrapper.pro
 CONFIG_LIBMPEG3	core/multimedia/opieplayer/libmpeg3	libmpeg3.pro
 CONFIG_LIBOPIE2CORE	libopie2/opiecore	opiecore.pro
 CONFIG_LIBOPIE2DB	libopie2/opiedb	opiedb.pro
 CONFIG_LIBOPIE2EXAMPLES	libopie2/examples	examples.pro
 CONFIG_LIBOPIE2MM	libopie2/opiemm	opiemm.pro
 CONFIG_LIBOPIE2NET	libopie2/opienet	opienet.pro
 CONFIG_LIBOPIE2PIM	libopie2/opiepim	opiepim.pro
 CONFIG_PIMCONVERTER     noncore/tools/pimconverter converter.pro
 CONFIG_LIBOPIE2UI	libopie2/opieui	opieui.pro
 CONFIG_LIBOPIE	libopie	libopie.pro
 CONFIG_LIBOPIE_PIM	libopie/pim	pim.pro
 CONFIG_LIBOPIETOOTH	noncore/net/opietooth/lib	lib.pro
 CONFIG_LIBQPE	library	library.pro
 CONFIG_LIBQPE-X11	x11/libqpe-x11	libqpe-x11.pro
 CONFIG_LIBQRSYNC    rsync   rsync.pro
 CONFIG_LIBQTAUX	libqtaux	libqtaux.pro
 CONFIG_LIBSLCOMPAT	libslcompat	libslcompat.pro
 CONFIG_LIBSQL	libsql	libsql.pro
 CONFIG_LIBTREMOR core/multimedia/opieplayer/vorbis/tremor tremor.pro
 CONFIG_LIBTREMORPLUGIN core/multimedia/opieplayer/vorbis libtremor.pro
 CONFIG_LIGHT-AND-POWER	core/settings/light-and-power	light-and-power.pro
 CONFIG_LIQUID	noncore/styles/liquid	liquid.pro
 CONFIG_LOGOUTAPPLET	core/applets/logoutapplet	logoutapplet.pro
 CONFIG_MAIL3		noncore/net/mail		mail.pro
 CONFIG_MAILAPPLET     noncore/net/mail/taskbarapplet  taskbarapplet.pro
 CONFIG_MAILIT		noncore/unsupported/mailit		mailit.pro
 CONFIG_MAIN_TAB_EXAMPLE examples/main-tab       example.pro
 CONFIG_MEDIUMMOUNT	noncore/settings/mediummount	mediummount.pro
 CONFIG_MEMORYAPPLET	noncore/applets/memoryapplet	memoryapplet.pro
 CONFIG_METAL	noncore/styles/metal	metal.pro
 CONFIG_MINDBREAKER	noncore/games/mindbreaker	mindbreaker.pro
 CONFIG_MINESWEEP	noncore/games/minesweep	minesweep.pro
 CONFIG_MOBILEMSG	noncore/comm/mobilemsg	mobilemsg.pro
 CONFIG_MODPLUG	core/multimedia/opieplayer/modplug	modplug.pro
 CONFIG_MULTIKEYAPPLET core/applets/multikeyapplet	multikeyapplet.pro
 CONFIG_MULTIKEY	inputmethods/multikey	multikey.pro
 CONFIG_NETSYSTEMTIME	noncore/settings/netsystemtime	netsystemtime.pro
 CONFIG_NETWORKAPPLET	noncore/applets/networkapplet	networkapplet.pro
 CONFIG_NETWORKSETUP	noncore/settings/networksettings	networksettings.pro
 CONFIG_NOTESAPPLET	noncore/applets/notesapplet	notesapplet.pro
 CONFIG_OAPP	core/apps/oapp	oapp.pro
 CONFIG_OBEX	core/applets/obex2	obex.pro
 CONFIG_ODICT	noncore/apps/odict	odict.pro
 CONFIG_OIPKG	noncore/unsupported/oipkg	oipkg.pro
 CONFIG_OPIEALARM	core/opiealarm	opiealarm.pro
 CONFIG_OPIE-CONSOLE	noncore/apps/opie-console	opie-console.pro
 CONFIG_OPIE_EYE	noncore/graphics/opie-eye	phunk_view.pro
 CONFIG_OPIE_EYE_SLAVE	noncore/graphics/opie-eye/slave	slave.pro
 CONFIG_OPIEFTP	noncore/net/opieftp	opieftp.pro
 CONFIG_OPIEIRC	noncore/net/opieirc	opieirc.pro
 CONFIG_OPIE-LOGIN	core/opie-login	opie-login.pro
 CONFIG_OPIEMAIL2	noncore/unsupported/mail2 mail.pro
 CONFIG_OPIEPLAYER2	noncore/multimedia/opieplayer2	opieplayer2.pro
 CONFIG_OPIEPLAYER	core/multimedia/opieplayer	opieplayer.pro
 CONFIG_OPIE-RDESKTOP	noncore/net/opierdesktop	opierdesktop.pro
 CONFIG_OPIE-READER	noncore/apps/opie-reader	opie-reader.pro
 CONFIG_OPIEREC		noncore/multimedia/opierec	opierec.pro
 CONFIG_OPIE-SHEET	noncore/apps/opie-sheet	opie-sheet.pro
 CONFIG_OPIE-SH	noncore/tools/opie-sh	opie-sh.pro
 CONFIG_OPIETOOTH-APPLET	noncore/net/opietooth/applet	applet.pro
 CONFIG_OPIETOOTH-MANAGER	noncore/net/opietooth/manager	manager.pro
 CONFIG_OPIE-WRITE	noncore/apps/opie-write	opie-write.pro
 CONFIG_OSEARCH	core/pim/osearch	osearch.pro
 CONFIG_OXYGEN	noncore/apps/oxygen	oxygen.pro
 CONFIG_PACKAGEMANAGER	noncore/settings/packagemanager	packagemanager.pro
 CONFIG_PARASHOOT	noncore/games/parashoot	parashoot.pro
 CONFIG_PICKBOARD	inputmethods/pickboard	pickboard.pro
 CONFIG_POWERCHORD	noncore/multimedia/powerchord	powerchord.pro
 CONFIG_PPP      noncore/settings/networksettings/ppp    ppp.pro
 CONFIG_QASHMONEY	noncore/apps/qashmoney	qashmoney.pro
 CONFIG_QASTEROIDS	noncore/games/qasteroids	qasteroids.pro
 CONFIG_QCOP	core/apps/qcop	qcop.pro
 CONFIG_QPDF	noncore/unsupported/qpdf	qpdf.pro
 CONFIG_QUICKLAUNCHER core/tools/quicklauncher quicklauncher.pro
 CONFIG_QWS	core/qws	qws.pro
 CONFIG_REMOTE	noncore/tools/remote	remote.pro
 CONFIG_RESTARTAPPLET2	core/applets/restartapplet2	restartapplet2.pro
 CONFIG_RESTARTAPPLET	core/applets/restartapplet	restartapplet.pro
 CONFIG_ROTATEAPPLET	core/applets/rotateapplet	rotateapplet.pro
 CONFIG_ROTATION	noncore/settings/rotation	rotation.pro
 CONFIG_RUNAPPLET	core/applets/runapplet	runapplet.pro
 CONFIG_SCREENSHOTAPPLET	core/applets/screenshotapplet	screenshotapplet.pro
 CONFIG_SECURITY	core/settings/security	security.pro
 CONFIG_SFCAVE	noncore/games/sfcave	sfcave.pro
 CONFIG_SFCAVE-SDL	noncore/games/sfcave-sdl	sfcave-sdl.pro
 CONFIG_SHOWIMG	noncore/multimedia/showimg	showimg.pro
 CONFIG_SIMPLE_EXAMPLE   examples/simple example.pro
 CONFIG_SIMPLE_ICON      examples/simple-icon    example.pro
 CONFIG_SIMPLE_MAIN      examples/simple-main    example.pro