From eaa51fec106463800192924168eaf9f03f188655 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Tue, 7 Sep 2010 08:20:52 +0000
Subject: [PATCH] * Fix FTBFS on Slackware * Added a few Chakra project
 patches; more are coming shortly

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1172412 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kcontrol/icons/icons.cpp                   |  1 +
 kcontrol/icons/icons.h                     |  1 +
 kcontrol/kicker/menutab_impl.cpp           |  1 +
 kcontrol/locale/kcmlocale.cpp              |  1 +
 kcontrol/randr/krandrtray.cpp              |  2 ++
 kdesktop/kwebdesktop/kwebdesktop.cpp       |  2 ++
 kdialog/kdialog.cpp                        | 14 ++++++++++++++
 kioslave/media/mediamanager/halbackend.cpp | 18 +++++++++++++++++-
 8 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/kcontrol/icons/icons.cpp b/kcontrol/icons/icons.cpp
index 84b6efac3..83db5ec52 100644
--- a/kcontrol/icons/icons.cpp
+++ b/kcontrol/icons/icons.cpp
@@ -18,6 +18,7 @@
 #include <tqlayout.h>
 #include <tqslider.h>
 
+#include <kapplication.h>
 #include <kcolorbutton.h>
 #include <kconfig.h>
 #include <kdebug.h>
diff --git a/kcontrol/icons/icons.h b/kcontrol/icons/icons.h
index 9bc2089aa..df6ab86e7 100644
--- a/kcontrol/icons/icons.h
+++ b/kcontrol/icons/icons.h
@@ -18,6 +18,7 @@
 
 #include <kcmodule.h>
 #include <kdialogbase.h>
+#include <ksimpleconfig.h>
 
 class TQCheckBox;
 class TQColor;
diff --git a/kcontrol/kicker/menutab_impl.cpp b/kcontrol/kicker/menutab_impl.cpp
index 6588a0a13..fa1b123e1 100644
--- a/kcontrol/kicker/menutab_impl.cpp
+++ b/kcontrol/kicker/menutab_impl.cpp
@@ -24,6 +24,7 @@
 #include <tqradiobutton.h>
 #include <tqcombobox.h>
 #include <tqbuttongroup.h>
+#include <tqlineedit.h>
 
 #include <dcopref.h>
 #include <kapplication.h>
diff --git a/kcontrol/locale/kcmlocale.cpp b/kcontrol/locale/kcmlocale.cpp
index 39210741f..b87a8bfd5 100644
--- a/kcontrol/locale/kcmlocale.cpp
+++ b/kcontrol/locale/kcmlocale.cpp
@@ -33,6 +33,7 @@
 
 #include <kdebug.h>
 #include <kdialog.h>
+#include <kprocess.h>
 #include <kiconloader.h>
 #include <klanguagebutton.h>
 #include <ksimpleconfig.h>
diff --git a/kcontrol/randr/krandrtray.cpp b/kcontrol/randr/krandrtray.cpp
index 4424e4036..e35fba9d2 100644
--- a/kcontrol/randr/krandrtray.cpp
+++ b/kcontrol/randr/krandrtray.cpp
@@ -17,6 +17,7 @@
  */
 
 #include <tqtimer.h>
+#include <tqimage.h>
 #include <tqtooltip.h>
 
 #include <kaction.h>
@@ -32,6 +33,7 @@
 #include <kglobal.h>
 #include <kmessagebox.h>
 
+#include <cstdlib>
 #include <unistd.h>
 
 #include "configdialog.h"
diff --git a/kdesktop/kwebdesktop/kwebdesktop.cpp b/kdesktop/kwebdesktop/kwebdesktop.cpp
index 7d5897ac7..e0e6ab322 100644
--- a/kdesktop/kwebdesktop/kwebdesktop.cpp
+++ b/kdesktop/kwebdesktop/kwebdesktop.cpp
@@ -160,7 +160,9 @@ KParts::ReadOnlyPart* KWebDesktop::createPart( const TQString& mimeType )
         htmlPart->setMetaRefreshEnabled(false);
         htmlPart->setJScriptEnabled(false);
         htmlPart->setJavaEnabled(false);
+        htmlPart->setPluginsEnabled(false);
 
+        ((TQScrollView *)htmlPart->widget())->setFrameStyle( TQFrame::NoFrame );
         ((TQScrollView *)htmlPart->widget())->setHScrollBarMode( TQScrollView::AlwaysOff );
         ((TQScrollView *)htmlPart->widget())->setVScrollBarMode( TQScrollView::AlwaysOff );
 
diff --git a/kdialog/kdialog.cpp b/kdialog/kdialog.cpp
index 48d22729a..8cf9b581f 100644
--- a/kdialog/kdialog.cpp
+++ b/kdialog/kdialog.cpp
@@ -621,6 +621,20 @@ static int directCommand(KCmdLineArgs *args)
             context = KIcon::Application;
         else if ( contextStr == TQString::fromLatin1( "Actions" ) )
             context = KIcon::Action;
+        else if ( contextStr == QString::fromLatin1( "Animations" ) )
+            context = KIcon::Animation;
+        else if ( contextStr == QString::fromLatin1( "Categories" ) )
+            context = KIcon::Category;
+        else if ( contextStr == QString::fromLatin1( "Emblems" ) )
+            context = KIcon::Emblem;
+        else if ( contextStr == QString::fromLatin1( "Emotes" ) )
+            context = KIcon::Emote;
+        else if ( contextStr == QString::fromLatin1( "International" ) )
+            context = KIcon::International;
+        else if ( contextStr == QString::fromLatin1( "Places" ) )
+            context = KIcon::Place;
+        else if ( contextStr == QString::fromLatin1( "Status" ) )
+            context = KIcon::StatusIcon;
 
 	KIconDialog dlg(0, "icon dialog");
 	kapp->setTopWidget( &dlg );
diff --git a/kioslave/media/mediamanager/halbackend.cpp b/kioslave/media/mediamanager/halbackend.cpp
index 7b56d46ad..be5f07ccb 100644
--- a/kioslave/media/mediamanager/halbackend.cpp
+++ b/kioslave/media/mediamanager/halbackend.cpp
@@ -972,6 +972,13 @@ TQStringList HALBackend::mountoptions(const TQString &name)
         result << tmp;
     }
 
+    if ( valids.contains("locale") )
+    {
+        value = config.readBoolEntry( "locale", true );
+        tmp = QString( "locale=%1" ).arg( value ? "true" : "false" );
+        result << tmp;
+    }
+
     if (valids.contains("utf8"))
     {
         value = config.readBoolEntry("utf8", true);
@@ -1056,7 +1063,7 @@ bool HALBackend::setMountoptions(const TQString &name, const TQStringList &optio
 
     TQMap<TQString,TQString> valids = MediaManagerUtils::splitOptions(options);
 
-    const char *names[] = { "ro", "quiet", "atime", "uid", "utf8", "flush", "sync", 0 };
+    const char *names[] = { "ro", "quiet", "atime", "uid", "utf8", "flush", "sync", "locale", 0 };
     for (int index = 0; names[index]; ++index)
         if (valids.contains(names[index]))
             config.writeEntry(names[index], valids[names[index]] == "true");
@@ -1076,6 +1083,10 @@ bool HALBackend::setMountoptions(const TQString &name, const TQStringList &optio
         config.writeEntry("automount", valids["automount"]);
     }
 
+    if (valids.contains("locale") ) {
+        config.writeEntry("locale", valids["locale"]);
+    }
+
     return true;
 }
 
@@ -1425,6 +1436,11 @@ TQString HALBackend::mount(const Medium *medium)
         soptions << TQString("uid=%1").arg(getuid());
     }
 
+    if (valids["locale"] == "true")
+    {
+        soptions << QString("locale=%1").arg( KGlobal::locale()->language() );
+    }
+
     if (valids["ro"] == "true")
         soptions << "ro";