diff --git a/bluetooth1/obex_agent.go b/bluetooth1/obex_agent.go index e787189f1..e991007af 100644 --- a/bluetooth1/obex_agent.go +++ b/bluetooth1/obex_agent.go @@ -455,11 +455,12 @@ func (a *obexAgent) notifyProgress(notify notifications.Notifications, replaceID logger.Warning("failed to send notify:", err) } } else { + notify.CloseNotification(0, replaceID) actions = []string{"_view", gettext.Tr("View")} hints := map[string]dbus.Variant{"x-deepin-action-_view": dbus.MakeVariant("dde-file-manager,--show-item," + filename)} notifyID, err = notify.Notify(0, gettext.Tr("dde-control-center"), - replaceID, + 0, notifyIconBluetoothConnected, fmt.Sprintf(gettext.Tr("You have received files from %q successfully"), device), gettext.Tr("Done"), @@ -484,9 +485,10 @@ func (a *obexAgent) notifyFailed(notify notifications.Notifications, replaceID u body = gettext.Tr("Bluetooth connection failed") } + notify.CloseNotification(0, replaceID) notifyID, err := notify.Notify(0, gettext.Tr("dde-control-center"), - replaceID, + 0, notifyIconBluetoothConnectFailed, summary, body, diff --git a/misc/services/org.deepin.dde.SoundEffect1.service b/misc/services/org.deepin.dde.SoundEffect1.service index a135253af..bb11bc3e9 100644 --- a/misc/services/org.deepin.dde.SoundEffect1.service +++ b/misc/services/org.deepin.dde.SoundEffect1.service @@ -1,3 +1,4 @@ [D-BUS Service] Name=org.deepin.dde.SoundEffect1 -Exec=/usr/lib/deepin-daemon/soundeffect +Exec=/bin/false +SystemdService=org.deepin.dde.SoundEffect1.service diff --git a/misc/systemd/services/user/org.deepin.dde.SoundEffect1.service b/misc/systemd/services/user/org.deepin.dde.SoundEffect1.service new file mode 100644 index 000000000..2da02ed15 --- /dev/null +++ b/misc/systemd/services/user/org.deepin.dde.SoundEffect1.service @@ -0,0 +1,16 @@ +[Unit] +Description=Deepin Sound Effect Service +RefuseManualStart=no +RefuseManualStop=no +CollectMode=inactive-or-failed + +PartOf=graphical-session.target +After=dbus.service + +[Service] +Type=dbus +BusName=org.deepin.dde.SoundEffect1 +ExecStart=/usr/lib/deepin-daemon/soundeffect +Slice=session.slice +Restart=on-failure +RestartSec=1s