mate applet: fix configuring
We need to replace @libexec@, so first use configure_file() and then
feed the result to i18n.
While we are at it, also rename the files to end in .in as relevant.
This is a useful flag to indicate they need to be configured, and/or
how many times they need to be configured. def_file doesn't actually
change via i18n anyway, but ¯\_(ツ)_/¯ I assume it will eventually get
them.
Eli Schwartz authored 4 years ago
Michael Webster committed 4 years ago
| 29 | 29 |
conf.set('libexec', join_paths(get_option('prefix'), get_option('libexecdir')))
|
| 30 | 30 |
|
| 31 | 31 |
service_file = configure_file(
|
| 32 | |
input : 'org.mate.panel.applet.MateXAppStatusAppletFactory.service',
|
|
32 |
input : 'org.mate.panel.applet.MateXAppStatusAppletFactory.service.in',
|
| 33 | 33 |
output: 'org.mate.panel.applet.MateXAppStatusAppletFactory.service',
|
| 34 | 34 |
configuration: conf,
|
| 35 | 35 |
)
|
|
| 40 | 40 |
|
| 41 | 41 |
## Applet definition file
|
| 42 | 42 |
|
|
43 |
def_file = configure_file(
|
|
44 |
input: 'org.x.MateXAppStatusApplet.mate-panel-applet.in.in',
|
|
45 |
output: 'org.x.MateXAppStatusApplet.mate-panel-applet.in',
|
|
46 |
configuration: conf,
|
|
47 |
)
|
|
48 |
|
| 43 | 49 |
i18n.merge_file(
|
| 44 | |
input: 'org.x.MateXAppStatusApplet.mate-panel-applet.in',
|
|
50 |
input: def_file,
|
| 45 | 51 |
output: 'org.x.MateXAppStatusApplet.mate-panel-applet',
|
| 46 | 52 |
type: 'desktop',
|
| 47 | 53 |
po_dir: join_paths(meson.source_root(), 'po'),
|
status-applets/mate/org.mate.panel.applet.MateXAppStatusAppletFactory.service
less
more
| 0 | |
[D-BUS Service]
|
| 1 | |
Name=org.mate.panel.applet.MateXAppStatusAppletFactory
|
| 2 | |
Exec=@libexec@/xapps/mate-xapp-status-applet.py
|
|
0 |
[D-BUS Service]
|
|
1 |
Name=org.mate.panel.applet.MateXAppStatusAppletFactory
|
|
2 |
Exec=@libexec@/xapps/mate-xapp-status-applet.py
|
status-applets/mate/org.x.MateXAppStatusApplet.mate-panel-applet.in
less
more
| 0 | |
[Applet Factory]
|
| 1 | |
Id=MateXAppStatusAppletFactory
|
| 2 | |
InProcess=false
|
| 3 | |
Location=@libexec@/xapps/mate-xapp-status-applet.py
|
| 4 | |
Name=XApp Status Applet Factory
|
| 5 | |
Description=Area where XApp status icons appear
|
| 6 | |
|
| 7 | |
[MateXAppStatusApplet]
|
| 8 | |
Name=XApp Status Applet
|
| 9 | |
Description=Area where XApp status icons appear
|
| 10 | |
Icon=panel-applets
|
| 11 | |
MateComponentId=OAFIID:MATE_MateXAppStatusApplet;
|
| 12 | |
|
|
0 |
[Applet Factory]
|
|
1 |
Id=MateXAppStatusAppletFactory
|
|
2 |
InProcess=false
|
|
3 |
Location=@libexec@/xapps/mate-xapp-status-applet.py
|
|
4 |
Name=XApp Status Applet Factory
|
|
5 |
Description=Area where XApp status icons appear
|
|
6 |
|
|
7 |
[MateXAppStatusApplet]
|
|
8 |
Name=XApp Status Applet
|
|
9 |
Description=Area where XApp status icons appear
|
|
10 |
Icon=panel-applets
|
|
11 |
MateComponentId=OAFIID:MATE_MateXAppStatusApplet;
|
|
12 |
|