From 117898f4edce1f0029a4a49976560e9a944c3370 Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Tue, 17 Mar 2015 18:30:45 +0100 Subject: [PATCH] don't install notifyrc the plasmashell notifyrc is unfortunately installed by frameworksintegration Change-Id: I50aba5bef79150c3d8d92e9c2c94965daabd5e38 --- src/plasma/CMakeLists.txt | 1 - .../data/notifications/plasmashell.notifyrc | 122 ------------------ src/plasma/private/applet_p.cpp | 2 + 3 files changed, 2 insertions(+), 123 deletions(-) delete mode 100644 src/plasma/data/notifications/plasmashell.notifyrc diff --git a/src/plasma/CMakeLists.txt b/src/plasma/CMakeLists.txt index 38cdbf80c..73f308cf5 100644 --- a/src/plasma/CMakeLists.txt +++ b/src/plasma/CMakeLists.txt @@ -201,7 +201,6 @@ install(FILES install(FILES data/operations/dataengineservice.operations DESTINATION ${PLASMA_DATA_INSTALL_DIR}/services) install(FILES data/operations/plasmoidservice.operations DESTINATION ${PLASMA_DATA_INSTALL_DIR}/services) install(FILES data/operations/storage.operations DESTINATION ${PLASMA_DATA_INSTALL_DIR}/services) -install(FILES data/notifications/plasmashell.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFY5RCDIR}) install(TARGETS KF5Plasma EXPORT KF5PlasmaTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/src/plasma/data/notifications/plasmashell.notifyrc b/src/plasma/data/notifications/plasmashell.notifyrc deleted file mode 100644 index 6af595f21..000000000 --- a/src/plasma/data/notifications/plasmashell.notifyrc +++ /dev/null @@ -1,122 +0,0 @@ -[Global] -IconName=plasma -Comment=Plasma Workspace -Comment[ca]=Espai de treball del Plasma -Comment[cs]=Pracovní plocha Plasma -Comment[da]=Plasma arbejdsområde -Comment[de]=Plasma-Arbeitsbereich -Comment[en_GB]=Plasma Workspace -Comment[es]=Espacio de trabajo Plasma -Comment[fi]=Plasma-työtila -Comment[gd]=Rum-obrach Plasma -Comment[gl]=Espazo de traballo de Plasma -Comment[it]=Spazio di lavoro Plasma -Comment[lt]=Plasma darbastalio erdvė -Comment[nl]=Plasma Workspace -Comment[pa]=ਪਲਾਜ਼ਮਾ ਵਰਕਸਪੇਸ -Comment[pl]=Przestrzeń robocza Plazmy -Comment[pt]=Área de Trabalho do Plasma -Comment[pt_BR]=Plasma Workspace -Comment[ru]=Рабочая среда Plasma -Comment[sk]=KDE pracovná plocha Plasma -Comment[sl]=Delovni prostor Plasma -Comment[sr]=Плазма радни простор -Comment[sr@ijekavian]=Плазма радни простор -Comment[sr@ijekavianlatin]=Plasma radni prostor -Comment[sr@latin]=Plasma radni prostor -Comment[sv]=Plasma arbetsområde -Comment[tr]=Plasma Çalışma Alanı -Comment[uk]=Робочий простір Плазми -Comment[x-test]=xxPlasma Workspacexx -Comment[zh_CN]=Plasma 工作空间 -Comment[zh_TW]=Plasma 工作空間 -Name=Plasma -Name[ca]=Plasma -Name[cs]=Plasma -Name[da]=Plasma -Name[de]=Plasma -Name[en_GB]=Plasma -Name[es]=Plasma -Name[fi]=Plasma -Name[gd]=Plasma -Name[gl]=Plasma -Name[it]=Plasma -Name[lt]=Plasma -Name[nl]=Plasma -Name[pa]=ਪਲਾਜ਼ਮਾ -Name[pl]=Plazma -Name[pt]=Plasma -Name[pt_BR]=Plasma -Name[ru]=Plasma -Name[sk]=Plasma -Name[sl]=Plasma -Name[sr]=Плазма -Name[sr@ijekavian]=Плазма -Name[sr@ijekavianlatin]=Plasma -Name[sr@latin]=Plasma -Name[sv]=Plasma -Name[tr]=Plazma -Name[uk]=Плазма -Name[x-test]=xxPlasmaxx -Name[zh_CN]=Plasma -Name[zh_TW]=Plasma - -[Event/plasmoidDeleted] -Name=Widget deleted -Name[ca]=Estri suprimit -Name[cs]=Widget byl smazán -Name[da]=Widget slettet -Name[de]=Miniprogramm wurde gelöscht -Name[en_GB]=Widget deleted -Name[es]=Elemento gráfico borrado -Name[fi]=Sovelma poistettu -Name[gd]=Widget air a sguabadh às -Name[gl]=Eliminouse o trebello -Name[it]=Widget eliminato -Name[nl]=Widget verwijderd -Name[pa]=ਵਿਦਜੈਟ ਹਟਾਇਆ -Name[pl]=Usunięto element interfejsu -Name[pt]=Elemento removido -Name[pt_BR]=Widget excluído -Name[ru]=Удаление виджета -Name[sk]=Widget vymazaný -Name[sl]=Gradnik izbrisan -Name[sr]=Виџет обрисан -Name[sr@ijekavian]=Виџет обрисан -Name[sr@ijekavianlatin]=Vidžet obrisan -Name[sr@latin]=Vidžet obrisan -Name[sv]=Grafisk komponent borttagen -Name[tr]=Uygulama silindi -Name[uk]=Вилучено віджет -Name[x-test]=xxWidget deletedxx -Name[zh_CN]=部件已删除 -Name[zh_TW]=元件已刪除 -Comment=A widget has been deleted -Comment[ca]=S'ha suprimit un estri -Comment[da]=En widget er blevet slettet -Comment[de]=Ein Miniprogramm wurde gelöscht -Comment[en_GB]=A widget has been deleted -Comment[es]=Se ha borrado un elemento gráfico -Comment[fi]=Sovelma on poistettu -Comment[gd]=Chaidh widget a sguabadh às -Comment[gl]=Eliminouse un trebello. -Comment[it]=Un widget è stato eliminato -Comment[nl]=Er is een widget verwijderd -Comment[pa]=ਵਿਦਜੈਟ ਨੂੰ ਹਟਾਇਆ ਜਾ ਚੁੱਕਾ ਹੈ -Comment[pl]=Element interfejsu został usunięty -Comment[pt]=Foi removido um elemento -Comment[pt_BR]=Um widget foi excluído -Comment[ru]=Виджет удалён -Comment[sk]=Widget bol vymazaný -Comment[sl]=Gradnik je bil izbrisan -Comment[sr]=Виџет је обрисан. -Comment[sr@ijekavian]=Виџет је обрисан. -Comment[sr@ijekavianlatin]=Vidžet je obrisan. -Comment[sr@latin]=Vidžet je obrisan. -Comment[sv]=En grafisk komponent har tagits bort -Comment[tr]=Bir uygulama silindi -Comment[uk]=Віджет було вилучено -Comment[x-test]=xxA widget has been deletedxx -Comment[zh_CN]=部件已删除 -Comment[zh_TW]=元件已刪除 -Action=Popup diff --git a/src/plasma/private/applet_p.cpp b/src/plasma/private/applet_p.cpp index 0e8f603f8..337924a6b 100644 --- a/src/plasma/private/applet_p.cpp +++ b/src/plasma/private/applet_p.cpp @@ -241,6 +241,8 @@ void AppletPrivate::askDestroy() //no parent, but it won't leak, since it will be closed both in case of timeout //or direct action deleteNotification = new KNotification("plasmoidDeleted", KNotification::Persistent, 0); + + deleteNotification->setComponentName("plasma_workspace"); QStringList actions; deleteNotification->setIconName(q->icon()); Plasma::Containment *asContainment = qobject_cast(q);