reduce unnecessary nesting

improve plugin names

3 files changed, 9 insertions, 4 deletions

diff --git a/config.in b/config.in
index ba92955..9ee7ccf 100644
--- a/config.in
+++ b/config.in
@@ -194,21 +194,22 @@ menu "Input methods"
 endmenu
 
 menu "Pim"
   source core/pim/config.in
-  menu "Today Plugins"
+  comment "Today Plugins ---"
     source noncore/todayplugins/config.in
     source core/pim/today/plugins/config.in
-  endmenu
 endmenu
 
 menu "Settings"
   source core/settings/config.in
   source noncore/settings/config.in
 endmenu
 
 menu "Theming"
+  comment "Decorations ---"
   source noncore/decorations/config.in
+  comment "Styles ---"
   source noncore/styles/config.in
 endmenu
 
 menu "Tools"
diff --git a/core/pim/today/plugins/mail/config.in b/core/pim/today/plugins/mail/config.in
index 4a115bd..e6106ae 100644
--- a/core/pim/today/plugins/mail/config.in
+++ b/core/pim/today/plugins/mail/config.in
@@ -1,6 +1,6 @@
   config TODAY_MAIL
-    boolean "mail"
+    boolean "opie-today-mailplugin"
     default "y"
     depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2PIM && LIBMAILWRAPPER
 
     comment "opie-today-mailplugin requires libopie2core, libopie2pim, and libmailwrapper"
diff --git a/core/pim/today/plugins/todolist/config.in b/core/pim/today/plugins/todolist/config.in
index 2a61045..fc3380d 100644
--- a/core/pim/today/plugins/todolist/config.in
+++ b/core/pim/today/plugins/todolist/config.in
@@ -1,4 +1,8 @@
   config TODAY_TODOLIST
-    boolean "todolist"
+    boolean "opie-today-todolistplugin"
     default "y"
     depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM
+
+    comment "opie-today-todolistplugin requires libopie2core, libopie2ui, libopie2pim"
+    depends !( ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM )
+