packages: kde4-kdebase/kde4-kdebase-branch.diff, kde4-kdebase/kde4-kdebase....
arekm
arekm at pld-linux.org
Tue Mar 16 21:06:04 CET 2010
Author: arekm Date: Tue Mar 16 20:06:04 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 2; branch diff updated
---- Files affected:
packages/kde4-kdebase:
kde4-kdebase-branch.diff (1.16 -> 1.17) , kde4-kdebase.spec (1.119 -> 1.120)
---- Diffs:
================================================================
Index: packages/kde4-kdebase/kde4-kdebase-branch.diff
diff -u packages/kde4-kdebase/kde4-kdebase-branch.diff:1.16 packages/kde4-kdebase/kde4-kdebase-branch.diff:1.17
--- packages/kde4-kdebase/kde4-kdebase-branch.diff:1.16 Thu Feb 18 00:51:46 2010
+++ packages/kde4-kdebase/kde4-kdebase-branch.diff Tue Mar 16 21:05:58 2010
@@ -1,1243 +1,2461 @@
-Index: apps/kappfinder/apps/Multimedia/sweep.desktop
+Index: apps/nsplugins/sdk/prcpucfg.h
===================================================================
---- apps/kappfinder/apps/Multimedia/sweep.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091888)
-+++ apps/kappfinder/apps/Multimedia/sweep.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091888)
-@@ -11,7 +11,7 @@
- Name[bn]=সুইপ
- Name[bn_IN]=Sweep
- Name[br]=Sweep
--Name[ca]=Sweep
-+Name[ca]=Escombrat
- Name[ca at valencia]=Sweep
- Name[cs]=Sweep
- Name[csb]=Sweep
-Index: apps/dolphin/src/dolphinapplication.cpp
-===================================================================
---- apps/dolphin/src/dolphinapplication.cpp (.../tags/KDE/4.4.0/kdebase) (wersja 1091888)
-+++ apps/dolphin/src/dolphinapplication.cpp (.../branches/KDE/4.4/kdebase) (wersja 1091888)
-@@ -72,23 +72,27 @@
- int DolphinApplication::newInstance()
+--- apps/nsplugins/sdk/prcpucfg.h (.../tags/KDE/4.4.1/kdebase) (wersja 1104128)
++++ apps/nsplugins/sdk/prcpucfg.h (.../branches/KDE/4.4/kdebase) (wersja 1104128)
+@@ -600,8 +600,49 @@
+ #define PR_BYTES_PER_WORD_LOG2 2
+ #define PR_BYTES_PER_DWORD_LOG2 3
+
++#elif defined(__sh__)
++
++#ifdef __LITTLE_ENDIAN__
++#define IS_LITTLE_ENDIAN 1
++#undef IS_BIG_ENDIAN
+ #else
++#define IS_BIG_ENDIAN 1
++#undef IS_LITTLE_ENDIAN
++#endif
+
++#define PR_BYTES_PER_BYTE 1
++#define PR_BYTES_PER_SHORT 2
++#define PR_BYTES_PER_INT 4
++#define PR_BYTES_PER_INT64 8
++#define PR_BYTES_PER_LONG 4
++#define PR_BYTES_PER_FLOAT 4
++#define PR_BYTES_PER_DOUBLE 8
++#define PR_BYTES_PER_WORD 4
++#define PR_BYTES_PER_DWORD 8
++
++#define PR_BITS_PER_BYTE 8
++#define PR_BITS_PER_SHORT 16
++#define PR_BITS_PER_INT 32
++#define PR_BITS_PER_INT64 64
++#define PR_BITS_PER_LONG 32
++#define PR_BITS_PER_FLOAT 32
++#define PR_BITS_PER_DOUBLE 64
++#define PR_BITS_PER_WORD 32
++
++#define PR_ALIGN_OF_SHORT 2
++#define PR_ALIGN_OF_INT 4
++#define PR_ALIGN_OF_LONG 4
++#define PR_ALIGN_OF_INT64 8
++#define PR_ALIGN_OF_FLOAT 4
++#define PR_ALIGN_OF_DOUBLE 8
++#define PR_ALIGN_OF_POINTER 4
++#define PR_ALIGN_OF_WORD 4
++
++#define PR_BYTES_PER_WORD_LOG2 2
++#define PR_BYTES_PER_DWORD_LOG2 3
++
++#else
++
+ #error "Unknown CPU architecture"
+
+ #endif
+Index: apps/konqueror/CMakeLists.txt
+===================================================================
+--- apps/konqueror/CMakeLists.txt (.../tags/KDE/4.4.1/kdebase) (wersja 1104128)
++++ apps/konqueror/CMakeLists.txt (.../branches/KDE/4.4/kdebase) (wersja 1104128)
+@@ -1,8 +1,6 @@
+
+ add_definitions(-D_LARGEFILE64_SOURCE )
+
+-add_definitions (-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)
+-
+ add_subdirectory( src )
+ add_subdirectory( client )
+
+Index: apps/konqueror/sidebar/web_module/web_module.cpp
+===================================================================
+--- apps/konqueror/sidebar/web_module/web_module.cpp (.../tags/KDE/4.4.1/kdebase) (wersja 1104128)
++++ apps/konqueror/sidebar/web_module/web_module.cpp (.../branches/KDE/4.4/kdebase) (wersja 1104128)
+@@ -17,6 +17,7 @@
+ */
+
+ #include "web_module.h"
++#include <kaction.h>
+ #include "favicon_interface.h"
+
+ #include <QtCore/QFileInfo>
+@@ -35,6 +36,52 @@
+ #include <khbox.h>
+
+
++KHTMLSideBar::KHTMLSideBar()
++ : KHTMLPart()
++{
++ setStatusMessagesEnabled(false);
++ setMetaRefreshEnabled(true);
++ setJavaEnabled(false);
++ setPluginsEnabled(false);
++
++ setFormNotification(KHTMLPart::Only);
++ connect(this,
++ SIGNAL(formSubmitNotification(const char*,QString,QByteArray,QString,QString,QString)),
++ this,
++ SLOT(formProxy(const char*,QString,QByteArray,QString,QString,QString))
++ );
++
++
++ _linkMenu = new KMenu(widget());
++
++ KAction* openLinkAction = new KAction(i18n("&Open Link"), this);
++ _linkMenu->addAction(openLinkAction);
++ connect(openLinkAction, SIGNAL(triggered()), this, SLOT(loadPage()));
++
++ KAction* openWindowAction = new KAction(i18n("Open in New &Window"), this);
++ _linkMenu->addAction(openWindowAction);
++ connect(openWindowAction, SIGNAL(triggered()), this, SLOT(loadNewWindow()));
++
++
++ _menu = new KMenu(widget());
++
++ KAction* reloadAction = new KAction(i18n("&Reload"), this);
++ reloadAction->setIcon(KIcon("view-refresh"));
++ _menu->addAction(reloadAction);
++ connect(reloadAction, SIGNAL(triggered()), this, SIGNAL(reload()));
++
++ KAction* autoReloadAction = new KAction(i18n("Set &Automatic Reload"), this);
++ autoReloadAction->setIcon(KIcon("view-refresh"));
++ _menu->addAction(autoReloadAction);
++ connect(autoReloadAction, SIGNAL(triggered()), this, SIGNAL(setAutoReload()));
++
++ connect(this, SIGNAL(popupMenu(QString,QPoint)),
++ this, SLOT(showMenu(QString,QPoint)));
++
++}
++
++////
++
+ KonqSideBarWebModule::KonqSideBarWebModule(const KComponentData &componentData, QWidget *parent, const KConfigGroup& configGroup)
+ : KonqSidebarModule(componentData, parent, configGroup)
{
- KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
-+ static bool first = true;
+@@ -43,9 +90,9 @@
+ connect(_htmlPart, SIGNAL(reload()), this, SLOT(reload()));
+ connect(_htmlPart, SIGNAL(completed()), this, SLOT(pageLoaded()));
+ connect(_htmlPart,
+- SIGNAL(setWindowCaption(const QString&)),
++ SIGNAL(setWindowCaption(QString)),
+ this,
+- SLOT(setTitle(const QString&)));
++ SLOT(setTitle(QString)));
+ connect(_htmlPart,
+ SIGNAL(openUrlRequest(QString, KParts::OpenUrlArguments, KParts::BrowserArguments)),
+ this,
+@@ -61,9 +108,9 @@
+ this,
+ SLOT(urlNewWindow(QString,KParts::OpenUrlArguments,KParts::BrowserArguments,KParts::WindowArgs)));
+ connect(_htmlPart,
+- SIGNAL(submitFormRequest(const char*,const QString&,const QByteArray&,const QString&,const QString&,const QString&)),
++ SIGNAL(submitFormRequest(const char*,QString,const QByteArray&,QString,QString,QString)),
+ this,
+- SIGNAL(submitFormRequest(const char*,const QString&,const QByteArray&,const QString&,const QString&,const QString&)));
++ SIGNAL(submitFormRequest(const char*,QString,const QByteArray&,QString,QString,QString)));
+
+ reloadTimeout = configGroup.readEntry("Reload", 0);
+ _url = configGroup.readPathEntry("URL", QString());
+@@ -83,7 +130,8 @@
+ return _htmlPart->widget();
+ }
-- QList<KUrl> urls;
- const int argsCount = args->count();
-- for (int i = 0; i < argsCount; ++i) {
-- urls.append(args->url(i));
-- }
-+ if ((argsCount > 0) || !first || !isSessionRestored()) {
-+ QList<KUrl> urls;
-+ for (int i = 0; i < argsCount; ++i) {
-+ urls.append(args->url(i));
-+ }
+-void KonqSideBarWebModule::setAutoReload(){
++void KonqSideBarWebModule::setAutoReload()
++{
+ KDialog dlg( 0 );
+ dlg.setModal( true );
+ dlg.setCaption( i18n("Set Refresh Timeout (0 disables)" ) );
+@@ -92,10 +140,11 @@
+ KHBox *hbox = new KHBox( &dlg );
+ dlg.setMainWidget( hbox );
+
+- QSpinBox *mins = new QSpinBox( hbox );
++ QSpinBox *mins = new QSpinBox(hbox);
+ mins->setRange(0, 120);
+ mins->setSuffix( i18n(" min") );
+- QSpinBox *secs = new QSpinBox( 0, 59, 1, hbox );
++ QSpinBox *secs = new QSpinBox(hbox);
++ secs->setRange(0, 59);
+ secs->setSuffix( i18n(" sec") );
+
+ if( reloadTimeout > 0 ) {
+Index: apps/konqueror/sidebar/web_module/web_module.h
+===================================================================
+--- apps/konqueror/sidebar/web_module/web_module.h (.../tags/KDE/4.4.1/kdebase) (wersja 1104128)
++++ apps/konqueror/sidebar/web_module/web_module.h (.../branches/KDE/4.4/kdebase) (wersja 1104128)
+@@ -31,41 +31,11 @@
+ // A wrapper for KHTMLPart to make it behave the way we want it to.
+ class KHTMLSideBar : public KHTMLPart
+ {
+- Q_OBJECT
+- public:
+- KHTMLSideBar() : KHTMLPart() {
+- setStatusMessagesEnabled(false);
+- setMetaRefreshEnabled(true);
+- setJavaEnabled(false);
+- setPluginsEnabled(false);
++ Q_OBJECT
++public:
++ KHTMLSideBar();
++ virtual ~KHTMLSideBar() {}
+
+- setFormNotification(KHTMLPart::Only);
+- connect(this,
+- SIGNAL(formSubmitNotification(const char*,const QString&,const QByteArray&,const QString&,const QString&,const QString&)),
+- this,
+- SLOT(formProxy(const char*,const QString&,const QByteArray&,const QString&,const QString&,const QString&))
+- );
+-
+-
+- _linkMenu = new KMenu(widget());
+-
+- _linkMenu->insertItem(i18n("&Open Link"),
+- this, SLOT(loadPage()));
+- _linkMenu->insertItem(i18n("Open in New &Window"),
+- this, SLOT(loadNewWindow()));
+- _menu = new KMenu(widget());
+- _menu->insertItem(SmallIcon("view-refresh"), i18n("&Reload"),
+- this, SIGNAL(reload()));
+- _menu->insertItem(SmallIcon("view-refresh"), i18n("Set &Automatic Reload"), this, SIGNAL(setAutoReload()));
+-
+- connect(this,
+- SIGNAL(popupMenu(const QString&,const QPoint&)),
+- this,
+- SLOT(showMenu(const QString&, const QPoint&)));
+-
+- }
+- virtual ~KHTMLSideBar() {}
+-
+ Q_SIGNALS:
+ void submitFormRequest(const char*,const QString&,const QByteArray&,const QString&,const QString&,const QString&);
+ void openUrlRequest(const QString& url,
+Index: apps/konqueror/sidebar/trees/CMakeLists.txt
+===================================================================
+--- apps/konqueror/sidebar/trees/CMakeLists.txt (.../tags/KDE/4.4.1/kdebase) (wersja 1104128)
++++ apps/konqueror/sidebar/trees/CMakeLists.txt (.../branches/KDE/4.4/kdebase) (wersja 1104128)
+@@ -9,6 +9,8 @@
+ kde4_add_library(sidebar_tree STATIC ${libkonq_sidebar_tree_SRCS})
+ endif(WIN32)
+
++add_definitions (-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)
++
+ add_subdirectory( init )
+ add_subdirectory( dirtree_module )
+ add_subdirectory( bookmark_module )
+Index: apps/konqueror/sidebar/konq_sidebartng.desktop
+===================================================================
+--- apps/konqueror/sidebar/konq_sidebartng.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104128)
++++ apps/konqueror/sidebar/konq_sidebartng.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104128)
+@@ -7,7 +7,7 @@
+ Name[ca at valencia]=Barra lateral
+ Name[csb]=Bòcznô listew
+ Name[da]=Sidepanel
+-Name[de]=Seitenleiste
++Name[de]=Navigationsbereich
+ Name[el]=Πλευρική μπάρα
+ Name[en_GB]=Sidebar
+ Name[eo]=Flanka breto
+@@ -29,6 +29,7 @@
+ Name[km]=របារចំហៀង
+ Name[kn]=ಬದಿಯ ಪಟ್ಟಿ
+ Name[ko]=사이드바
++Name[lt]=Šoninė juosta
+ Name[lv]=Sānjosla
+ Name[mai]=स्लाइडबार
+ Name[mk]=Странична лента
+Index: apps/konqueror/sidebar/history_module/konqsidebar_history.desktop
+===================================================================
+--- apps/konqueror/sidebar/history_module/konqsidebar_history.desktop (.../tags/KDE/4.4.1/kdebase) (wersja 1104128)
++++ apps/konqueror/sidebar/history_module/konqsidebar_history.desktop (.../branches/KDE/4.4/kdebase) (wersja 1104128)
+@@ -28,6 +28,7 @@
+ Name[km]=ម៉ូឌុលរបារចំហៀងប្រវត្តិ
+ Name[kn]=ಚರಿತ್ರೆ ಬದಿಪಟ್ಟಿ ಘಟಕ
+ Name[ko]=과거 기록 사이드바 모듈
++Name[lt]=Istorijos šoninės juostos modulis
+ Name[lv]=Vēstures sānjoslas modulis
+ Name[mk]=Модул „Лента за историја“
+ Name[ml]=നാള്വഴികള് വശത്തു് കാണിയ്ക്കുന്ന ഭാഗം
+Index: apps/konqueror/sidebar/CMakeLists.txt
+===================================================================
+--- apps/konqueror/sidebar/CMakeLists.txt (.../tags/KDE/4.4.1/kdebase) (wersja 1104128)
++++ apps/konqueror/sidebar/CMakeLists.txt (.../branches/KDE/4.4/kdebase) (wersja 1104128)
+@@ -1,6 +1,9 @@
+ include_directories (${CMAKE_CURRENT_SOURCE_DIR})
+
++# TODO: rewrite to KDirModel
++if (${QT_QT3SUPPORT_FOUND})
+ add_subdirectory( trees )
++endif()
+ add_subdirectory( web_module )
+ add_subdirectory( history_module )
+ add_subdirectory( default_entries )
+Index: apps/kfind/kquery.cpp
+===================================================================
+--- apps/kfind/kquery.cpp (.../tags/KDE/4.4.1/kdebase) (wersja 1104128)
++++ apps/kfind/kquery.cpp (.../branches/KDE/4.4/kdebase) (wersja 1104128)
+@@ -418,7 +418,7 @@
+ QString str = stream->readLine();
+ matchingLineNumber++;
+
+- if (str.isEmpty()) break;
++ if (str.isNull()) break;
+ if(isZippedOfficeDocument)
+ str.remove(xmlTags);
+
+Index: apps/dolphin/src/panels/information/kmetadatawidget.cpp
+===================================================================
+--- apps/dolphin/src/panels/information/kmetadatawidget.cpp (.../tags/KDE/4.4.1/kdebase) (wersja 1104128)
++++ apps/dolphin/src/panels/information/kmetadatawidget.cpp (.../branches/KDE/4.4/kdebase) (wersja 1104128)
+@@ -136,7 +136,8 @@
+
+ QMap<KUrl, Nepomuk::Resource> m_files;
+
+- KLoadMetaDataThread* m_loadMetaDataThread;
++ QList<KLoadMetaDataThread*> m_metaDataThreads;
++ KLoadMetaDataThread* m_latestMetaDataThread;
+ #endif
+
+ private:
+@@ -163,7 +164,8 @@
+ m_taggingWidget(0),
+ m_commentWidget(0),
+ m_files(),
+- m_loadMetaDataThread(0),
++ m_metaDataThreads(),
++ m_latestMetaDataThread(0),
+ #endif
+ q(parent)
+ {
+@@ -209,11 +211,15 @@
+ KMetaDataWidget::Private::~Private()
+ {
+ #ifdef HAVE_NEPOMUK
+- if (m_loadMetaDataThread != 0) {
+- disconnect(m_loadMetaDataThread, SIGNAL(finished()), q, SLOT(slotLoadingFinished()));
+- m_loadMetaDataThread->cancelAndDelete();
+- m_loadMetaDataThread = 0;
++ // If there are still threads that receive meta data, tell them
++ // that they should cancel as soon as possible. No waiting is done
++ // here, the threads delete themselves after finishing.
++ foreach (KLoadMetaDataThread* thread, m_metaDataThreads) {
++ disconnect(thread, SIGNAL(finished()), q, SLOT(slotLoadingFinished()));
++ thread->cancelAndDelete();
+ }
++ m_metaDataThreads.clear();
++ m_latestMetaDataThread = 0;
+ #endif
+ }
-- DolphinMainWindow* win = createMainWindow();
-- if (urls.count() > 0) {
-- if (args->isSet("select")) {
-- win->openFiles(urls);
-- } else {
-- win->openDirectories(urls);
-+ DolphinMainWindow* win = createMainWindow();
-+ if (urls.count() > 0) {
-+ if (args->isSet("select")) {
-+ win->openFiles(urls);
-+ } else {
-+ win->openDirectories(urls);
+@@ -352,18 +358,28 @@
+ void KMetaDataWidget::Private::slotLoadingFinished()
+ {
+ #ifdef HAVE_NEPOMUK
+- if (m_loadMetaDataThread == 0) {
+- // The signal finished() has been emitted, but the thread has been marked
+- // as invalid in the meantime. Just ignore the signal in this case.
+- return;
++ // The thread that has emitted the finished() signal
++ // will get deleted and removed from m_metaDataThreads.
++ const int threadsCount = m_metaDataThreads.count();
++ for (int i = 0; i < threadsCount; ++i) {
++ KLoadMetaDataThread* thread = m_metaDataThreads[i];
++ if (thread == q->sender()) {
++ m_metaDataThreads.removeAt(i);
++ if (thread != m_latestMetaDataThread) {
++ // Ignore data of older threads, as the data got
++ // obsolete by m_latestMetaDataThread.
++ thread->deleteLater();
++ return;
+ }
- }
-+ win->show();
++ }
+ }
+-
++
+ Q_ASSERT(m_ratingWidget != 0);
+ Q_ASSERT(m_commentWidget != 0);
+ Q_ASSERT(m_taggingWidget != 0);
+- m_ratingWidget->setRating(m_loadMetaDataThread->rating());
+- m_commentWidget->setText(m_loadMetaDataThread->comment());
+- m_taggingWidget->setTags(m_loadMetaDataThread->tags());
++ m_ratingWidget->setRating(m_latestMetaDataThread->rating());
++ m_commentWidget->setText(m_latestMetaDataThread->comment());
++ m_taggingWidget->setTags(m_latestMetaDataThread->tags());
+
+ // Show the remaining meta information as text. The number
+ // of required rows may very. Existing rows are reused to
+@@ -372,7 +388,7 @@
+ const int rowCount = m_rows.count();
+ Q_ASSERT(rowCount >= index);
+
+- const QList<KLoadMetaDataThread::Item> items = mergedItems(m_loadMetaDataThread->items());
++ const QList<KLoadMetaDataThread::Item> items = mergedItems(m_latestMetaDataThread->items());
+ foreach (const KLoadMetaDataThread::Item& item, items) {
+ const QString itemLabel = item.label;
+ QString itemValue = item.value;
+@@ -413,10 +429,8 @@
+ m_rows.pop_back();
}
-- win->show();
-+ first = false;
- args->clear();
- return 0;
+- m_files = m_loadMetaDataThread->files();
+-
+- m_loadMetaDataThread->deleteLater();
+- m_loadMetaDataThread = 0;
++ m_files = m_latestMetaDataThread->files();
++ m_latestMetaDataThread->deleteLater();
+ #endif
+
+ q->updateGeometry();
+@@ -590,14 +604,17 @@
+ }
+ }
+
+- if (d->m_loadMetaDataThread != 0) {
+- disconnect(d->m_loadMetaDataThread, SIGNAL(finished()), this, SLOT(slotLoadingFinished()));
+- d->m_loadMetaDataThread->cancelAndDelete();
++ // Cancel all threads that have not emitted a finished() signal.
++ // The deleting of those threads is done in slotLoadingFinished().
++ foreach (KLoadMetaDataThread* thread, d->m_metaDataThreads) {
++ thread->cancel();
+ }
+-
+- d->m_loadMetaDataThread = new KLoadMetaDataThread();
+- connect(d->m_loadMetaDataThread, SIGNAL(finished()), this, SLOT(slotLoadingFinished()));
+- d->m_loadMetaDataThread->load(urls);
++
++ // create a new thread that will provide the meeta data for the items
++ d->m_latestMetaDataThread = new KLoadMetaDataThread();
++ connect(d->m_latestMetaDataThread, SIGNAL(finished()), this, SLOT(slotLoadingFinished()));
++ d->m_latestMetaDataThread->load(urls);
++ d->m_metaDataThreads.append(d->m_latestMetaDataThread);
+ }
+ #endif
}
-Index: apps/dolphin/src/kcm/kcmdolphinservices.desktop
+Index: apps/dolphin/src/panels/information/kloadmetadatathread_p.h
===================================================================
---- apps/dolphin/src/kcm/kcmdolphinservices.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091888)
-+++ apps/dolphin/src/kcm/kcmdolphinservices.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091888)
-@@ -219,7 +219,7 @@
- Comment[sv]=Anpassa filhanterarens tjänster
- Comment[tg]=Танзимоти файли мудири хизматҳо
- Comment[tr]=Dosya yöneticisi servislerini yapılandır
--Comment[uk]=Налаштувати служби менеджера файлів
-+Comment[uk]=Налаштувати служб керування файлами
- Comment[wa]=Apontyî les siervices do manaedjeu di fitchîs
- Comment[x-test]=xxConfigure file manager servicesxx
- Comment[zh_CN]=配置文件管理器服务
-Index: apps/dolphin/src/kcm/kcmdolphingeneral.desktop
-===================================================================
---- apps/dolphin/src/kcm/kcmdolphingeneral.desktop (.../tags/KDE/4.4.0/kdebase) (wersja 1091888)
-+++ apps/dolphin/src/kcm/kcmdolphingeneral.desktop (.../branches/KDE/4.4/kdebase) (wersja 1091888)
-@@ -260,7 +260,7 @@
- Comment[sv]=Anpassa filhanterarens allmänna inställningar
- Comment[tg]=Танзимоти умумии мудири файлҳо насб кунед
- Comment[tr]=Genel dosya yöneticisi ayarlarını yapılandır
--Comment[uk]=Налаштувати загальні параметри менеджера файлів
-+Comment[uk]=Налаштування загальних параметрів керування файлами
- Comment[wa]=Apontyî les tchuzes djeneråles do manaedjeu di fitchîs
- Comment[x-test]=xxConfigure general file manager settingsxx
- Comment[zh_CN]=配置常规文件管理器设置
-Index: apps/doc/kdepasswd/password.png
-===================================================================
-Nie można wyświetlić: plik binarny.
-svn:mime-type = image/png
-Index: apps/doc/kdepasswd/index.docbook
+--- apps/dolphin/src/panels/information/kloadmetadatathread_p.h (.../tags/KDE/4.4.1/kdebase) (wersja 1104128)
++++ apps/dolphin/src/panels/information/kloadmetadatathread_p.h (.../branches/KDE/4.4/kdebase) (wersja 1104128)
+@@ -55,8 +55,16 @@
+ * metaInfoValues() and files() return valid data.
+ */
+ void load(const KUrl::List& urls);
+-
++
+ /**
++ * Tells the thread that it should cancel as soon
++ * as possible. It is undefined when the thread
++ * gets cancelled. The signal finished() will emitted
++ * after the cancelling has been done.
++ */
++ void cancel();
++
++ /**
+ * Cancels the thread and assures that the thread deletes
+ * itself as soon as the cancelling has been successful. In
+ * opposite to QThread::wait() the caller of cancelAndDelete()
+Index: apps/dolphin/src/panels/information/kloadmetadatathread.cpp
+===================================================================
+--- apps/dolphin/src/panels/information/kloadmetadatathread.cpp (.../tags/KDE/4.4.1/kdebase) (wersja 1104128)
++++ apps/dolphin/src/panels/information/kloadmetadatathread.cpp (.../branches/KDE/4.4/kdebase) (wersja 1104128)
+@@ -50,15 +50,27 @@
+ start();
+ }
+
+-void KLoadMetaDataThread::cancelAndDelete()
++void KLoadMetaDataThread::cancel()
+ {
+- connect(this, SIGNAL(finished()), this, SLOT(slotFinished()));
++ // Setting m_canceled to true will cancel KLoadMetaDataThread::run()
++ // as soon as run() gets the chance to check m_cancel.
+ m_canceled = true;
+- // Setting m_canceled to true will cancel KLoadMetaDataThread::run()
+- // as soon as possible. Afterwards the thread will delete itself
+- // asynchronously inside slotFinished().
+ }
+
++void KLoadMetaDataThread::cancelAndDelete()
++{
++ if (isFinished()) {
++ Q_ASSERT(!isRunning());
++ deleteLater();
++ } else {
++ connect(this, SIGNAL(finished()), this, SLOT(slotFinished()));
++ // Setting m_canceled to true will cancel KLoadMetaDataThread::run()
++ // as soon as run() gets the chance to check m_cancel.
++ m_canceled = true;
++ // Afterwards the thread will delete itself
++ // asynchronously inside slotFinished().
++ }
++}
+ void KLoadMetaDataThread::run()
+ {
+ KConfig config("kmetainformationrc", KConfig::NoGlobals);
+Index: apps/dolphin/src/panels/terminal/terminalpanel.h
===================================================================
---- apps/doc/kdepasswd/index.docbook (.../tags/KDE/4.4.0/kdebase) (wersja 1091888)
-+++ apps/doc/kdepasswd/index.docbook (.../branches/KDE/4.4/kdebase) (wersja 1091888)
-@@ -5,6 +5,7 @@
- <!ENTITY % English "INCLUDE">
- ]>
- <article lang="&language;">
-+<title>User Information</title>
- <articleinfo>
- <authorgroup>
- <author>
-@@ -22,8 +23,8 @@
- <!-- TRANS:ROLES_OF_TRANSLATORS -->
- </authorgroup>
+--- apps/dolphin/src/panels/terminal/terminalpanel.h (.../tags/KDE/4.4.1/kdebase) (wersja 1104128)
++++ apps/dolphin/src/panels/terminal/terminalpanel.h (.../branches/KDE/4.4/kdebase) (wersja 1104128)
+@@ -1,5 +1,5 @@
+ /***************************************************************************
+- * Copyright (C) 2007 by Peter Penz <peter.penz at gmx.at> *
++ * Copyright (C) 2007-2010 by Peter Penz <peter.penz at gmx.at> *
+ * *
+ * This program is free software; you can redistribute it and/or modify *
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdebase/kde4-kdebase-branch.diff?r1=1.16&r2=1.17&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdebase/kde4-kdebase.spec?r1=1.119&r2=1.120&f=u
More information about the pld-cvs-commit
mailing list