/[gentoo-x86]/net-wireless/blueman/files/blueman-2.0-set-codeset-for-gettext-to-UTF-8-always.patch
Gentoo

Contents of /net-wireless/blueman/files/blueman-2.0-set-codeset-for-gettext-to-UTF-8-always.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download) (as text)
Sat Aug 8 15:35:02 2015 UTC (4 years, 6 months ago) by mgorny
Branch: MAIN
CVS Tags: HEAD
File MIME type: text/x-diff
Version bump with schema install fix to the live ebuild.

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)

1 From aebfe594584e7c5cca30062d643618fc2ab8144b Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
3 Date: Sun, 1 Mar 2015 23:08:02 +0100
4 Subject: [PATCH] set codeset for gettext to utf-8
5
6 ---
7 apps/blueman-adapters | 2 ++
8 apps/blueman-assistant | 2 ++
9 apps/blueman-manager | 2 ++
10 apps/blueman-sendto | 2 ++
11 apps/blueman-services | 2 ++
12 blueman/gui/GsmSettings.py | 2 ++
13 blueman/gui/applet/PluginDialog.py | 4 +++-
14 blueman/plugins/applet/NetUsage.py | 3 ++-
15 blueman/plugins/services/Network.py | 3 ++-
16 blueman/plugins/services/Transfer.py | 2 ++
17 11 files changed, 29 insertions(+), 6 deletions(-)
18
19 diff --git a/apps/blueman-adapters b/apps/blueman-adapters
20 index a961480..3759ba8 100755
21 --- a/apps/blueman-adapters
22 +++ b/apps/blueman-adapters
23 @@ -6,6 +6,7 @@ from gi.repository import Pango
24 import os.path
25 import sys
26 import signal
27 +from locale import bind_textdomain_codeset
28
29 #support running uninstalled
30 _dirname = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
31 @@ -36,6 +37,7 @@ class BluemanAdapters:
32
33 builder = Gtk.Builder()
34 builder.set_translation_domain("blueman")
35 + bind_textdomain_codeset("blueman", "UTF-8")
36 builder.add_from_file(UI_PATH + "/adapters.ui")
37 self.dialog = builder.get_object("dialog")
38
39 diff --git a/apps/blueman-assistant b/apps/blueman-assistant
40 index 7d96ec7..c322256 100755
41 --- a/apps/blueman-assistant
42 +++ b/apps/blueman-assistant
43 @@ -16,6 +16,7 @@ import random
44 import signal
45 import dbus.glib
46 from optparse import OptionParser
47 +from locale import bind_textdomain_codeset
48
49 #support running uninstalled
50 _dirname = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
51 @@ -62,6 +63,7 @@ class Assistant:
52
53 self.Builder = Gtk.Builder()
54 self.Builder.set_translation_domain("blueman")
55 + bind_textdomain_codeset("blueman", "UTF-8")
56 self.Builder.add_from_file(UI_PATH + "/assistant.ui")
57 self.assistant = self.Builder.get_object("assistant")
58 self.assistant.set_title(_("Bluetooth Assistant"))
59 diff --git a/apps/blueman-manager b/apps/blueman-manager
60 index 666f16c..af23015 100755
61 --- a/apps/blueman-manager
62 +++ b/apps/blueman-manager
63 @@ -8,6 +8,7 @@ from dbus.mainloop.glib import DBusGMainLoop
64 from blueman.Constants import *
65 import gi
66 gi.require_version("Gtk", "3.0")
67 +from locale import bind_textdomain_codeset
68 from gi.repository import Gtk
69 from gi.repository import GObject
70 from blueman.bluez.BlueZInterface import BlueZInterface
71 @@ -46,6 +47,7 @@ class Blueman:
72
73 self.Builder = Gtk.Builder()
74 self.Builder.set_translation_domain("blueman")
75 + bind_textdomain_codeset("blueman", "UTF-8")
76 self.Builder.add_from_file(UI_PATH + "/manager-main.ui")
77
78 self.window = self.Builder.get_object("window")
79 diff --git a/apps/blueman-sendto b/apps/blueman-sendto
80 index 06ad626..a7099ab 100755
81 --- a/apps/blueman-sendto
82 +++ b/apps/blueman-sendto
83 @@ -13,6 +13,7 @@ from optparse import OptionParser
84 import gettext
85 import urllib
86 import time
87 +from locale import bind_textdomain_codeset
88
89 from blueman.Constants import *
90 import gi
91 @@ -48,6 +49,7 @@ class Sender(GObject.GObject):
92 GObject.GObject.__init__(self)
93 self.Builder = Gtk.Builder()
94 self.Builder.set_translation_domain("blueman")
95 + bind_textdomain_codeset("blueman", "UTF-8")
96 self.Builder.add_from_file(UI_PATH + "/send-dialog.ui")
97 self.window = self.Builder.get_object("window")
98
99 diff --git a/apps/blueman-services b/apps/blueman-services
100 index fb1428d..e3e708b 100755
101 --- a/apps/blueman-services
102 +++ b/apps/blueman-services
103 @@ -2,6 +2,7 @@
104
105 import os
106 import sys
107 +from locale import bind_textdomain_codeset
108 #support running uninstalled
109 _dirname = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
110 if os.path.exists(os.path.join(_dirname, "CHANGELOG.md")):
111 @@ -29,6 +30,7 @@ class BluemanServices:
112
113 self.Builder = Gtk.Builder()
114 self.Builder.set_translation_domain("blueman")
115 + bind_textdomain_codeset("blueman", "UTF-8")
116 self.Builder.add_from_file(UI_PATH + "/services.ui")
117
118 self.Config = Config()
119 diff --git a/blueman/gui/GsmSettings.py b/blueman/gui/GsmSettings.py
120 index b12f77f..cc80492 100644
121 --- a/blueman/gui/GsmSettings.py
122 +++ b/blueman/gui/GsmSettings.py
123 @@ -3,6 +3,7 @@ from blueman.Functions import *
124 from blueman.Constants import *
125
126 from gi.repository import Gtk
127 +from locale import bind_textdomain_codeset
128
129
130 class GsmSettings(Gtk.Dialog):
131 @@ -13,6 +14,7 @@ class GsmSettings(Gtk.Dialog):
132
133 self.Builder = Gtk.Builder()
134 self.Builder.set_translation_domain("blueman")
135 + bind_textdomain_codeset("blueman", "UTF-8")
136 self.Builder.add_from_file(UI_PATH + "/gsm-settings.ui")
137
138 vbox = self.Builder.get_object("vbox1")
139 diff --git a/blueman/gui/applet/PluginDialog.py b/blueman/gui/applet/PluginDialog.py
140 index 71dd742..3a1f932 100644
141 --- a/blueman/gui/applet/PluginDialog.py
142 +++ b/blueman/gui/applet/PluginDialog.py
143 @@ -1,4 +1,5 @@
144 from gi.repository import Gtk
145 +from locale import bind_textdomain_codeset
146 from blueman.Constants import *
147 from blueman.Functions import *
148
149 @@ -97,7 +98,8 @@ class PluginDialog(Gtk.Dialog):
150
151 self.Builder = Gtk.Builder()
152 self.Builder.set_translation_domain("blueman")
153 - self.Builder.add_from_file(UI_PATH + "/applet-plugins-widget.ui")
154 + bind_textdomain_codeset("blueman", "UTF-8")
155 + self.Builder.add_from_file(UI_PATH + "/applet-plugins-widget.ui")
156
157 self.set_title(_("Plugins"))
158 self.props.icon_name = "blueman"
159 diff --git a/blueman/plugins/applet/NetUsage.py b/blueman/plugins/applet/NetUsage.py
160 index f6acb1f..5545112 100644
161 --- a/blueman/plugins/applet/NetUsage.py
162 +++ b/blueman/plugins/applet/NetUsage.py
163 @@ -17,7 +17,7 @@ import dbus
164 import time
165 import datetime
166 import gettext
167 -
168 +from locale import bind_textdomain_codeset
169
170 class MonitorBase(GObject.GObject):
171 __gsignals__ = {
172 @@ -134,6 +134,7 @@ class Dialog:
173 builder = Gtk.Builder()
174 builder.add_from_file(UI_PATH + "/net-usage.ui")
175 builder.set_translation_domain("blueman")
176 + bind_textdomain_codeset("blueman", "UTF-8")
177
178 self.dialog = builder.get_object("dialog")
179 self.dialog.connect("response", self.on_response)
180 diff --git a/blueman/plugins/services/Network.py b/blueman/plugins/services/Network.py
181 index 278121e..e688e68 100644
182 --- a/blueman/plugins/services/Network.py
183 +++ b/blueman/plugins/services/Network.py
184 @@ -1,4 +1,5 @@
185 from gi.repository import Gtk
186 +from locale import bind_textdomain_codeset
187 from blueman.Constants import *
188 from blueman.Functions import have, dprint, mask_ip4_address
189 from blueman.Lib import get_net_interfaces, get_net_address, get_net_netmask
190 @@ -19,7 +20,7 @@ class Network(ServicePlugin):
191
192 self.Builder = Gtk.Builder()
193 self.Builder.set_translation_domain("blueman")
194 - self.Builder.add_from_file(UI_PATH + "/services-network.ui")
195 + bind_textdomain_codeset("blueman", "UTF-8") self.Builder.add_from_file(UI_PATH + "/services-network.ui")
196 self.widget = self.Builder.get_object("network")
197
198 self.ignored_keys = []
199 diff --git a/blueman/plugins/services/Transfer.py b/blueman/plugins/services/Transfer.py
200 index d14d0eb..c3e71ad 100644
201 --- a/blueman/plugins/services/Transfer.py
202 +++ b/blueman/plugins/services/Transfer.py
203 @@ -1,4 +1,5 @@
204 from gi.repository import Gtk
205 +from locale import bind_textdomain_codeset
206 from blueman.Constants import *
207 from blueman.plugins.ServicePlugin import ServicePlugin
208
209 @@ -14,6 +15,7 @@ class Transfer(ServicePlugin):
210
211 self.Builder = Gtk.Builder()
212 self.Builder.set_translation_domain("blueman")
213 + bind_textdomain_codeset("blueman", "UTF-8")
214 self.Builder.add_from_file(UI_PATH + "/services-transfer.ui")
215 self.widget = self.Builder.get_object("transfer")
216
217 --
218 2.3.1
219

  ViewVC Help
Powered by ViewVC 1.1.20