[gentoo-commits] gentoo-x86 commit in kde-base/kactivities/files: kactivities-4.8.1-nepomuk.patch

[Andreas HAttel (dilfridge)]

dilfridge    12/04/08 14:52:42

  Added:                kactivities-4.8.1-nepomuk.patch
  Log:
  Manually patch kactivities-4.8.1 to kde-4.8.2 state, to prevent (most of the) crashes as in bug 411279
  
  (Portage version: 2.1.10.56/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  kde-base/kactivities/files/kactivities-4.8.1-nepomuk.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kactivities/files/kactivities-4.8.1-nepomuk.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kactivities/files/kactivities-4.8.1-nepomuk.patch?rev=1.1&content-type=text/plain

Index: kactivities-4.8.1-nepomuk.patch
===================================================================
diff -ruN kactivities-4.8.1/service/ActivityManager.cpp kactivities-4.8.2/service/ActivityManager.cpp
--- kactivities-4.8.1/service/ActivityManager.cpp	2011-12-20 18:49:44.000000000 +0100
+++ kactivities-4.8.2/service/ActivityManager.cpp	2012-03-29 12:58:36.000000000 +0200
@@ -80,7 +80,8 @@
       windows(_windows),
       resources(_resources),
 #ifdef HAVE_NEPOMUK
-      m_nepomukInitCalled(false),
+      m_nepomukInitialized(false),
+      m_nepomukWatcher(0),
 #endif
       q(parent),
       ksmserverInterface(0)
@@ -90,7 +91,17 @@
     kDebug() << "-------------------------------------------------------";
 
 #ifdef HAVE_NEPOMUK
-    Nepomuk::ResourceManager::instance()->init();
+    if (QDBusConnection::sessionBus().interface()->isServiceRegistered(QLatin1String("org.kde.nepomuk.services.nepomukstorage"))) {
+        QTimer::singleShot(500, this, SLOT(nepomukOnline()));
+
+    } else {
+        m_nepomukWatcher = new QDBusServiceWatcher(QLatin1String("org.kde.nepomuk.services.nepomukstorage"),
+                            QDBusConnection::sessionBus(),
+                            QDBusServiceWatcher::WatchForRegistration | QDBusServiceWatcher::WatchForUnregistration,
+                            this);
+        connect(m_nepomukWatcher, SIGNAL(serviceRegistered(QString)), this, SLOT(nepomukOnline()));
+        connect(m_nepomukWatcher, SIGNAL(serviceUnregistered(QString)), this, SLOT(nepomukOffline()));
+    }
 #endif
 
     // Initializing config
@@ -308,6 +319,8 @@
 void ActivityManagerPrivate::syncActivitiesWithNepomuk()
 {
 #ifdef HAVE_NEPOMUK
+    if (!nepomukInitialized()) return;
+
     foreach (const QString & activityId, activities.keys()) {
         Nepomuk::Resource activityResource(activityId, KEXT::Activity());
 
@@ -337,32 +350,9 @@
 }
 
 /* lazy init of nepomuk */
-bool ActivityManagerPrivate::nepomukInitialized()
-{
-    if (m_nepomukInitCalled) return
-        Nepomuk::ResourceManager::instance()->initialized();
-
-    m_nepomukInitCalled = true;
-
-    connect(Nepomuk::ResourceManager::instance(), SIGNAL(nepomukSystemStarted()), this, SLOT(backstoreAvailable()));
-
-    return (Nepomuk::ResourceManager::instance()->init() == 0);
-}
-
-void ActivityManagerPrivate::backstoreAvailable()
-{
-    //emit q->BackstoreAvailable();
-    //kick the icons, so that clients don't need to know that they depend on nepomuk
-    for (QHash<QString, ActivityManager::State>::const_iterator i = activities.constBegin();
-         i != activities.constEnd(); ++i) {
-        emit q->ActivityChanged(i.key());
-    }
-}
-
-#else // HAVE_NEPOMUK
-
-void ActivityManagerPrivate::backstoreAvailable()
+bool ActivityManagerPrivate::nepomukInitialized() const
 {
+    return m_nepomukInitialized;
 }
 
 #endif // HAVE_NEPOMUK
@@ -651,6 +641,27 @@
     transitioningActivity.clear();
 }
 
+void ActivityManagerPrivate::nepomukOnline()
+{
+#ifdef HAVE_NEPOMUK
+    Nepomuk::ResourceManager::instance()->init();
+
+    for (QHash<QString, ActivityManager::State>::const_iterator i = activities.constBegin();
+         i != activities.constEnd(); ++i) {
+        emit q->ActivityChanged(i.key());
+    }
+
+    m_nepomukInitialized = true;
+#endif
+}
+
+void ActivityManagerPrivate::nepomukOffline()
+{
+#ifdef HAVE_NEPOMUK
+    m_nepomukInitialized = false;
+#endif
+}
+
 int ActivityManager::ActivityState(const QString & id) const
 {
     //kDebug() << id << "- is it in" << d->activities << "?";
@@ -789,7 +800,7 @@
     kDebug() << "New event on the horizon" << application << windowId << event << uri;
 
 #ifdef HAVE_NEPOMUK
-    if (uri.startsWith("nepomuk:")) {
+    if (NEPOMUK_RUNNING && uri.startsWith("nepomuk:")) {
         Nepomuk::Resource resource(kuri);
 
         if (resource.hasProperty(NIE::url())) {
@@ -830,36 +841,37 @@
     d->resources[kuri].mimetype = mimetype;
 
 #ifdef HAVE_NEPOMUK
-    Nepomuk::Resource resource(kuri);
-    if (!resource.hasProperty(NIE::mimeType())) {
-        kDebug() << "Setting the mime in nepomuk for" << uri << "to be" << mimetype;
-        resource.setProperty(NIE::mimeType(), mimetype);
+    if (NEPOMUK_RUNNING) {
+        Nepomuk::Resource resource(kuri);
+        if (!resource.hasProperty(NIE::mimeType())) {
+            kDebug() << "Setting the mime in nepomuk for" << uri << "to be" << mimetype;
+            resource.setProperty(NIE::mimeType(), mimetype);
 
-        if (mimetype.startsWith("image/")) {
-            resource.addType(NFO::Image());
+            if (mimetype.startsWith("image/")) {
+                resource.addType(NFO::Image());
 
-        } else if (mimetype.startsWith("video/")) {
-            resource.addType(NFO::Video());
+            } else if (mimetype.startsWith("video/")) {
+                resource.addType(NFO::Video());
 
-        } else if (mimetype.startsWith("audio/")) {
-            resource.addType(NFO::Audio());
+            } else if (mimetype.startsWith("audio/")) {
+                resource.addType(NFO::Audio());
 
-        } else if (mimetype.startsWith("image/")) {
-            resource.addType(NFO::Image());
+            } else if (mimetype.startsWith("image/")) {
+                resource.addType(NFO::Image());
 
-        } else if (mimetype.startsWith("text/")) {
-            if (!resource.hasType(NFO::Bookmark())) {
-                resource.addType(NFO::TextDocument());
+            } else if (mimetype.startsWith("text/")) {
+                if (!resource.hasType(NFO::Bookmark())) {
+                    resource.addType(NFO::TextDocument());
 
-                if (mimetype == "text/plain") {
-                    resource.addType(NFO::PlainTextDocument());
+                    if (mimetype == "text/plain") {
+                        resource.addType(NFO::PlainTextDocument());
 
-                } else if (mimetype == "text/html") {
-                        resource.addType(NFO::HtmlDocument());
+                    } else if (mimetype == "text/html") {
+                            resource.addType(NFO::HtmlDocument());
+                    }
                 }
             }
         }
-
     }
 #endif
 }
@@ -876,13 +888,15 @@
     d->resources[kuri].title = title;
 
 #ifdef HAVE_NEPOMUK
-    kDebug() << "Setting the title for" << uri << "to be" << title;
-    Nepomuk::Resource resource(kuri);
+    if (NEPOMUK_RUNNING) {
+        kDebug() << "Setting the title for" << uri << "to be" << title;
+        Nepomuk::Resource resource(kuri);
 
-    kDebug() << uri << "local?" << kuri.isLocalFile()
-                    << "title"  << resource.hasProperty(NIE::title());
-    if (!kuri.isLocalFile() || !resource.hasProperty(NIE::title())) {
-        resource.setProperty(NIE::title(), title);
+        kDebug() << uri << "local?" << kuri.isLocalFile()
+                        << "title"  << resource.hasProperty(NIE::title());
+        if (!kuri.isLocalFile() || !resource.hasProperty(NIE::title())) {
+            resource.setProperty(NIE::title(), title);
+        }
     }
 #endif
 }
@@ -890,7 +904,7 @@
 void ActivityManager::LinkResourceToActivity(const QString & uri, const QString & activity)
 {
 #ifdef HAVE_NEPOMUK
-    if (!d->nepomukInitialized()) return;
+    if (!NEPOMUK_RUNNING) return;
 
     kDebug() << "Linking" << uri << "to" << activity << CurrentActivity();
 
diff -ruN kactivities-4.8.1/service/ActivityManager_p.h kactivities-4.8.2/service/ActivityManager_p.h
--- kactivities-4.8.1/service/ActivityManager_p.h	2011-12-02 22:16:56.000000000 +0100
+++ kactivities-4.8.2/service/ActivityManager_p.h	2012-03-29 12:58:36.000000000 +0200
@@ -23,6 +23,7 @@
 #include <QSet>
 #include <QString>
 #include <QTimer>
+#include <QDBusServiceWatcher>
 
 #include <KConfig>
 #include <KConfigGroup>
@@ -83,12 +84,6 @@
     KConfigGroup mainConfig();
     QString activityName(const QString & id);
 
-#ifdef HAVE_NEPOMUK
-    Nepomuk::Resource activityResource(const QString & id);
-    bool nepomukInitialized();
-    mutable bool m_nepomukInitCalled;
-#endif // HAVE_NEPOMUK
-
 public Q_SLOTS:
     void scheduleConfigSync();
     void configSync();
@@ -103,10 +98,22 @@
     void reallyStartActivity(const QString & id);
     void reallyStopActivity(const QString & id);
 
-    void backstoreAvailable();
     void syncActivitiesWithNepomuk();
     void sessionServiceRegistered();
 
+public Q_SLOTS:
+    void nepomukOnline();
+    void nepomukOffline();
+
+#ifdef HAVE_NEPOMUK
+public:
+    Nepomuk::Resource activityResource(const QString & id);
+    bool nepomukInitialized() const;
+
+    mutable bool m_nepomukInitialized : 1;
+    QDBusServiceWatcher * m_nepomukWatcher;
+#endif // HAVE_NEPOMUK
+
 private:
     ActivityManager * const q;
     QDBusInterface *ksmserverInterface; //just keeping it for the signals
diff -ruN kactivities-4.8.1/service/activitymanager-plugin.desktop kactivities-4.8.2/service/activitymanager-plugin.desktop
--- kactivities-4.8.1/service/activitymanager-plugin.desktop	2012-02-29 23:56:02.000000000 +0100
+++ kactivities-4.8.2/service/activitymanager-plugin.desktop	2012-03-29 12:58:36.000000000 +0200
@@ -7,6 +7,7 @@
 Comment[cs]=Modul Správce aktivit
 Comment[da]=Aktivitetshåndtering-plugin
 Comment[de]=Modul für Aktivitätenverwaltung
+Comment[el]=Πρόσθετο διαχειριστή δραστηριοτήτων
 Comment[es]=Complemento del gestor de actividades
 Comment[et]=Tegevuste haldamise plugin
 Comment[eu]=Jarduera kudeatzailearen plugina
diff -ruN kactivities-4.8.1/service/kactivitymanagerd.desktop kactivities-4.8.2/service/kactivitymanagerd.desktop
--- kactivities-4.8.1/service/kactivitymanagerd.desktop	2012-02-29 23:56:02.000000000 +0100
+++ kactivities-4.8.2/service/kactivitymanagerd.desktop	2012-03-29 12:58:36.000000000 +0200
@@ -11,6 +11,7 @@
 Name[cs]=Správce aktivit
 Name[da]=Aktivitetshåndtering
 Name[de]=Aktivitätenverwaltung
+Name[el]=Διαχειριστής δραστηριοτήτων
 Name[es]=Gestor de actividades
 Name[et]=Tegevuste haldur
 Name[eu]=Jarduera kudeatzailea
@@ -50,6 +51,7 @@
 Comment[cs]=Podpůrná vrstva pro správu aktivit
 Comment[da]=Motor til aktivitetshåndtering
 Comment[de]=Backend der Aktivitätenverwaltung
+Comment[el]=Το σύστημα υποστήριξης διαχείρισης δραστηριοτήτων
 Comment[es]=El motor de la gestión de actividades
 Comment[et]=Tegevuste haldamise taustaprogramm
 Comment[eu]=Jarduera kudeaketa 'backend'
diff -ruN kactivities-4.8.1/service/plugins/dummy/activitymanager-plugin-dummy.desktop kactivities-4.8.2/service/plugins/dummy/activitymanager-plugin-dummy.desktop
--- kactivities-4.8.1/service/plugins/dummy/activitymanager-plugin-dummy.desktop	2012-02-29 23:56:02.000000000 +0100
+++ kactivities-4.8.2/service/plugins/dummy/activitymanager-plugin-dummy.desktop	2012-03-29 12:58:36.000000000 +0200
@@ -4,6 +4,7 @@
 Name[cs]=Prázdný modul
 Name[da]=Attrap-plugin
 Name[de]=Dummy-Modul
+Name[el]=Ψεύτικο πρόσθετο
 Name[es]=Complemento vacío
 Name[et]=Kohatäiteplugin
 Name[eu]=Gezurrezko plugina
@@ -42,6 +43,7 @@
 Comment[cs]=Pouze testovací
 Comment[da]=Tester lige
 Comment[de]=Nur zum Testen
+Comment[el]=Δοκιμή
 Comment[es]=Solo para pruebas
 Comment[et]=Lihtsalt test
 Comment[eu]=Soilik probatarako
diff -ruN kactivities-4.8.1/service/plugins/nepomuk/activitymanager-plugin-nepomuk.desktop kactivities-4.8.2/service/plugins/nepomuk/activitymanager-plugin-nepomuk.desktop
--- kactivities-4.8.1/service/plugins/nepomuk/activitymanager-plugin-nepomuk.desktop	2012-02-29 23:56:02.000000000 +0100
+++ kactivities-4.8.2/service/plugins/nepomuk/activitymanager-plugin-nepomuk.desktop	2012-03-29 12:58:36.000000000 +0200
@@ -1,90 +1,3 @@
 [Desktop Entry]
-Name=Nepomuk Feeder Plugin
-Name[ca]=Connector de l'alimentador del Nepomuk
-Name[da]=Nepomuk-feeder-plugin
-Name[es]=Complemento de aprovisionamiento de Nepomuk
-Name[et]=Nepomuki sööturi plugin
-Name[eu]=Nepomuk elikatzeko plugina
-Name[fi]=Nepomuk-syöteliitännäinen
-Name[ga]=Breiseán Fothaire Nepomuk
-Name[gl]=Engadido alimentador de Nepomuk
-Name[he]=תוסף רסס של Nepomuk
-Name[hu]=Nepomuk-feltöltő bővítmény
-Name[ia]=Plugin de Syndacation de Nepomuk
-Name[it]=Estensione di rifornimento di Nepomuk
-Name[kk]=Nepomuk бергіш плагині
-Name[km]=កម្មវិធី​ជំនួយ​របស់​​កម្មវិធី​មតិ​ព័ត៌មាន Nepomuk
-Name[nb]=Programtillegg for Nepomuk innmating
-Name[nds]=Nepomuk-Ingaavmoduul
-Name[nl]=Plug-in van Nepomuk-feeder
-Name[pa]=ਨਿਪੋਮੁਕ ਫੀਡਰ ਪਲੱਗਇਨ
-Name[pl]=Wtyczka podajnika Nepomuk
-Name[pt]='Plugin' de Fontes do Nepomuk
-Name[pt_BR]=Plugin de fontes de notícias do Nepomuk
-Name[ro]=Modul de alimentare Nepomuk
-Name[se]=Lassemodula Nepomuk-biebmamii
-Name[sk]=Plugin podávača Nepomuk
-Name[sr]=Прикључак Непомуковог уводника
-Name[sr@ijekavian]=Прикључак Непомуковог уводника
-Name[sr@ijekavianlatin]=Priključak Nepomukovog uvodnika
-Name[sr@latin]=Priključak Nepomukovog uvodnika
-Name[sv]=Nepomuk-inmatningsinsticksprogram
-Name[tr]=Nepomuk Besleme Eklentisi
-Name[uk]=Додаток передавання даних Nepomuk
-Name[x-test]=xxNepomuk Feeder Pluginxx
-Name[zh_CN]=Nepomuk 采集器插件
-Name[zh_TW]=Nepomuk Feeder 外掛程式
-Comment=Plugin to store and score events in Nepomuk
-Comment[ca]=Connector per emmagatzemar i classificar esdeveniments en el Nepomuk
-Comment[da]=Plugin til at gemme og bedømme begivenheder i Nepomuk
-Comment[de]=Modul zum Speichern und Bewerten von Ereignissen in Nepomuk
-Comment[es]=Complemento para almacenar y puntuar eventos en Nepomuk
-Comment[et]=Plugin sündmuste salvestamiseks Nepomukki ja nende hindamiseks
-Comment[eu]=Nepomuk-en gertaerak biltegiratu eta puntuatzeko plugina
-Comment[fi]=Liitännäinen tapahtumien tallentamiseen ja arvosanoittamiseen Nepomukissa
-Comment[ga]=Breiseán a stórálann agus scórálann imeachtaí in Nepomuk
-Comment[gl]=Un engadido para gardar e cualificar acontecementos en Nepomuk
-Comment[he]=תוסף לשמירה ורישום של אירועים ב־Nepomuk
-Comment[hu]=Bővítmény események tárolására és pontozására a Nepomukban
-Comment[ia]=Plugin pro immagazinar e dar punctos a eventos in Nepomuk
-Comment[it]=Estensione per memorizzare e valutare gli eventi di Nepomuk
-Comment[kk]=Оқиғаларды сақтап бағалайтын Nepomuk қызметі
-Comment[km]=កម្មវិធី​ជំនួយ​ត្រូវ​​ទុក និង​​ព្រឹត្តិការណ៍​ពិន្ទុ​នៅ​ក្នុង Nepomuk
-Comment[nb]=Programtillegg for å lagre og poengsette hendelser i Nepomuk
-Comment[nds]=Nepomuk-Moduul för't Sekern un Beweerten vun Begeefnissen
-Comment[nl]=Plug-in om gebeurtenissen in Nepomuk op te slaan en van een score te voorzien
-Comment[pa]=ਨਿਪੋਮੁਕ ਵਿੱਚ ਈਵੈਂਟ ਸਟੋਰ ਕਰਨ ਅਤੇ ਸਕਰੋ ਲਈ ਪਲੱਗਇਨ
-Comment[pl]=Wtyczka do przechowywania i oceny zdarzeń w Nepomuk
-Comment[pt]='Plugin' para guardar e classificar os eventos no Nepomuk
-Comment[pt_BR]=Plugin para armazenar e classificar os eventos no Nepomuk
-Comment[ro]=Modul pentru stocarea și notarea evenimentelor în Nepomuk
-Comment[se]=Lassemodula mainna vurke ja bidjá árvvuid Nepomukis 
-Comment[sk]=Plugin na uloženie a bodovanie udalosti v Nepomuku
-Comment[sl]=Vstavek za shranjevanje in označevanje dogodkov v Nepomuku
-Comment[sr]=Прикључак за складиштење и оцењивање догађаја у Непомуку
-Comment[sr@ijekavian]=Прикључак за складиштење и оцењивање догађаја у Непомуку
-Comment[sr@ijekavianlatin]=Priključak za skladištenje i ocenjivanje događaja u Nepomuku
-Comment[sr@latin]=Priključak za skladištenje i ocenjivanje događaja u Nepomuku
-Comment[sv]=Insticksprogram för att lagra och betygsätta händelser i Nepomuk
-Comment[tr]=Nepomuk'ta olayları derecelendirmek ve saklamak için gerekli eklenti
-Comment[uk]=Додаток для зберігання і оцінки подій у Nepomuk
-Comment[x-test]=xxPlugin to store and score events in Nepomukxx
-Comment[zh_CN]=将事件在 Nepomuk 中存储并打分的插件
-Comment[zh_TW]=在 Nepomuk 裡儲存與評分事件用的外掛程式
-Type=Service
-Icon=nepomukk
+Hidden=true
 
-X-KDE-ServiceTypes=ActivityManager/Plugin
-X-KDE-Library=activitymanager_plugin_nepomuk
-X-KDE-PluginInfo-Author=Ivan Cukic
-X-KDE-PluginInfo-Email=ivan.cukic@×××.org
-X-KDE-PluginInfo-Name=org.kde.kactivitymanager.nepomuk
-X-KDE-PluginInfo-Version=1.0
-X-KDE-PluginInfo-Website=http://plasma.kde.org/
-X-KDE-PluginInfo-Category=Language
-X-KDE-PluginInfo-Depends=
-X-KDE-PluginInfo-License=GPL
-X-KDE-PluginInfo-EnabledByDefault=true
-
-X-ActivityManager-PluginType=lazyeventhandler
-X-ActivityManager-PluginOverrides=activitymanager_plugin_dummy
diff -ruN kactivities-4.8.1/service/plugins/slc/activitymanager-plugin-slc.desktop kactivities-4.8.2/service/plugins/slc/activitymanager-plugin-slc.desktop
--- kactivities-4.8.1/service/plugins/slc/activitymanager-plugin-slc.desktop	2012-02-29 23:56:02.000000000 +0100
+++ kactivities-4.8.2/service/plugins/slc/activitymanager-plugin-slc.desktop	2012-03-29 12:58:36.000000000 +0200
@@ -37,6 +37,7 @@
 Comment[ca]=Connector per proporcionar dades al sistema SLC
 Comment[da]=Plugin til at levere data til SLC-systemet
 Comment[de]=Modul, um dem SLC-System Daten bereitzustellen.
+Comment[el]=Πρόσθετο παροχής δεδομένων στο σύστημα SLC
 Comment[es]=Complemento para proporcionar datos al sistema SLC
 Comment[et]=Plugin andmete pakkumiseks SLC süsteemile
 Comment[eu]=SLC sistemari datuak hornitzeko plugina