[gnome-bluetooth/wip/inigomartinez/meson: 3/3] build: Migrated from Intltool to Gettext

[Iñigo Martínez <inigomartinez src gnome org>]

commit 270e385a728b5a68824e15498b840ff18b0393e6
Author: Iñigo Martínez <inigomartinez gmail com>
Date:   Wed Aug 2 18:03:26 2017 +0200

    build: Migrated from Intltool to Gettext

 meson.build                           |    3 ---
 po/POTFILES.in                        |    4 ++--
 sendto/bluetooth-sendto.desktop.in.in |    4 ++--
 sendto/meson.build                    |   15 ++++++++-------
 4 files changed, 12 insertions(+), 14 deletions(-)
---
diff --git a/meson.build b/meson.build
index 78880ab..496a267 100644
--- a/meson.build
+++ b/meson.build
@@ -163,9 +163,6 @@ pkg = import('pkgconfig')
 
 po_dir = join_paths(meson.source_root(), 'po')
 
-intltool_merge = find_program('intltool-merge')
-intltool_cache = join_paths(po_dir, '.intltool-merge-cache')
-
 top_inc = include_directories('.')
 
 subdir('icons')
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ca0b6e3..ffdf6a1 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -5,10 +5,10 @@ lib/bluetooth-client.c
 lib/bluetooth-filter-widget.c
 lib/bluetooth-pairing-dialog.c
 lib/bluetooth-settings-row.c
-[type: gettext/glade]lib/bluetooth-settings-row.ui
+lib/bluetooth-settings-row.ui
 lib/bluetooth-settings-widget.c
 lib/bluetooth-settings-obexpush.c
 lib/bluetooth-utils.c
-[type: gettext/glade]lib/settings.ui
+lib/settings.ui
 sendto/bluetooth-sendto.desktop.in.in
 sendto/main.c
diff --git a/sendto/bluetooth-sendto.desktop.in.in b/sendto/bluetooth-sendto.desktop.in.in
index 810de89..a4ae002 100644
--- a/sendto/bluetooth-sendto.desktop.in.in
+++ b/sendto/bluetooth-sendto.desktop.in.in
@@ -1,6 +1,6 @@
 [Desktop Entry]
-_Name=Bluetooth Transfer
-_Comment=Send files via Bluetooth
+Name=Bluetooth Transfer
+Comment=Send files via Bluetooth
 Icon=bluetooth
 Exec=bluetooth-sendto
 Terminal=false
diff --git a/sendto/meson.build b/sendto/meson.build
index de65c2a..bf4f816 100644
--- a/sendto/meson.build
+++ b/sendto/meson.build
@@ -33,19 +33,20 @@ install_man(
 desktop_conf = configuration_data()
 desktop_conf.set('VERSION', gnomebt_version)
 
-desktop_name = name + '.desktop'
+desktop = name + '.desktop'
 
 desktop_in = configure_file(
-  input: desktop_name + '.in.in',
-  output: desktop_name + '.in',
+  input: desktop + '.in.in',
+  output: desktop + '.in',
   configuration: desktop_conf
 )
 
-custom_target(
-  desktop_name,
+i18n.merge_file (
+  desktop,
+  type: 'desktop',
   input: desktop_in,
-  output: desktop_name,
-  command: [intltool_merge, '-d', '-u', '-c', intltool_cache, po_dir, '@INPUT@', '@OUTPUT@'],
+  output: desktop,
+  po_dir: po_dir,
   install: true,
   install_dir: join_paths(gnomebt_datadir, 'applications')
 )