File 4_0_BRANCH.diff of Package kdeutils4

Overview Repositories Revisions Requests Users Attributes Meta

File 4_0_BRANCH.diff of Package kdeutils4 (Revision 8292b8923b2ab3728c60c30bcc0c4274)

Currently displaying revision 8292b8923b2ab3728c60c30bcc0c4274 , Show latest

package: kdeutils-4.0.0.tar.bz2
kdemod: kdeutils
current HEAD: 759044
svn di between /tags/KDE/4.0.0 and /branches/KDE//branches/KDE/4.0
--- kwallet/kwalletmanager.cpp		(revision 759055)
+++ kwallet/kwalletmanager.cpp		(revision 759055)
@@ -56,6 +56,7 @@
 	KGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet");
 	_kwalletdLaunch = false;
 	_shuttingDown = false;
+	m_kwalletdModule = 0;
 	KConfig cfg("kwalletrc"); // not sure why this setting isn't in kwalletmanagerrc...
 	KConfigGroup walletConfigGroup(&cfg, "Wallet");
 	if (walletConfigGroup.readEntry("Launch Manager", true)) {
--- kwallet/konfigurator/konfigurator.cpp		(revision 759055)
+++ kwallet/konfigurator/konfigurator.cpp		(revision 759055)
@@ -285,7 +285,7 @@
 	}
 
 	_cfg->sync();
-        QDBusInterface kwalletd("org.kde.kded", "/modules/kwallet", KWALLETMANAGERINTERFACE);
+        QDBusInterface kwalletd("org.kde.kded", "/modules/kwalletd", KWALLETMANAGERINTERFACE);
         kwalletd.call( "reconfigure" );
 	emit changed(false);
 }
--- sweeper/privacyfunctions.cpp		(revision 759055)
+++ sweeper/privacyfunctions.cpp		(revision 759055)
@@ -74,16 +74,16 @@
 
 bool ClearRunCommandHistoryAction::action()
 {
-   QDBusInterface kdesktop("org.kde.kdesktop", "/Desktop", "org.kde.kdesktop.Desktop");
-   QDBusReply<bool> reply = kdesktop.call("clearCommandHistory");
-   return reply;
+   QDBusInterface krunner("org.kde.krunner", "/Interface", "org.kde.krunner.Interface");
+   QDBusReply<void> reply = krunner.call("clearHistory");
+   return reply.isValid();
 }
 
 bool ClearAllCookiesAction::action()
 {
    QDBusInterface mediamanager("org.kde.kded", "/modules/kcookiejar", "org.kde.KCookieServer");
-   QDBusReply<bool> reply = mediamanager.call("deleteAllCookies");
-   return reply;
+   QDBusReply<void> reply = mediamanager.call("deleteAllCookies");
+   return reply.isValid();
 }
 
 bool ClearAllCookiesPoliciesAction::action()
@@ -98,9 +98,9 @@
 
    // inform the cookie jar we pillaged it
    QDBusInterface kcookiejar("org.kde.kded", "/modules/kcookiejar", "org.kde.KCookieServer");
-   QDBusReply<bool> reply = kcookiejar.call("reloadPolicy");
+   QDBusReply<void> reply = kcookiejar.call("reloadPolicy");
 
-   return reply;
+   return reply.isValid();
 }
 
 bool ClearSavedClipboardContentsAction::action()
@@ -114,9 +114,9 @@
       delete c;
       return true;
    }
-   QDBusInterface klipper("org.kde.klipper", "/Klipper", "org.kde.klipper.klipper");
-   QDBusReply<bool> reply = klipper.call("clearClipboardHistory");
-   return reply;
+   QDBusInterface klipper("org.kde.klipper", "/klipper", "org.kde.klipper.klipper");
+   QDBusReply<void> reply = klipper.call("clearClipboardHistory");
+   return reply.isValid();
 }
 
 bool ClearFormCompletionAction::action()
@@ -138,7 +138,7 @@
 {
    QStringList lst;
    lst << "--clear-all";
-   return QProcess::startDetached("kio_http_cache_cleaner",lst);
+   return QProcess::startDetached(KStandardDirs::findExe("kio_http_cache_cleaner"),lst);
 }
 
 bool ClearRecentDocumentsAction::action()
@@ -147,13 +147,6 @@
    return KRecentDocument::recentDocuments().isEmpty();
 }
 
-bool ClearQuickStartMenuAction::action()
-{
-	QDBusInterface kicker("org.kde.kicker", "/Kicker", "org.kde.kicker.Kicker");
-	QDBusReply<bool> reply = kicker.call("clearQuickStartMenu");
-	return reply;
-}
-
 bool ClearWebHistoryAction::action()
 {
    // Clear the history from the memory of the running konquerors
--- sweeper/sweeper.cpp		(revision 759055)
+++ sweeper/sweeper.cpp		(revision 759055)
@@ -158,7 +158,6 @@
    checklist.append(new ClearSavedClipboardContentsAction(generalCLI));
    checklist.append(new ClearRecentDocumentsAction(generalCLI));
 #ifdef Q_WS_X11
-   checklist.append(new ClearQuickStartMenuAction(generalCLI));
    checklist.append(new ClearRunCommandHistoryAction(generalCLI));
 #endif
    checklist.append(new ClearThumbnailsAction(generalCLI));
--- sweeper/privacyfunctions.h		(revision 759055)
+++ sweeper/privacyfunctions.h		(revision 759055)
@@ -104,15 +104,6 @@
       bool action();
 };
 
-class ClearQuickStartMenuAction : public PrivacyAction
-{
-   public:
-      ClearQuickStartMenuAction(QTreeWidgetItem * parent)
-         : PrivacyAction(parent, i18n("Quick Start Menu"),
-                         i18n("Clears the entries from the list of recently started applications")) { }
-      bool action();
-};
-
 class ClearRecentDocumentsAction : public PrivacyAction
 {
    public:

Property changes on: .
___________________________________________________________________
Deleted: svn:mergeinfo
Added: svn:externals
   +

Places

File 4_0_BRANCH.diff of Package kdeutils4 (Revision 8292b8923b2ab3728c60c30bcc0c4274)

Places