diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-24 22:49:44 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-24 22:49:44 +0000 |
| commit | c1b82e65f92ab3fc89c46d91c2d7503f4d58cf9f (patch) | |
| tree | 78e28a7e9ab5cc69f20fb8954d48a2034f90acbe | |
| parent | 351f65a128f79db6b158cd91ef083707eafb120f (diff) | |
| download | tdebase-c1b82e65f92ab3fc89c46d91c2d7503f4d58cf9f.tar.gz tdebase-c1b82e65f92ab3fc89c46d91c2d7503f4d58cf9f.zip | |
Fix Slackware FTBFS
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1179254 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
| -rw-r--r-- | kdesktop/kdiconview.cc | 6 | ||||
| -rw-r--r-- | konqueror/konq_mainwindow.cc | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/kdesktop/kdiconview.cc b/kdesktop/kdiconview.cc index 4ef4e5ba6..5d20aa12d 100644 --- a/kdesktop/kdiconview.cc +++ b/kdesktop/kdiconview.cc @@ -193,8 +193,6 @@ KDIconView::KDIconView( TQWidget *parent, const char* name ) setAcceptDrops(false); viewport()->setAcceptDrops(false); } - - g_pConfig = new KConfig("kdesktoprc"); } KDIconView::~KDIconView() @@ -740,6 +738,7 @@ private: void KDIconView::fillMediaListView() { + g_pConfig = new KConfig("kdesktoprc"); mMediaListView->hide(); mMediaListView->clear(); KMimeType::List mimetypes = KMimeType::allMimeTypes(); @@ -753,10 +752,12 @@ void KDIconView::fillMediaListView() new DesktopBehaviorMediaItem (mMediaListView, (*it2)->comment(), (*it2)->name(),ok); } } + delete g_pConfig; } void KDIconView::saveMediaListView() { + g_pConfig = new KConfig("kdesktoprc"); g_pConfig->setGroup( "Media" ); TQStringList exclude; for (DesktopBehaviorMediaItem *it=static_cast<DesktopBehaviorMediaItem *>(mMediaListView->firstChild()); @@ -776,6 +777,7 @@ void KDIconView::saveMediaListView() else appname.sprintf("kdesktop-screen-%d", konq_screen_number); kapp->dcopClient()->send( appname, "KDesktopIface", "configure()", data ); + delete g_pConfig; } void KDIconView::removeBuiltinIcon(TQString iconName) diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc index 18b638934..964870ce0 100644 --- a/konqueror/konq_mainwindow.cc +++ b/konqueror/konq_mainwindow.cc @@ -102,6 +102,7 @@ #include <kio/scheduler.h> #include <kio/netaccess.h> #include <kaccelmanager.h> +#include <kstringhandler.h> #include <kuser.h> #include <netwm.h> |