4 files changed, 9 insertions, 13 deletions

diff --git a/noncore/todayplugins/stockticker/config.in b/noncore/todayplugins/stockticker/config.in
index 7898f78..e9ee1b7 100644
--- a/noncore/todayplugins/stockticker/config.in
+++ b/noncore/todayplugins/stockticker/config.in
@@ -1,9 +1,10 @@
 menu "stockticker"
 
   config TODAY_STOCKTICKER
     boolean "stockticker"
     default "y"
     depends LIBQPE && LIBOPIE
+
   source noncore/todayplugins/stockticker/stockticker/config.in
   source noncore/todayplugins/stockticker/stocktickerlib/config.in
 endmenu
diff --git a/noncore/todayplugins/stockticker/stockticker/config.in b/noncore/todayplugins/stockticker/stockticker/config.in
index fd5efbc..2f419ea 100644
--- a/noncore/todayplugins/stockticker/stockticker/config.in
+++ b/noncore/todayplugins/stockticker/stockticker/config.in
@@ -1,7 +1,4 @@
-menu "stockticker"
-
-  config TODAY_STOCKTICKERLIB
-    boolean "stockticker"
-    default "y"
-    depends LIBQPE && LIBOPIE
-endmenu
+config TODAY_STOCKTICKERSUB
+  boolean
+  depends TODAY_LIBSTOCKS && TODAY_STOCKTICKERLIB
+  default "y" if TODAY_STOCKTICKER
diff --git a/noncore/todayplugins/stockticker/stocktickerlib/config.in b/noncore/todayplugins/stockticker/stocktickerlib/config.in
index 7478c39..08f9ba8 100644
--- a/noncore/todayplugins/stockticker/stocktickerlib/config.in
+++ b/noncore/todayplugins/stockticker/stocktickerlib/config.in
@@ -1,4 +1,3 @@
-  config TODAY_STOCKTICKERLIB
-    boolean "stocktickerlib"
-    default "y"
-    depends LIBQPE && LIBOPIE
+config TODAY_STOCKTICKERLIB
+  boolean
+  default "y" if TODAY_STOCKTICKER
diff --git a/packages b/packages
index f0cce79..fbc1828 100644
--- a/packages
+++ b/packages
@@ -140,19 +140,18 @@ CONFIG_TABMANAGER	noncore/settings/tabmanager	tabmanager.pro
         CONFIG_TETRIX   noncore/games/tetrixtetrix.pro
         CONFIG_TEXTEDIT         core/apps/textedittextedit.pro
         CONFIG_THEME    noncore/styles/themetheme.pro
         CONFIG_TICTAC   noncore/games/tictactictac.pro
         CONFIG_TODAY    core/pim/todaytoday.pro
         CONFIG_TODAY_DATEBOOK   core/pim/today/plugins/datebookdatebook.pro
         CONFIG_TODAY_FORTUNE    noncore/todayplugins/fortunefortune.pro
         CONFIG_TODAY_MAIL       core/pim/today/plugins/mailmail.pro
-        CONFIG_TODAY_STOCKTICKER        noncore/todayplugins/stocktickerstockticker.pro
+        CONFIG_TODAY_STOCKTICKER        noncore/todayplugins/stockticker/stocktickerstockticker.pro
         CONFIG_TODAY_STOCKTICKERLIB     noncore/todayplugins/stockticker/stocktickerlibstocktickerlib.pro
-        CONFIG_TODAY_STOCKTICKERSUB     noncore/todayplugins/stockticker/stocktickerstockticker.pro
         CONFIG_TODAY_TODOLIST   core/pim/today/plugins/todolisttodolist.pro
         CONFIG_TODO     core/pim/todotodo.pro
         CONFIG_UNIKEYBOARD      inputmethods/unikeyboardunikeyboard.pro
         CONFIG_USERMANAGER      noncore/settings/usermanagerusermanager.pro
         CONFIG_VMEMO    core/applets/vmemovmemo.pro
         CONFIG_VOLUMEAPPLET     core/applets/volumeappletvolumeapplet.pro
         CONFIG_WAVPLUGIN        core/multimedia/opieplayer/wavpluginwavplugin.pro
         CONFIG_WIRELESSAPPLET   noncore/applets/wirelessappletwirelessapplet.pro