Codebase list xapp / 28239cf
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 3 years ago Michael Webster committed 3 years ago
5 changed file(s) with 24 addition(s) and 18 deletion(s). Raw diff Collapse all Expand all
2929 conf.set('libexec', join_paths(get_option('prefix'), get_option('libexecdir')))
3030
3131 service_file = configure_file(
32 input : 'org.mate.panel.applet.MateXAppStatusAppletFactory.service',
32 input : 'org.mate.panel.applet.MateXAppStatusAppletFactory.service.in',
3333 output: 'org.mate.panel.applet.MateXAppStatusAppletFactory.service',
3434 configuration: conf,
3535 )
4040
4141 ## Applet definition file
4242
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
4349 i18n.merge_file(
44 input: 'org.x.MateXAppStatusApplet.mate-panel-applet.in',
50 input: def_file,
4551 output: 'org.x.MateXAppStatusApplet.mate-panel-applet',
4652 type: 'desktop',
4753 po_dir: join_paths(meson.source_root(), 'po'),
+0
-3
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
+0
-13
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