diff options
author | Richard Farina <zerochaos@gentoo.org> | 2014-05-05 08:22:49 +0000 |
---|---|---|
committer | Richard Farina <zerochaos@gentoo.org> | 2014-05-05 08:22:49 +0000 |
commit | 071d5a1470cbb336e1ff72f2ca4fa8c5e859028f (patch) | |
tree | d1454f6cb6687fb7fbd3e8980943b28c7ae258fd /net-wireless | |
parent | Version bump (diff) | |
download | historical-071d5a1470cbb336e1ff72f2ca4fa8c5e859028f.tar.gz historical-071d5a1470cbb336e1ff72f2ca4fa8c5e859028f.tar.bz2 historical-071d5a1470cbb336e1ff72f2ca4fa8c5e859028f.zip |
initial commit of 9999 ebuild with bluez5 support, if we like it, we can snapshot
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xDD11F94A
Diffstat (limited to 'net-wireless')
-rw-r--r-- | net-wireless/blueman/ChangeLog | 10 | ||||
-rw-r--r-- | net-wireless/blueman/Manifest | 35 | ||||
-rw-r--r-- | net-wireless/blueman/blueman-9999.ebuild | 108 | ||||
-rw-r--r-- | net-wireless/blueman/files/blueman-9999-plugins-conf-file.patch | 30 | ||||
-rw-r--r-- | net-wireless/blueman/files/blueman-9999-set-codeset-for-gettext-to-UTF-8-always.patch | 241 |
5 files changed, 406 insertions, 18 deletions
diff --git a/net-wireless/blueman/ChangeLog b/net-wireless/blueman/ChangeLog index 0b8719718173..9f3f93175b83 100644 --- a/net-wireless/blueman/ChangeLog +++ b/net-wireless/blueman/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-wireless/blueman # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/ChangeLog,v 1.17 2014/02/18 18:35:17 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/ChangeLog,v 1.18 2014/05/05 08:22:45 zerochaos Exp $ + +*blueman-9999 (05 May 2014) + + 05 May 2014; Rick Farina <zerochaos@gentoo.org> +blueman-9999.ebuild, + +files/blueman-9999-plugins-conf-file.patch, + +files/blueman-9999-set-codeset-for-gettext-to-UTF-8-always.patch: + initial commit of 9999 ebuild with bluez5 support, if we like it, we can + snapshot 18 Feb 2014; Michał Górny <mgorny@gentoo.org> blueman-1.21-r1.ebuild, blueman-1.23-r1.ebuild, blueman-1.23-r2.ebuild, blueman-1.23.ebuild: diff --git a/net-wireless/blueman/Manifest b/net-wireless/blueman/Manifest index 7b5dba828241..d1f16c1a33e2 100644 --- a/net-wireless/blueman/Manifest +++ b/net-wireless/blueman/Manifest @@ -1,33 +1,34 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA512 AUX blueman-1.23-fix-broken-status-icon.patch 1174 SHA256 b6fe3d426d90e2d212a005aaa7bae2f800bb69df407aa90058f7b1029ba7c296 SHA512 7afae388631e8899f32d1e8bbb313ecd3333103a6b2640c0bd200122b4707b6393f8cb40a3d0b13d3293ed14fc64e7206276a9cac4ed932464cced1cb03f1b64 WHIRLPOOL 86ad052cff290eb1f00e04d8ef5aa087e463a82daf327e9fe7ac368d111430b172b2ad00c048be50e64640275ed1984b61d0d68781daf4198a018fccbe17ae3e AUX blueman-1.23-plugins-conf-file.patch 988 SHA256 58132546cf913af396d189503e7e3aee53d6e626486343757169b6f0ec34d913 SHA512 3016a3a9c29fe65b7482091571f8aa6b49f21ea72181a9c7e559943347957c7554a72df4022c43d41ee4f4a10be82a011a9f1918191616acee8587fb0aa3a00a WHIRLPOOL d649ec459310b108eec4f95c68647f53454a4a69aa7ab24baf262c79e1398cc9be593f59e9b61cc7e56afd1175c2c8aa181db7e13a53b25589a2be5b725b0b11 AUX blueman-1.23-set-codeset-for-gettext-to-UTF-8-always.patch 9343 SHA256 6d2cd72f41fc054f023dfeb894bb4049441fc01e6e0f936120603021c305bbcc SHA512 0f264599331b518ce5c6573324fffad9b202b66c993284d907db38b6736a25f3d62d38973ac78adb542381bd0c8d09d710612ba0f373f0ba9153d70fbacb6302 WHIRLPOOL 1e29293f77b919cad790e43391231bee07304d938d44b981a67fd806a392547c8b1c426debf881a0cebb9c0df37e4d43bd97ef237ca76a5d23613e05b20a9096 +AUX blueman-9999-plugins-conf-file.patch 1083 SHA256 a97c052b107beaf1c6615f47809ce08c5bd2c0cb1d2096f61f47c3bdb25af654 SHA512 4500b68061fda3672f2261d8035acbd6a3623d5c3d6836a6e06fb3c4c81f8143fc1ad14ee3109fb159aef8e980f494593fdc3a904294d17309d9ad2e0d6ce0b5 WHIRLPOOL b9d5f52a35ec6fd2cfef9b06ff98b3834946412859b30d187f598c883eb8ad235276f60b6cc3cc507c456fd753467f354dc47fd70bf717cce6983d0406920b5c +AUX blueman-9999-set-codeset-for-gettext-to-UTF-8-always.patch 8717 SHA256 91f6351614a8bdbb51155399f77c384a86407deb609c9e7bb61ffac17a56d81d SHA512 524afc7729564b5355f38648840b783426cf5aeaffd1bf157f725100b780d35b7524bc81144d3453e34683ea9f7af6982176d45b4488c8176c10224f74452f4d WHIRLPOOL ed053972b26a018276c221a51893bc0b1ab7b2b15e3900905444cfce03a41dd5eade845cd3e4ce3511ebf724e5a1c4e9dbd1f5024518ad8834fa2779bd1253a1 DIST blueman-1.21.tar.gz 1086099 SHA256 86200dab50b1595c9a9537586c07de90ccfa084b954bb74f3e8732cc000fe3af DIST blueman-1.23.tar.gz 1223094 SHA256 50b261bcdc2e99e176c7c194825da1259500aaacaccb92714d97af0209a4f011 SHA512 529a43dace73bf362baac69404a9e87d14f5bcb7b07b18194434c7a6c1dbc22f8fecdb4923c92a77b65656405a492b9e147e77cb7a161df4a93e8b78a003eba7 WHIRLPOOL 4070b4d86cbe743278730e4ee3022bcfdea590b5b76e545cc67912a3498de993ed0c62cb67ac2cd3ad3b8e3c17c5d5a8b1f8fa6e214234a64a784146c6d6d542 EBUILD blueman-1.21-r1.ebuild 2119 SHA256 92582c07555ece8c7f8f93303d7f4434401b4428b1fce1f732cedd5c95218c97 SHA512 8772d077ada5dd05a9239b25ec9b954c8416892e03f02e09a9d5b86ba6c45d5d3716da0d2e4a512db89736f743e8ece1842c756600e3a930ca90df9f088784de WHIRLPOOL a774163d1b4e2818de848d426e464e0a797deea064c8bf3d32bd8e2dd7d264e8875719092cb6921dbaf8db3e443a49d322f2ce19d958926023e50a4b8d5c49fa EBUILD blueman-1.23-r1.ebuild 2396 SHA256 a321d87cc701cba2e0c1b65cf0842c37537491e4ad49f10aef6a0e3be30a3baf SHA512 cecdc9cea81aa7b7610af1f4a0fb20778a7d8f598f710505cb4bf91cbf8df40a6875e4663ae989db7de65d132d0c838276d9090a840ba9f45edb95499ed439a0 WHIRLPOOL 3219f874b6ca9aaa6af9caf923ae54d6f14379215d5da540e60972d4d3c1f6ef6715b6ca40576a6d24a306ad4d4a6ccbb2a44998a2bc690d0bd356f2a7bb2719 EBUILD blueman-1.23-r2.ebuild 2490 SHA256 92e390db1c81b2154eadde0e35abe2175f78e375091f7850a4a3219f9820cfab SHA512 fce40c96a687d75fbeb738feab50b768066a4323a0e560e55558c094036c82a52c1a8c9f1a5c633d988038387d2a4ae3257208c22522048adc1822fd51ce582c WHIRLPOOL 8f40caa4d2898babed50fab254dc4f3daad6c5960765ed52494117bc9865e9036e4e97b94c14d67332db427981e6a07558900ea576d31bce30f723fa7427a858 EBUILD blueman-1.23.ebuild 2320 SHA256 aa5c1bd87d4849767f93c2e83b7eeb97cdf399008182bf24eeccdfdf28115394 SHA512 86d193f87c2c542b13e62e2322c68be621c52f011ab3c2adbb20f055cda71ae80301210157cd4fbbfb8b0a10e45ca77c5ca16432db60d60937e9b6296d355884 WHIRLPOOL 13e0c84cc9fb3ab9f1fbe6544f77200bb5fe3ed59af1fa369c135ee9f86df9780e4c27e5193611b47b766364300a678900b84983acee7eb1430ba6dd5dffb304 -MISC ChangeLog 3634 SHA256 5a4d53a4477eafe6b4fbb6a2025ff9fa2498a4ee900c829fee9c5aa0c4e955fd SHA512 7ba396fa0d8247c37719db8071640d2bd3f4c5b466641aa2e2888c0350176f3776705e0dc2f2302c7b915dfddc9759baa1844851745e3f315216363617e0a627 WHIRLPOOL a36b446e94f3f635bb4209696c737b2cf5e297cff3f2186a8ca8cb89fdb22613b0572d8c8570f343a42b01dfe8720f7a07489f81490dfe122224b80105694e15 +EBUILD blueman-9999.ebuild 2617 SHA256 d3a0129d3cedcfed2fa39fa004a1d5d25276267ca56dcf8ace25a44557833750 SHA512 444c1c158d7b3f07a91d5926bf4dc8909520b630a7fdf7dd41e456be75dec0eaba3216d6357aa095eb0f10674ecb8fbb04abe9f51f0bfe26e4c05b59784ef2ad WHIRLPOOL c2503db6cc76b5fc557099f0dc6ef80fd23eab91b2480c3e9188ad18357b85e5cbf2c010f37d8b0ad6073d02a83d588e8816c55b3643d416c8924dc3de8326e9 +MISC ChangeLog 3941 SHA256 85189a002534d0930b29cfa90cb48bab137ddbfa8f6102856f98cd0e542c6dbf SHA512 fa7144d1c84a4d2e295b43e76c8c87f002f05f5f76621caac04e16c719656d61523ecb2d790c944465532cfd9cf5fcbbc355baa4a36b39ef022f4ff4b80cd4c8 WHIRLPOOL 1d3b5d83cbd2fcde3f7d1a1fd7f75ade035284581b473e090af9642c251f51e466c527809df9b946ff52b5abcde4cbab2f736b60a5ea98245f2d5b5bc1cd7635 MISC metadata.xml 525 SHA256 706d61c1400fbeda6ada529e6f1864446171ca76e3c5f9799fc381ea5ac834ac SHA512 ad18fcc5b222c9f1d40c7dd30ec8fdef2d2756f79743027548be30d1a301ba324bb5d9fb0f45c3a812730a81ed849cd22c8a529f0c987b2f214d133186dc9aaf WHIRLPOOL 9a6b9224077931c83262cd8d9014a36ed3c520cfaddfd0f7bd8f7f2e4683a7b4d8597f839535b1cbada4dc4df8ede7bd6e85fa4ed60697bc23bc6caef364bc09 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQJ8BAEBCABmBQJTA6foXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC -MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOzZoQAMmTjJwuzCK/civlxbeEF3bF -RpzyqMcdJEqh7MyntYhLv9u7/c2Dvw/C2sSegvbWk4VVmFxb0jT9wXZwgpAw/nMC -KswLZq7Gi9RStbKiSg/fbT0pmon8b/by5DQn6AULyf5qYuYGAsz0t7vPNyY5JeRj -0qkC8oFGKgOh5dmcuDiTU5Rjig1piKdy2clnfA4SltXkTqyiBiHIYHk5PmYVLzCt -icsTixdCRr8+avm/lIbHDankasiwxRRNBDD4dA14oR9CIlRZ3Gx7Puk0WsUOo4Qe -NTxWnAeU99su5LjHjPi7jZZqekYW2knSSgLrjZ2Zjp9dM1o12TykZnemSQjeGGna -sCsGaStTtKlBExHV3+AeFssnvhZ6mG6bZxRGICJyKg7Mc/UKHwKYUwnWMmLwFVnj -9/fGvwxP1oHYMtCqofSlkxxg/W7k2lgNSs/cn2SBkaB9fmpCNeDxCmqQ59tEQ17j -7dKw2AoI2RDvA1JMiEmLCeCGvFU9kcgvSCsurK8xpYrKLkjdlmxiauv6d4BrqUDd -ILYzYrBVdWJ5Py8WCKUSEgPmXr0RrYFSH0kHK0ieKBNqJMb4uBMq0X/TFhlLOOkd -tAzo6IarmR5dLw0fufAsrDrwEWnGHqSD4vOKMUFiuo+A95zkiPTxpVHRsw2giHcr -bQPncFiSsBh6Rq4KeNoi -=2/Lx +iQIcBAEBCgAGBQJTZ0rWAAoJEKXdFCfdEflK6coP/2gvUmPlZIB6IXrVyhSz8EZJ +dHl8HxqfWklXb0j1TqPWuR7/vFueSRUuSfB3ZPX0ckCDMTlZSxXkpbZVB6ZPwicQ +rdiIze04QfmiBHDS0AM3v2C/P0B3fGV0YJ5GoBNLFLxxYDzF1QPKuEaT7uzaXIIK +WhRrzoRTUL592ueFW1JnwxmoD879hucPrM3hZlVEXAjTO2ZQNMPPIxIh8GkqBYV0 +Am06V65w6wm4Ut9WyBLkWGmadgqzfVz0PkvnyCvZoxNSvc8JeK5jAd7S4BaGgHD7 +12klMD7TQTS0OFdixv5YJhUpIbDn/bA1BUYbdtOUjIr/4D1l/qeLZPLCwyzHqhDo +o91bf8exSxb3XiTRyLebNWbg1mMRbr6bL0t2c3pv+YGUDePAt4ESeV/bYLIH7Wqc +VX2SFkI7ouEADGVLHiQlExsnm3Ehvi/kV+CKaiEqOMM55BbBbCHXVEuVSmaUNYfB +W/em5L4ljERHgnNcMSgJmzuRB/fPCTxX1a9TX9PF1wCPH+XmDzywykLAHQ/2riz9 +MCgICevr7yzQQXujwUeF59H+GchK3V6ijW2CbPelZEzezNofiSgo4XWyHBybhxBQ +57uVA2zSIGGhZaYp81sA3AJxBwH9Q4716yRPNaAjBfy7hfimtmFikXAlwcrw72Et +wqGwnxZ9Ex+Gw/B0waD4 +=p2P/ -----END PGP SIGNATURE----- diff --git a/net-wireless/blueman/blueman-9999.ebuild b/net-wireless/blueman/blueman-9999.ebuild new file mode 100644 index 000000000000..ce05c3ef671b --- /dev/null +++ b/net-wireless/blueman/blueman-9999.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/blueman-9999.ebuild,v 1.1 2014/05/05 08:22:45 zerochaos Exp $ + +EAPI="5" + +PYTHON_DEPEND="2:2.7" + +inherit eutils python gnome2-utils autotools + +DESCRIPTION="GTK+ Bluetooth Manager, designed to be simple and intuitive for everyday bluetooth tasks." +HOMEPAGE="http://blueman-project.org/" + +if [[ ${PV} == "9999" ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/${PN}-project/${PN}.git" + EGIT_BRANCH="bluez5" + KEYWORDS="" +else + SRC_URI="http://download.tuxfamily.org/${PN}/${P}.tar.gz" + KEYWORDS="~amd64 ~ppc ~x86" +fi + +LICENSE="GPL-3" +SLOT="0" +IUSE="gconf sendto network nls policykit pulseaudio" + +CDEPEND="dev-libs/glib:2 + x11-libs/gtk+:3 + x11-libs/startup-notification + dev-python/pygobject:2 + >=net-wireless/bluez-4.61 + x11-libs/libnotify" +DEPEND="${CDEPEND} + nls? ( dev-util/intltool sys-devel/gettext ) + virtual/pkgconfig + >=dev-python/pyrex-0.9.8" +RDEPEND="${CDEPEND} + >=app-mobilephone/obex-data-server-0.4.4 + sys-apps/dbus + dev-python/pygtk + dev-python/notify-python + dev-python/dbus-python + x11-themes/hicolor-icon-theme + gconf? ( dev-python/gconf-python ) + sendto? ( gnome-base/nautilus ) + network? ( || ( net-dns/dnsmasq + =net-misc/dhcp-3* + >=net-misc/networkmanager-0.8 ) ) + policykit? ( sys-auth/polkit ) + pulseaudio? ( media-sound/pulseaudio )" + +pkg_setup() { + python_set_active_version 2.7 + python_pkg_setup +} + +src_prepare() { + # disable pyc compiling + ln -sf $(type -P true) py-compile + + sed -i \ + -e '/^Encoding/d' \ + data/blueman-manager.desktop.in || die "sed failed" + + epatch \ + "${FILESDIR}/${PN}-9999-plugins-conf-file.patch" \ + "${FILESDIR}/${PN}-9999-set-codeset-for-gettext-to-UTF-8-always.patch" + eautoreconf +} + +src_configure() { + econf \ + --disable-static \ + $(use_enable policykit polkit) \ + $(use_enable sendto) \ + --disable-hal \ + $(use_enable nls) +} + +src_install() { + default + + python_convert_shebangs 2.7 "${D}"/usr/bin/blueman-* "${D}/usr/libexec/blueman-mechanism" + + rm "${D}"/$(python_get_sitedir)/*.la + use sendto && rm "${D}"/usr/lib*/nautilus-sendto/plugins/*.la + + use gconf || rm "${D}"/$(python_get_sitedir)/${PN}/plugins/config/Gconf.py + use policykit || rm -rf "${D}"/usr/share/polkit-1 + use pulseaudio || rm "${D}"/$(python_get_sitedir)/${PN}/{main/Pulse*.py,plugins/applet/Pulse*.py} + + python_need_rebuild +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + python_mod_optimize ${PN} + gnome2_icon_cache_update +} + +pkg_postrm() { + python_mod_cleanup ${PN} + gnome2_icon_cache_update +} diff --git a/net-wireless/blueman/files/blueman-9999-plugins-conf-file.patch b/net-wireless/blueman/files/blueman-9999-plugins-conf-file.patch new file mode 100644 index 000000000000..62724db1c8e3 --- /dev/null +++ b/net-wireless/blueman/files/blueman-9999-plugins-conf-file.patch @@ -0,0 +1,30 @@ +diff --git a/blueman/plugins/config/File.py b/blueman/plugins/config/File.py +index 3beccb4..c17fe77 100644 +--- a/blueman/plugins/config/File.py ++++ b/blueman/plugins/config/File.py +@@ -22,7 +22,12 @@ signal.signal(signal.SIGHUP, sighandler) + + dbus.service.Object.SUPPORTS_MULTIPLE_OBJECT_PATHS = True + +-cfg_path = os.path.expanduser('~/.config/blueman/blueman.cfg') ++cfg_dir = os.path.expanduser('~/.config/blueman') ++ ++if os.environ.has_key('XDG_CONFIG_HOME'): ++ cfg_dir = '%s/blueman' % os.environ['XDG_CONFIG_HOME'] ++ ++cfg_path = '%s/blueman.cfg' % cfg_dir + + + class Monitor(dbus.service.Object): +@@ -77,9 +82,9 @@ class File(ConfigPlugin): + def on_load(self, section): + + if not File.__db__: +- if not os.path.exists(os.path.expanduser('~/.config/blueman')): ++ if not os.path.exists(os.path.expanduser(cfg_dir)): + try: +- os.makedirs(os.path.expanduser('~/.config/blueman')) ++ os.makedirs(os.path.expanduser(cfg_dir)) + except: + pass + try: diff --git a/net-wireless/blueman/files/blueman-9999-set-codeset-for-gettext-to-UTF-8-always.patch b/net-wireless/blueman/files/blueman-9999-set-codeset-for-gettext-to-UTF-8-always.patch new file mode 100644 index 000000000000..258f65cc34cd --- /dev/null +++ b/net-wireless/blueman/files/blueman-9999-set-codeset-for-gettext-to-UTF-8-always.patch @@ -0,0 +1,241 @@ +diff --git a/apps/blueman-adapters b/apps/blueman-adapters +index e6f1b16..95f6997 100755 +--- a/apps/blueman-adapters ++++ b/apps/blueman-adapters +@@ -6,6 +6,7 @@ from gi.repository import Pango + import os.path + import sys + import signal ++from locale import bind_textdomain_codeset + + #support running uninstalled + _dirname = os.path.abspath(os.path.join(os.path.dirname(__file__), '..')) +@@ -34,6 +35,7 @@ class BluemanAdapters: + + builder = Gtk.Builder() + builder.set_translation_domain("blueman") ++ bind_textdomain_codeset("blueman", "UTF-8") + builder.add_from_file(UI_PATH + "/adapters.ui") + self.dialog = builder.get_object("dialog") + +diff --git a/apps/blueman-assistant b/apps/blueman-assistant +index dc7f18f..47893da 100755 +--- a/apps/blueman-assistant ++++ b/apps/blueman-assistant +@@ -16,6 +16,7 @@ import random + import signal + import dbus.glib + from optparse import OptionParser ++from locale import bind_textdomain_codeset + + #support running uninstalled + _dirname = os.path.abspath(os.path.join(os.path.dirname(__file__), '..')) +@@ -63,6 +64,7 @@ class Assistant(Agent): + + self.Builder = Gtk.Builder() + self.Builder.set_translation_domain("blueman") ++ bind_textdomain_codeset("blueman", "UTF-8") + self.Builder.add_from_file(UI_PATH + "/assistant.ui") + self.assistant = self.Builder.get_object("assistant") + self.assistant.set_title(_("Bluetooth Assistant")) +diff --git a/apps/blueman-manager b/apps/blueman-manager +index f31d219..e938601 100755 +--- a/apps/blueman-manager ++++ b/apps/blueman-manager +@@ -27,6 +27,7 @@ import dbus, dbus.glib + from blueman.Constants import * + import gi + gi.require_version("Gtk", "3.0") ++from locale import bind_textdomain_codeset + from gi.repository import Gtk + from gi.repository import GObject + from blueman.bluez.BlueZInterface import BlueZInterface +@@ -62,6 +64,7 @@ class Blueman: + + self.Builder = Gtk.Builder() + self.Builder.set_translation_domain("blueman") ++ bind_textdomain_codeset("blueman", "UTF-8") + self.Builder.add_from_file(UI_PATH + "/manager-main.ui") + + self.window = self.Builder.get_object("window") +diff --git a/apps/blueman-sendto b/apps/blueman-sendto +index e72e6ab..ce25926 100755 +--- a/apps/blueman-sendto ++++ b/apps/blueman-sendto +@@ -13,6 +13,7 @@ from optparse import OptionParser + import gettext + import urllib + import time ++from locale import bind_textdomain_codeset + + from blueman.Constants import * + import gi +@@ -46,6 +47,7 @@ class Sender(GObject.GObject): + GObject.GObject.__init__(self) + self.Builder = Gtk.Builder() + self.Builder.set_translation_domain("blueman") ++ bind_textdomain_codeset("blueman", "UTF-8") + self.Builder.add_from_file(UI_PATH + "/send-dialog.ui") + self.window = self.Builder.get_object("window") + +diff --git a/apps/blueman-services b/apps/blueman-services +index 25a529b..4b4419c 100755 +--- a/apps/blueman-services ++++ b/apps/blueman-services +@@ -2,6 +2,7 @@ + + import os + import sys ++from locale import bind_textdomain_codeset + #support running uninstalled + _dirname = os.path.abspath(os.path.join(os.path.dirname(__file__), '..')) + if os.path.exists(os.path.join(_dirname, "CHANGELOG.md")): +@@ -29,6 +30,7 @@ class BluemanServices: + + self.Builder = Gtk.Builder() + self.Builder.set_translation_domain("blueman") ++ bind_textdomain_codeset("blueman", "UTF-8") + self.Builder.add_from_file(UI_PATH + "/services.ui") + + self.Config = Config() +diff --git a/blueman/gui/GsmSettings.py b/blueman/gui/GsmSettings.py +index ee07e62..e58277b 100644 +--- a/blueman/gui/GsmSettings.py ++++ b/blueman/gui/GsmSettings.py +@@ -21,6 +21,7 @@ from blueman.Functions import * + from blueman.Constants import * + + from gi.repository import Gtk ++from locale import bind_textdomain_codeset + + class GsmSettings(Gtk.Dialog): + def __init__(self, bd_address): +@@ -30,6 +31,7 @@ class GsmSettings(Gtk.Dialog): + + self.Builder = Gtk.Builder() + self.Builder.set_translation_domain("blueman") ++ bind_textdomain_codeset("blueman", "UTF-8") + self.Builder.add_from_file(UI_PATH +"/gsm-settings.ui") + + vbox = self.Builder.get_object("vbox1") +diff --git a/blueman/gui/applet/PluginDialog.py b/blueman/gui/applet/PluginDialog.py +index f994cc9..84d6370 100644 +--- a/blueman/gui/applet/PluginDialog.py ++++ b/blueman/gui/applet/PluginDialog.py +@@ -23,6 +23,7 @@ from blueman.Functions import * + + from blueman.gui.GenericList import GenericList + import weakref ++from locale import bind_textdomain_codeset + + class SettingsWidget(Gtk.VBox): + def __init__(self, inst): +@@ -118,6 +119,7 @@ class PluginDialog(Gtk.Dialog): + + self.Builder = Gtk.Builder() + self.Builder.set_translation_domain("blueman") ++ bind_textdomain_codeset("blueman", "UTF-8") + self.Builder.add_from_file(UI_PATH +"/applet-plugins-widget.ui") + + self.set_title(_("Plugins")) +diff --git a/blueman/main/applet/BluezAgent.py b/blueman/main/applet/BluezAgent.py +index 868dbe9..403077a 100644 +--- a/blueman/main/applet/BluezAgent.py ++++ b/blueman/main/applet/BluezAgent.py +@@ -25,6 +25,7 @@ from gi.repository import Gtk + from gi.repository import GObject + from gi.types import GObjectMeta + import cgi ++from locale import bind_textdomain_codeset + import blueman.bluez as Bluez + from blueman.Sdp import * + from blueman.Constants import * +@@ -68,6 +69,7 @@ class CommonAgent(GObject.GObject, Agent): + editable.stop_emission("insert-text") + + builder = Gtk.Builder() ++ bind_textdomain_codeset("blueman", "UTF-8") + builder.add_from_file(UI_PATH + "/applet-passkey.ui") + builder.set_translation_domain("blueman") + dialog = builder.get_object("dialog") +diff --git a/blueman/plugins/applet/NetUsage.py b/blueman/plugins/applet/NetUsage.py +index 1584580..6262ff0 100644 +--- a/blueman/plugins/applet/NetUsage.py ++++ b/blueman/plugins/applet/NetUsage.py +@@ -33,7 +33,7 @@ import dbus + import time + import datetime + import gettext +- ++from locale import bind_textdomain_codeset + + class MonitorBase(GObject.GObject): + __gsignals__ = { +@@ -150,6 +150,7 @@ class Dialog: + builder = Gtk.Builder() + builder.add_from_file(UI_PATH + "/net-usage.ui") + builder.set_translation_domain("blueman") ++ bind_textdomain_codeset("blueman", "UTF-8") + + self.dialog = builder.get_object("dialog") + self.dialog.connect("response", self.on_response) +diff --git a/blueman/plugins/services/Audio.py b/blueman/plugins/services/Audio.py +index b44d6b5..4b13e8f 100644 +--- a/blueman/plugins/services/Audio.py ++++ b/blueman/plugins/services/Audio.py +@@ -19,6 +19,7 @@ + + from gi.repository import Gtk + import dbus ++from locale import bind_textdomain_codeset + from blueman.Constants import * + from blueman.plugins.ServicePlugin import ServicePlugin + +@@ -35,6 +36,7 @@ class Audio(ServicePlugin): + + self.Builder = Gtk.Builder() + self.Builder.set_translation_domain("blueman") ++ bind_textdomain_codeset("blueman", "UTF-8") + self.Builder.add_from_file(UI_PATH +"/services-audio.ui") + self.widget = self.Builder.get_object("audio") + +diff --git a/blueman/plugins/services/Network.py b/blueman/plugins/services/Network.py +index e003345..bd705d9 100644 +--- a/blueman/plugins/services/Network.py ++++ b/blueman/plugins/services/Network.py +@@ -18,6 +18,7 @@ + # + + from gi.repository import Gtk ++from locale import bind_textdomain_codeset + from blueman.Constants import * + from blueman.Functions import have, dprint, mask_ip4_address + from blueman.Lib import get_net_interfaces, get_net_address, get_net_netmask +@@ -36,6 +37,7 @@ class Network(ServicePlugin): + + self.Builder = Gtk.Builder() + self.Builder.set_translation_domain("blueman") ++ bind_textdomain_codeset("blueman", "UTF-8") + self.Builder.add_from_file(UI_PATH +"/services-network.ui") + self.widget = self.Builder.get_object("network") + +diff --git a/blueman/plugins/services/Transfer.py b/blueman/plugins/services/Transfer.py +index 55024d3..ffd75ec 100644 +--- a/blueman/plugins/services/Transfer.py ++++ b/blueman/plugins/services/Transfer.py +@@ -18,6 +18,7 @@ + # + + from gi.repository import Gtk ++from locale import bind_textdomain_codeset + from blueman.Constants import * + from blueman.plugins.ServicePlugin import ServicePlugin + +@@ -32,6 +33,7 @@ class Transfer(ServicePlugin): + + self.Builder = Gtk.Builder() + self.Builder.set_translation_domain("blueman") ++ bind_textdomain_codeset("blueman", "UTF-8") + self.Builder.add_from_file(UI_PATH +"/services-transfer.ui") + self.widget = self.Builder.get_object("transfer") + |