diff options
| -rw-r--r-- | po/POTFILES.in | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 17 | ||||
| -rw-r--r-- | src/daemon/org.pulseaudio.policy | 50 | ||||
| -rw-r--r-- | src/daemon/pulseaudio.desktop | 10 |
4 files changed, 13 insertions, 66 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in index 324b9460..0d5b42fb 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -155,6 +155,8 @@ src/daemon/cmdline.c src/daemon/dumpmodules.c src/daemon/daemon-conf.c src/daemon/caps.c +src/daemon/pulseaudio.desktop.in +src/daemon/org.pulseaudio.policy.in src/pulse/channelmap.c src/pulse/error.c src/pulse/proplist.c diff --git a/src/Makefile.am b/src/Makefile.am index 46c3d2ee..4b467f8f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -105,9 +105,9 @@ EXTRA_DIST = \ daemon/start-pulseaudio-x11.in \ utils/padsp \ modules/module-defs.h.m4 \ - daemon/pulseaudio.desktop \ + daemon/pulseaudio.desktop.in \ map-file \ - daemon/org.pulseaudio.policy + daemon/org.pulseaudio.policy.in pulseconf_DATA = \ default.pa \ @@ -116,9 +116,12 @@ pulseconf_DATA = \ client.conf if HAVE_X11 -xdgautostart_DATA = \ - daemon/pulseaudio.desktop +xdgautostart_in_files = \ + daemon/pulseaudio.desktop.in endif +xdgautostart_DATA = $(xdgautostart_in_files:.desktop.in=.desktop) +@INTLTOOL_DESKTOP_RULE@ + BUILT_SOURCES = \ pulse/version.h @@ -156,7 +159,9 @@ pulseaudio_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) -dlopen force $(foreach f,$(PRE endif if HAVE_POLKIT -policy_DATA = daemon/org.pulseaudio.policy +policy_in_files = daemon/org.pulseaudio.policy.in +policy_DATA = $(policy_in_files:.policy.in=.policy) +@INTLTOOL_POLICY_RULE@ pulseaudio_SOURCES += daemon/polkit.c daemon/polkit.h pulseaudio_CFLAGS += $(POLKIT_CFLAGS) @@ -1543,7 +1548,7 @@ suid: pulseaudio .libs/lt-pulseaudio chown root $^ chmod u+s $^ -CLEANFILES = esdcompat client.conf default.pa system.pa daemon.conf start-pulseaudio-x11 +CLEANFILES = esdcompat client.conf default.pa system.pa daemon.conf start-pulseaudio-x11 daemon/pulseaudio.desktop daemon/org.pulseaudio.policy esdcompat: daemon/esdcompat.in Makefile sed -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \ diff --git a/src/daemon/org.pulseaudio.policy b/src/daemon/org.pulseaudio.policy deleted file mode 100644 index 6cdeec68..00000000 --- a/src/daemon/org.pulseaudio.policy +++ /dev/null @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?><!--*-nxml-*--> -<!DOCTYPE policyconfig PUBLIC - "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN" - "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd"> - -<!-- -This file is part of PulseAudio. - -PulseAudio is free software; you can redistribute it and/or modify it -under the terms of the GNU Lesser General Public License as -published by the Free Software Foundation; either version 2.1 of the -License, or (at your option) any later version. - -PulseAudio is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General -Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with PulseAudio; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -USA. ---> - -<policyconfig> - <vendor>The PulseAudio Project</vendor> - <vendor_url>http://pulseaudio.org/</vendor_url> - <icon_name>audio-card</icon_name> - - <action id="org.pulseaudio.acquire-real-time"> - <description>Real-time scheduling for the PulseAudio daemon</description> - <message>System policy prevents PulseAudio from acquiring real-time scheduling.</message> - <defaults> - <allow_any>no</allow_any> - <allow_inactive>no</allow_inactive> - <allow_active>no</allow_active> - </defaults> - </action> - - <action id="org.pulseaudio.acquire-high-priority"> - <description>High-priority scheduling (negative Unix nice level) for the PulseAudio daemon</description> - <message>System policy prevents PulseAudio from acquiring high-priority scheduling.</message> - <defaults> - <allow_any>no</allow_any> - <allow_inactive>no</allow_inactive> - <allow_active>no</allow_active> - </defaults> - </action> - -</policyconfig> diff --git a/src/daemon/pulseaudio.desktop b/src/daemon/pulseaudio.desktop deleted file mode 100644 index 57a7a6e4..00000000 --- a/src/daemon/pulseaudio.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Version=1.0 -Encoding=UTF-8 -Name=PulseAudio Sound System -Comment=Start the PulseAudio Sound System -Exec=start-pulseaudio-x11 -Terminal=false -Type=Application -Categories= -GenericName= |