4 files changed, 8 insertions, 12 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
@@ -6,2 +6,3 @@ menu "stockticker"
     depends LIBQPE && LIBOPIE
+
   source noncore/todayplugins/stockticker/stockticker/config.in
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
+  boolean
+  default "y" if TODAY_STOCKTICKER
diff --git a/packages b/packages
index f0cce79..fbc1828 100644
--- a/packages
+++ b/packages
@@ -147,5 +147,4 @@ CONFIG_TODAY_FORTUNE	noncore/todayplugins/fortune	fortune.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