--- kdebase-3.3.1/kicker/core/containerarea.cpp--	2004-10-11 09:09:36.740970477 -0400
+++ kdebase-3.3.1/kicker/core/containerarea.cpp	2004-10-11 09:49:06.610112337 -0400
@@ -136,8 +136,55 @@ void ContainerArea::defaultContainerConf
     dsize -= 560;
 
     QStringList buttons;
+    QFile f;
+    QString menuType = KStandardDirs::menu_type_by_version();
+    if( menuType == "kde" )
+      {
+	f.setName(locate("data", "kicker/default-apps"));
+      }
+    else if( menuType == "mdk" )
+      {
+	switch( KStandardDirs::mandrake_distro_version())
+	  {
+	  case KStandardDirs::DOWNLOAD:
+	    f.setName(locate("data", "kicker/default-download-apps"));
+	    break;
+	  case KStandardDirs::POWERPACK:
+	    f.setName(locate("data", "kicker/default-powerpack-apps"));
+	    break;
+	  case KStandardDirs::DISCOVERY:
+	    f.setName(locate("data", "kicker/default-discovery-apps"));
+	    break;
+	  case KStandardDirs::POWERPACKPLUS:
+	    f.setName(locate("data", "kicker/default-powerpackplus-apps"));
+	    break;
+	  default:
+	    f.setName(locate("data", "kicker/default-apps"));
+	    break;
+	  }
+      }
+    else
+      {
+	switch( KStandardDirs::mandrake_distro_version())
+	  {
+	  case KStandardDirs::DOWNLOAD:
+	    f.setName(locate("data", "kicker/default-download-apps-simplified"));
+	    break;
+	  case KStandardDirs::POWERPACK:
+	    f.setName(locate("data", "kicker/default-powerpack-apps-simplified"));
+	    break;
+	  case KStandardDirs::DISCOVERY:
+	    f.setName(locate("data", "kicker/default-discovery-apps-simplified"));
+	    break;
+	  case KStandardDirs::POWERPACKPLUS:
+	    f.setName(locate("data", "kicker/default-powerpackplus-apps-simplified"));
+	    break;
+	  default:
+	    f.setName(locate("data", "kicker/default-apps"));
+	    break;
+	  }
 
-    QFile f(locate("data", "kicker/default-apps"));
+      }
     if (f.open(IO_ReadOnly)) {
         QTextStream is(&f);
 
@@ -146,13 +193,117 @@ void ContainerArea::defaultContainerConf
 
         f.close();
     } else {
-        buttons << "kde-Home.desktop";
-        buttons << "kde-konqbrowser.desktop";
-        buttons << "kde-KMail.desktop";
-        buttons << "kde-kword.desktop";
-        buttons << "kde-Help.desktop";
+      switch( KStandardDirs::mandrake_distro_version())
+	{
+	case KStandardDirs::DOWNLOAD:
+	  buttons << "kde-konqbrowser.desktop";
+	  buttons << "kde-konsole.desktop"; buttons << "kde-XEmacs.desktop";
+	  buttons << "kde-kdevelop.desktop";
+	  buttons << "kde-OpenOffice.org Writer.desktop";
+		break;
+	case KStandardDirs::POWERPACK:
+	  {
+	    if( menuType == "kde" )
+	      {
+		buttons << "menuext/prefmenu.desktop";
+		buttons << "kde-konsole.desktop";
+		buttons << "kde-Home.desktop";
+		buttons << "kde-konqbrowser.desktop";
+		buttons << "kde-KMail.desktop";
+	      }
+	    else if( menuType == "mdk" )
+	      {
+		buttons << "kde-konqbrowser.desktop";
+		buttons << "kde-konsole.desktop";
+		buttons << "kde-XEmacs.desktop";
+		buttons << "kde-kdevelop.desktop";
+		buttons << "kde-OpenOffice.org Writer.desktop";
+	      }
+	    else
+	      {
+		buttons << "kde-Create a text document.desktop";
+		buttons << "kde-Create a spreadsheet.desktop";
+		buttons << "kde-kontact-summary.desktop";
+		buttons << "kde-konqueror.desktop";
+		buttons << "kde-Watch videos.desktop";
+		buttons << "kde-View images and photos.desktop";
+	      }
+	  }
+	  break;
+	case KStandardDirs::DISCOVERY:
+	  {
+	    if( menuType == "kde" )
+	      {
+		buttons << "menuext/prefmenu.desktop";
+		buttons << "kde-konsole.desktop";
+		buttons << "kde-Home.desktop";
+		buttons << "kde-konqbrowser.desktop";
+		buttons << "kde-KMail.desktop";
+		buttons << "kde-kword.desktop";
+	      }
+	    else if( menuType == "mdk" )
+	      {
+		buttons << "kde-OpenOffice.org Writer.desktop";
+		buttons << "kde-OpenOffice.org Calc.desktop";
+		buttons << "kde-Kontact.desktop";
+		buttons << "kde-konqbrowser.desktop";
+		buttons << "kde-Totem Movie Player.desktop";
+		buttons << "kde-The GIMP.desktop";
+	      }
+	    else
+	      {
+		buttons << "kde-Create a text document.desktop";
+		//buttons << "kde-Create a spreadsheet.desktop";
+		buttons << "kde-kontact-summary.desktop";
+		buttons << "kde-konqueror.desktop";
+		buttons << "kde-Watch videos.desktop";
+		buttons << "kde-View images and photos.desktop";
+	      }
+	  }
+	  break;
+	case KStandardDirs::POWERPACKPLUS:
+	  {
+
+	    if( menuType == "kde" )
+	      {
+		buttons << "menuext/prefmenu.desktop";
+		buttons << "kde-konsole.desktop";
+		buttons << "kde-Home.desktop";
+		buttons << "kde-konqbrowser.desktop";
+		buttons << "kde-KMail.desktop";
+	      }
+	    else if( menuType == "mdk" )
+	      {
+		buttons << "kde-konqbrowser.desktop";
+		buttons << "kde-konsole.desktop";
+		buttons << "kde-OpenOffice.org Writer.desktop";
+		buttons << "kde-Kontact.desktop";
+		buttons << "kde-Configure your computer.desktop"; 
+	      }
+	    else
+	      {
+		buttons << "kde-Create a text document.desktop";
+		buttons << "kde-Create a spreadsheet.desktop";
+		buttons << "kde-kontact-summary.desktop";
+		buttons << "kde-konqueror.desktop";
+		buttons << "kde-Watch videos.desktop";
+		buttons << "kde-View images and photos.desktop";
+	      }
+	  }
+	  break;
+	default:
+	  buttons << "menuext/prefmenu.desktop";
+	  buttons << "kde-konsole.desktop";
+	  buttons << "kde-Home.desktop";
+	  buttons << "kde-konqbrowser.desktop";
+	  buttons << "kde-KMail.desktop";
+	  buttons << "kde-kword.desktop";
+	  buttons << "kde-Help.desktop";
+	  break;
+	}
     }
 
+
     int size = dsize;
     for (QStringList::ConstIterator it = buttons.begin(); it != buttons.end(); ++it) {
         size -= 42;