Branch: master

f8035fe9 2015-09-21 16:04:55 Timothy Pearson
Add desktop files and autostart file for hwdevicetray
A kcontrol/hwmanager/hwdevicetray-autostart.desktop
A kcontrol/hwmanager/hwdevicetray.desktop
diff --git a/kcontrol/hwmanager/hwdevicetray-autostart.desktop b/kcontrol/hwmanager/hwdevicetray-autostart.desktop
new file mode 100644
index 0000000..57bd9b8
--- /dev/null
+++ b/kcontrol/hwmanager/hwdevicetray-autostart.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=tdehwdevicetray
+GenericName=Hardware Device Monitor
+Comment=Monitor hardware devices from the system tray
+Exec=tdehwdevicetray
+Icon=kcmdevices
+X-TDE-autostart-after=panel
+X-TDE-StartupNotify=false
+X-TDE-UniqueApplet=true
+X-TDE-autostart-condition=tdehwdevicetrayrc:General:Autostart:true
+Categories=System;Applet;
diff --git a/kcontrol/hwmanager/hwdevicetray.desktop b/kcontrol/hwmanager/hwdevicetray.desktop
new file mode 100644
index 0000000..20a0297
--- /dev/null
+++ b/kcontrol/hwmanager/hwdevicetray.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=tdehwdevicetray
+GenericName=Hardware Device Monitor
+Comment=Monitor hardware devices from the system tray
+Exec=tdehwdevicetray
+Icon=kcmdevices
+Type=Application
+OnlyShowIn=TDE;
+Categories=Qt;TDE;System;
+X-DocPath=tdehwdevicetray/index.html
7e9c0a99 2015-09-21 16:05:28 Timothy Pearson
Disable autoplay popups by default as the new tdehwdevicetray application will handle notification and autoplay popup initiation
M tdeioslave/media/mediamanager/tdehardwarebackend.cpp
diff --git a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
index 5846e00..edfa9fe 100644
--- a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
+++ b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
@@ -150,7 +150,7 @@
 	bool allowDialogNotification = allowNotification;
 	TDEConfig config("mediamanagerrc");
 	config.setGroup("Global");
-	if (!config.readBoolEntry("NotificationPopupsEnabled", true)) {
+	if (!config.readBoolEntry("NotificationPopupsEnabled", false)) {
 		allowDialogNotification = false;
 	}