From kde-panel-devel  Tue Jun 21 16:26:30 2011
From: =?utf-8?q?Sebastian_K=C3=BCgler?= <sebas () kde ! org>
Date: Tue, 21 Jun 2011 16:26:30 +0000
To: kde-panel-devel
Subject: =?utf-8?q?=5Bplasma-mobile=5D_applets/notifications=3A_fix_deskt?=
Message-Id: <20110621162630.2FB06A60A6 () git ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-panel-devel&m=130867363720524

Git commit fc4c51a5b7479b876f492b873800c70d4beb4d06 by Sebastian Kügler.
Committed on 21/06/2011 at 18:25.
Pushed by sebas into branch 'master'.

fix desktop file overwrite notifications from kde-workspace

The .desktop file installed overwrites the .desktop file for
notifications that is installed from kde-workspace. We rename this file
and make them co-installable.

CCMAIL:bettio@kde.org
CCMAIL:plasma-devel@kde.org

M  +1    -1    applets/notifications/CMakeLists.txt     
A  +38   -0    applets/notifications/plasma-applet-mobilenotifications.desktop     
D  +0    -38   applets/notifications/plasma-applet-notifications.desktop     

http://commits.kde.org/plasma-mobile/fc4c51a5b7479b876f492b873800c70d4beb4d06

diff --git a/applets/notifications/CMakeLists.txt b/applets/notifications/CMakeLists.txt
index 550bbcd..3302e54 100644
--- a/applets/notifications/CMakeLists.txt
+++ b/applets/notifications/CMakeLists.txt
@@ -4,5 +4,5 @@ install(DIRECTORY package/
         DESTINATION ${DATA_INSTALL_DIR}/plasma/plasmoids/org.kde.mobile.notifications
         PATTERN .svn EXCLUDE)
 
-install(FILES plasma-applet-notifications.desktop
+install(FILES plasma-applet-mobilenotifications.desktop
         DESTINATION ${SERVICES_INSTALL_DIR})
diff --git a/applets/notifications/plasma-applet-mobilenotifications.desktop b/applets/notifications/plasma-applet-mobilenotifications.desktop
new file mode 100644
index 0000000..b95db97
--- /dev/null
+++ b/applets/notifications/plasma-applet-mobilenotifications.desktop
@@ -0,0 +1,38 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Notifications
+Name[et]=Märguanded
+Name[km]=ការ​ជូនដំណឹង
+Name[nl]=Meldingen
+Name[pt]=Notificações
+Name[pt_BR]=Notificações
+Name[sv]=Underrättelser
+Name[ug]=ئۇقتۇرۇشلار
+Name[uk]=Сповіщення
+Name[x-test]=xxNotificationsxx
+Comment=Notifications
+Comment[et]=Märguanded
+Comment[km]=ការ​ជូនដំណឹង
+Comment[nl]=Meldingen
+Comment[pt]=Notificações
+Comment[pt_BR]=Notificações
+Comment[sv]=Underrättelser
+Comment[ug]=ئۇقتۇرۇشلار
+Comment[uk]=Сповіщення
+Comment[x-test]=xxNotificationsxx
+
+Type=Service
+Icon=notifications
+X-KDE-ParentApp=
+X-KDE-PluginInfo-Author=Davide Bettio
+X-KDE-PluginInfo-Category=Tasks
+X-KDE-PluginInfo-Email=davide.bettio@kdemail.net
+X-KDE-PluginInfo-License=GPL
+X-KDE-PluginInfo-Name=org.kde.mobile.notifications
+X-KDE-PluginInfo-Version=0.1
+X-KDE-PluginInfo-Website=http://plasma.kde.org/
+X-KDE-ServiceTypes=Plasma/Applet,Plasma/PopupApplet
+X-Plasma-API=declarativeappletscript
+X-Plasma-DefaultSize=100,100
+X-Plasma-MainScript=code/Notifications.qml
+X-Plasma-RemoteLocation=
diff --git a/applets/notifications/plasma-applet-notifications.desktop b/applets/notifications/plasma-applet-notifications.desktop
deleted file mode 100644
index b95db97..0000000
--- a/applets/notifications/plasma-applet-notifications.desktop
+++ /dev/null
@@ -1,38 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Notifications
-Name[et]=Märguanded
-Name[km]=ការ​ជូនដំណឹង
-Name[nl]=Meldingen
-Name[pt]=Notificações
-Name[pt_BR]=Notificações
-Name[sv]=Underrättelser
-Name[ug]=ئۇقتۇرۇشلار
-Name[uk]=Сповіщення
-Name[x-test]=xxNotificationsxx
-Comment=Notifications
-Comment[et]=Märguanded
-Comment[km]=ការ​ជូនដំណឹង
-Comment[nl]=Meldingen
-Comment[pt]=Notificações
-Comment[pt_BR]=Notificações
-Comment[sv]=Underrättelser
-Comment[ug]=ئۇقتۇرۇشلار
-Comment[uk]=Сповіщення
-Comment[x-test]=xxNotificationsxx
-
-Type=Service
-Icon=notifications
-X-KDE-ParentApp=
-X-KDE-PluginInfo-Author=Davide Bettio
-X-KDE-PluginInfo-Category=Tasks
-X-KDE-PluginInfo-Email=davide.bettio@kdemail.net
-X-KDE-PluginInfo-License=GPL
-X-KDE-PluginInfo-Name=org.kde.mobile.notifications
-X-KDE-PluginInfo-Version=0.1
-X-KDE-PluginInfo-Website=http://plasma.kde.org/
-X-KDE-ServiceTypes=Plasma/Applet,Plasma/PopupApplet
-X-Plasma-API=declarativeappletscript
-X-Plasma-DefaultSize=100,100
-X-Plasma-MainScript=code/Notifications.qml
-X-Plasma-RemoteLocation=

_______________________________________________
Plasma-devel mailing list
Plasma-devel@kde.org
https://mail.kde.org/mailman/listinfo/plasma-devel