kdelibs update to Trinity v3.5.11

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1061230 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

5 files changed, 42 insertions, 69 deletions

diff --git a/kded/Makefile.am b/kded/Makefile.am
index 8750d0486..8437919f0 100644
--- a/kded/Makefile.am
+++ b/kded/Makefile.am
@@ -23,11 +23,11 @@ lib_LTLIBRARIES =
 kdeinit_LTLIBRARIES = kded.la kbuildsycoca.la
 
 kded_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_la_LIBADD = $(LIB_KIO)
+kded_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
 kded_la_SOURCES = kded.cpp kdedmodule.cpp
 
 kbuildsycoca_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kbuildsycoca_la_LIBADD = $(LIB_KIO)
+kbuildsycoca_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE)
 kbuildsycoca_la_SOURCES = kbuildsycoca.cpp kbuildservicetypefactory.cpp \
 				kbuildservicefactory.cpp \
 				kbuildservicegroupfactory.cpp \
@@ -43,7 +43,7 @@ kdontchangethehostname_LDADD = $(LIB_KDECORE)
 kdontchangethehostname_SOURCES = khostname.cpp
 
 kde_menu_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-kde_menu_LDADD = $(LIB_KIO) 
+kde_menu_LDADD = $(LIB_KIO)
 kde_menu_SOURCES = kde-menu.cpp
 
 METASOURCES = AUTO
diff --git a/kded/applications.menu b/kded/applications.menu
index be08eb848..16cfb24d1 100644
--- a/kded/applications.menu
+++ b/kded/applications.menu
@@ -248,6 +248,7 @@
 			<And>
 			<Category>Graphics</Category>
 			<Not><Category>X-KDE-More</Category></Not>
+			<Not><Filename>ooo-draw.desktop</Filename></Not>
 			</And>
 		</Include>
 		<Menu>
@@ -325,6 +326,7 @@
 			<Category>Office</Category>
                         <Not><Category>X-KDE-More</Category></Not>
                         </And>
+			<Filename>ooo-draw.desktop</Filename>
                 </Include>
                 <Menu>
                         <Name>More</Name>
@@ -376,74 +378,20 @@
 		<Name>Utilities</Name>
 		<Directory>kde-utilities.directory</Directory>
 		<Include>
-			<And>
+                      <And>
+			<Or>
 			<Category>Utility</Category>
-			<Not><Category>Accessibility</Category></Not>
-			<Not><Category>X-KDE-Utilities-Desktop</Category></Not>
-			<Not><Category>X-KDE-Utilities-File</Category></Not>
-			<Not><Category>X-KDE-Utilities-Peripherals</Category></Not>
-			<Not><Category>X-KDE-Utilities-PIM</Category></Not>
+                        <Category>TextEditor</Category>
+                        <Category>X-KDE-Utilities-File</Category>
+			<Category>X-KDE-Utilities-Desktop</Category>
+			<Category>X-KDE-Utilities-Peripherals</Category>
+			<Category>X-KDE-Utilities-PIM</Category>
+			<Category>Accessibility</Category>
+			</Or>
 			<Not><Category>X-KDE-More</Category></Not>
-			</And>
+                     </And>
 		</Include>
 		<Menu>
-			<Name>Accessibility</Name>
-			<Directory>kde-utilities-accessibility.directory</Directory>
-			<Include>
-				<And>
-				<Category>Utility</Category>
-				<Category>Accessibility</Category>
-				</And>
-			</Include>
-		</Menu>
-		<Menu>
-			<Name>Desktop</Name>
-			<Directory>kde-utilities-desktop.directory</Directory>
-			<Include>
-				<And>
-				<Category>Utility</Category>
-				<Category>X-KDE-Utilities-Desktop</Category>
-				</And>
-			</Include>
-		</Menu>
-                <Menu>
-                        <Name>Editors</Name>
-                        <Directory>kde-editors.directory</Directory>
-                        <Include>
-                                <Category>TextEditor</Category>
-                        </Include>
-                </Menu>
-		<Menu>
-			<Name>File</Name>
-			<Directory>kde-utilities-file.directory</Directory>
-			<Include>
-				<And>
-				<Category>Utility</Category>
-				<Category>X-KDE-Utilities-File</Category>
-				</And>
-			</Include>
-		</Menu>
-		<Menu>
-			<Name>Peripherals</Name>
-			<Directory>kde-utilities-peripherals.directory</Directory>
-			<Include>
-				<And>
-				<Category>Utility</Category>
-				<Category>X-KDE-Utilities-Peripherals</Category>
-				</And>
-			</Include>
-		</Menu>
-		<Menu>
-			<Name>PIM</Name>
-			<Directory>kde-utilities-pim.directory</Directory>
-			<Include>
-				<And>
-				<Category>Utility</Category>
-				<Category>X-KDE-Utilities-PIM</Category>
-				</And>
-			</Include>
-		</Menu>
-		<Menu>
 			<Name>XUtilities</Name>
 			<Directory>kde-utilities-xutils.directory</Directory>
 		</Menu>
@@ -465,5 +413,13 @@
 		</And>
 	</Include>
 	<DefaultMergeDirs/>
+
+	<Menu>
+		<Name>Debian</Name>
+		<Directory>debian.directory</Directory>
+		<MergeFile>debian-menu.menu</MergeFile>
+	</Menu>
+
+	<MergeDir>applications-merged</MergeDir>
 	<MergeFile>applications-kmenuedit.menu</MergeFile>
 </Menu>
diff --git a/kded/kbuildservicefactory.cpp b/kded/kbuildservicefactory.cpp
index a824aa28d..18aef1d29 100644
--- a/kded/kbuildservicefactory.cpp
+++ b/kded/kbuildservicefactory.cpp
@@ -158,7 +158,7 @@ KBuildServiceFactory::saveOfferList(QDataStream &str)
          KServiceType::Ptr serviceType = KServiceType::serviceType(*it);
          if (!serviceType)
          {
-           kdWarning() << "'"<< service->desktopEntryPath() << "' specifies undefined mimetype/servicetype '"<< (*it) << "'" << endl;
+           // kdWarning() << "'"<< service->desktopEntryPath() << "' specifies undefined mimetype/servicetype '"<< (*it) << "'" << endl;
            continue;
          }
          serviceTypes.append(serviceType);
diff --git a/kded/kded.cpp b/kded/kded.cpp
index ed4c5e75e..df16faddb 100644
--- a/kded/kded.cpp
+++ b/kded/kded.cpp
@@ -162,12 +162,27 @@ void Kded::initModules()
         kde_running = false;
      // Preload kded modules.
      KService::List kdedModules = KServiceType::offers("KDEDModule");
+     QString version = getenv( "KDE_SESSION_VERSION" );
+     QStringList blacklist;
+     if ( version >= "4" )
+     {
+         kdDebug(7020) << "KDE4 is running." << endl;
+         blacklist << "mediamanager" << "medianotifier" << "kmilod" << "kwrited";
+     }
      for(KService::List::ConstIterator it = kdedModules.begin(); it != kdedModules.end(); ++it)
      {
          KService::Ptr service = *it;
          bool autoload = service->property("X-KDE-Kded-autoload", QVariant::Bool).toBool();
          config->setGroup(QString("Module-%1").arg(service->desktopEntryName()));
          autoload = config->readBoolEntry("autoload", autoload);
+         for (QStringList::Iterator module = blacklist.begin(); module != blacklist.end(); ++module)
+         {
+            if (service->desktopEntryName() == *module)
+            {
+               autoload = false;
+               break;
+            }
+         }
          if( m_newStartup )
          {
             // see ksmserver's README for description of the phases
diff --git a/kded/vfolder_menu.cpp b/kded/vfolder_menu.cpp
index f73ef0c8e..baa3c88b0 100644
--- a/kded/vfolder_menu.cpp
+++ b/kded/vfolder_menu.cpp
@@ -774,7 +774,9 @@ VFolderMenu::locateMenuFile(const QString &fileName)
 
    QString result;
 
-   QString xdgMenuPrefix = QString::fromLocal8Bit(getenv("XDG_MENU_PREFIX"));
+   //QString xdgMenuPrefix = QString::fromLocal8Bit(getenv("XDG_MENU_PREFIX"));
+   // hardcode xdgMenuPrefix to "kde-" string until proper upstream fix
+   QString xdgMenuPrefix = "kde-";
    if (!xdgMenuPrefix.isEmpty())
    {
       QFileInfo fileInfo(fileName);