16 files changed, 4 insertions, 2 deletions
diff --git a/noncore/unsupported/config.in b/noncore/unsupported/config.in
index 676e953..dfd46de 100644
--- a/noncore/unsupported/config.in
+++ b/noncore/unsupported/config.in
@@ -1,6 +1,8 @@
 source noncore/unsupported/filebrowser/config.in
 source noncore/unsupported/gsmtool/config.in
 source noncore/unsupported/mail2/config.in
 source noncore/unsupported/mailit/config.in
 source noncore/unsupported/oipkg/config.in
 source noncore/unsupported/qpdf/config.in
+source noncore/unsupported/showimg/config.in
+source noncore/unsupported/ubrowser/config.in
diff --git a/noncore/multimedia/showimg/.cvsignore b/noncore/unsupported/showimg/.cvsignore
index 93b952d..93b952d 100644
--- a/noncore/multimedia/showimg/.cvsignore
+++ b/noncore/unsupported/showimg/.cvsignore
diff --git a/noncore/multimedia/showimg/ImageFileSelector.cpp b/noncore/unsupported/showimg/ImageFileSelector.cpp
index 53cc883..53cc883 100644
--- a/noncore/multimedia/showimg/ImageFileSelector.cpp
+++ b/noncore/unsupported/showimg/ImageFileSelector.cpp
diff --git a/noncore/multimedia/showimg/ImageFileSelector.h b/noncore/unsupported/showimg/ImageFileSelector.h
index 798ebcc..798ebcc 100644
--- a/noncore/multimedia/showimg/ImageFileSelector.h
+++ b/noncore/unsupported/showimg/ImageFileSelector.h
diff --git a/noncore/multimedia/showimg/README b/noncore/unsupported/showimg/README
index a6c9ca9..a6c9ca9 100644
--- a/noncore/multimedia/showimg/README
+++ b/noncore/unsupported/showimg/README
diff --git a/noncore/multimedia/showimg/config.in b/noncore/unsupported/showimg/config.in
index 808c841..2938269 100644
--- a/noncore/multimedia/showimg/config.in
+++ b/noncore/unsupported/showimg/config.in
@@ -1,4 +1,4 @@
   config SHOWIMG
     boolean "opie-showimg (image viewer)"
-    default "y"
+    default "n"
     depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI
diff --git a/noncore/multimedia/showimg/main.cpp b/noncore/unsupported/showimg/main.cpp
index b7ea071..b7ea071 100644
--- a/noncore/multimedia/showimg/main.cpp
+++ b/noncore/unsupported/showimg/main.cpp
diff --git a/noncore/multimedia/showimg/opie-showimg.control b/noncore/unsupported/showimg/opie-showimg.control
index 2fbfabc..2fbfabc 100644
--- a/noncore/multimedia/showimg/opie-showimg.control
+++ b/noncore/unsupported/showimg/opie-showimg.control
diff --git a/noncore/multimedia/showimg/settingsdialog.cpp b/noncore/unsupported/showimg/settingsdialog.cpp
index 202bd0c..202bd0c 100644
--- a/noncore/multimedia/showimg/settingsdialog.cpp
+++ b/noncore/unsupported/showimg/settingsdialog.cpp
diff --git a/noncore/multimedia/showimg/settingsdialog.h b/noncore/unsupported/showimg/settingsdialog.h
index 0f47990..0f47990 100644
--- a/noncore/multimedia/showimg/settingsdialog.h
+++ b/noncore/unsupported/showimg/settingsdialog.h
diff --git a/noncore/multimedia/showimg/settingsdialogbase.cpp b/noncore/unsupported/showimg/settingsdialogbase.cpp
index 7a64e89..7a64e89 100644
--- a/noncore/multimedia/showimg/settingsdialogbase.cpp
+++ b/noncore/unsupported/showimg/settingsdialogbase.cpp
diff --git a/noncore/multimedia/showimg/settingsdialogbase.h b/noncore/unsupported/showimg/settingsdialogbase.h
index 9594ec6..9594ec6 100644
--- a/noncore/multimedia/showimg/settingsdialogbase.h
+++ b/noncore/unsupported/showimg/settingsdialogbase.h
diff --git a/noncore/multimedia/showimg/showimg.cpp b/noncore/unsupported/showimg/showimg.cpp
index 24377ed..24377ed 100644
--- a/noncore/multimedia/showimg/showimg.cpp
+++ b/noncore/unsupported/showimg/showimg.cpp
diff --git a/noncore/multimedia/showimg/showimg.h b/noncore/unsupported/showimg/showimg.h
index 9cf9bfd..9cf9bfd 100644
--- a/noncore/multimedia/showimg/showimg.h
+++ b/noncore/unsupported/showimg/showimg.h
diff --git a/noncore/multimedia/showimg/showimg.pro b/noncore/unsupported/showimg/showimg.pro
index 74eceb8..74eceb8 100644
--- a/noncore/multimedia/showimg/showimg.pro
+++ b/noncore/unsupported/showimg/showimg.pro
diff --git a/packages b/packages
index 6f70097..59b0873 100644
--- a/packages
+++ b/packages
@@ -190,25 +190,25 @@ 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_MULTIAUTH_DEMO core/settings/security/demo	multiauth.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_SHOWIMG	noncore/unsupported/showimg	showimg.pro
 CONFIG_SIMPLE_EXAMPLE   examples/simple simple.pro
 CONFIG_SIMPLE_ICON      examples/simple-icon    simple-icon.pro
 CONFIG_SIMPLE_MAIN      examples/simple-main    simple-main.pro
 CONFIG_SIMPLE	noncore/tools/calc2/simple	simple.pro
 CONFIG_SIMPLE_PIM       examples/simple-pim     simple-pim.pro
 CONFIG_SINGLE	single	single.pro
 CONFIG_SNAKE	noncore/games/snake	snake.pro
 CONFIG_SOLITAIRE	noncore/games/solitaire	solitaire.pro
 CONFIG_SOUND	noncore/settings/sound	sound.pro
 CONFIG_SSHKEYS	noncore/settings/sshkeys	sshkeys.pro
 CONFIG_SUSPENDAPPLET	core/applets/suspendapplet	suspendapplet.pro
 CONFIG_SYMLINKER       core/symlinker symlinker.pro