Ticket #489: 0002-Make-.desktop-and-.policy-file-in-src-daemon-transla.patch

File 0002-Make-.desktop-and-.policy-file-in-src-daemon-transla.patch, 5.0 KB (added by kelemeng, 3 years ago)

Second patch to make the files translatable

  • po/POTFILES.in 

    From 5c139d9f980b310b9cf4beb3a784b90182af58b3 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Kelemen=20G=C3=A1bor?= <gabor@shaihulud.(none)>
Date: Sat, 21 Feb 2009 21:14:56 +0100
Subject: [PATCH] Make .desktop and .policy file in src/daemon translatable

---
 po/POTFILES.in                   |    2 +
 src/Makefile.am                  |   17 ++++++++----
 src/daemon/org.pulseaudio.policy |   50 --------------------------------------
 src/daemon/pulseaudio.desktop    |   10 -------
 4 files changed, 13 insertions(+), 66 deletions(-)
 delete mode 100644 src/daemon/org.pulseaudio.policy
 delete mode 100644 src/daemon/pulseaudio.desktop

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 324b946..0d5b42f 100644
    a b  
    155155src/daemon/dumpmodules.c 
    156156src/daemon/daemon-conf.c 
    157157src/daemon/caps.c 
     158src/daemon/pulseaudio.desktop.in 
     159src/daemon/org.pulseaudio.policy.in 
    158160src/pulse/channelmap.c 
    159161src/pulse/error.c 
    160162src/pulse/proplist.c 

  • src/Makefile.am 

    diff --git a/src/Makefile.am b/src/Makefile.am
index 46c3d2e..4b467f8 100644
    a b  
    105105        daemon/start-pulseaudio-x11.in \ 
    106106        utils/padsp \ 
    107107        modules/module-defs.h.m4 \ 
    108         daemon/pulseaudio.desktop \ 
     108        daemon/pulseaudio.desktop.in \ 
    109109        map-file \ 
    110         daemon/org.pulseaudio.policy 
     110        daemon/org.pulseaudio.policy.in 
    111111 
    112112pulseconf_DATA = \ 
    113113        default.pa \ 
    … …  
    116116        client.conf 
    117117 
    118118if HAVE_X11 
    119 xdgautostart_DATA = \ 
    120         daemon/pulseaudio.desktop 
     119xdgautostart_in_files = \ 
     120        daemon/pulseaudio.desktop.in 
    121121endif 
     122xdgautostart_DATA = $(xdgautostart_in_files:.desktop.in=.desktop) 
     123@INTLTOOL_DESKTOP_RULE@ 
     124 
    122125 
    123126BUILT_SOURCES = \ 
    124127        pulse/version.h 
    … …  
    156159endif 
    157160 
    158161if HAVE_POLKIT 
    159 policy_DATA = daemon/org.pulseaudio.policy 
     162policy_in_files = daemon/org.pulseaudio.policy.in 
     163policy_DATA = $(policy_in_files:.policy.in=.policy) 
     164@INTLTOOL_POLICY_RULE@ 
    160165 
    161166pulseaudio_SOURCES += daemon/polkit.c daemon/polkit.h 
    162167pulseaudio_CFLAGS += $(POLKIT_CFLAGS) 
    … …  
    15431548    chown root $^ 
    15441549    chmod u+s $^ 
    15451550 
    1546 CLEANFILES = esdcompat client.conf default.pa system.pa daemon.conf start-pulseaudio-x11 
     1551CLEANFILES = esdcompat client.conf default.pa system.pa daemon.conf start-pulseaudio-x11 daemon/pulseaudio.desktop daemon/org.pulseaudio.policy 
    15471552 
    15481553esdcompat: daemon/esdcompat.in Makefile 
    15491554    sed -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \ 

  • (a) a/src/daemon/org.pulseaudio.policy vs. (b) /dev/null 

    diff --git a/src/daemon/org.pulseaudio.policy b/src/daemon/org.pulseaudio.policy
deleted file mode 100644
index 6cdeec6..0000000
    a b  
    1 <?xml version="1.0" encoding="UTF-8"?><!--*-nxml-*--> 
    2 <!DOCTYPE policyconfig PUBLIC 
    3  "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN" 
    4  "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd"> 
    5  
    6 <!-- 
    7 This file is part of PulseAudio. 
    8  
    9 PulseAudio is free software; you can redistribute it and/or modify it 
    10 under the terms of the GNU Lesser General Public License as 
    11 published by the Free Software Foundation; either version 2.1 of the 
    12 License, or (at your option) any later version. 
    13  
    14 PulseAudio is distributed in the hope that it will be useful, but WITHOUT 
    15 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 
    16 or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General 
    17 Public License for more details. 
    18  
    19 You should have received a copy of the GNU Lesser General Public 
    20 License along with PulseAudio; if not, write to the Free Software 
    21 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 
    22 USA. 
    23 --> 
    24  
    25 <policyconfig> 
    26   <vendor>The PulseAudio Project</vendor> 
    27   <vendor_url>http://pulseaudio.org/</vendor_url> 
    28   <icon_name>audio-card</icon_name> 
    29  
    30   <action id="org.pulseaudio.acquire-real-time"> 
    31     <description>Real-time scheduling for the PulseAudio daemon</description> 
    32     <message>System policy prevents PulseAudio from acquiring real-time scheduling.</message> 
    33     <defaults> 
    34       <allow_any>no</allow_any> 
    35       <allow_inactive>no</allow_inactive> 
    36       <allow_active>no</allow_active> 
    37     </defaults> 
    38   </action> 
    39  
    40   <action id="org.pulseaudio.acquire-high-priority"> 
    41     <description>High-priority scheduling (negative Unix nice level) for the PulseAudio daemon</description> 
    42     <message>System policy prevents PulseAudio from acquiring high-priority scheduling.</message> 
    43     <defaults> 
    44       <allow_any>no</allow_any> 
    45       <allow_inactive>no</allow_inactive> 
    46       <allow_active>no</allow_active> 
    47     </defaults> 
    48   </action> 
    49  
    50 </policyconfig> 

  • (a) a/src/daemon/pulseaudio.desktop vs. (b) /dev/null 

    diff --git a/src/daemon/pulseaudio.desktop b/src/daemon/pulseaudio.desktop
deleted file mode 100644
index 57a7a6e..0000000
    a b  
    1 [Desktop Entry] 
    2 Version=1.0 
    3 Encoding=UTF-8 
    4 Name=PulseAudio Sound System 
    5 Comment=Start the PulseAudio Sound System 
    6 Exec=start-pulseaudio-x11 
    7 Terminal=false 
    8 Type=Application 
    9 Categories= 
    10 GenericName=