1 |
commit: 9c6762d7d716204469c7002a38f46e4f59043d45 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Mar 1 17:01:43 2016 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Mar 1 17:07:32 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c6762d7 |
7 |
|
8 |
net-wireless/blueman: Remove old unused patches |
9 |
|
10 |
.../blueman-1.23-fix-broken-status-icon.patch | 34 --- |
11 |
.../files/blueman-1.23-plugins-conf-file.patch | 30 --- |
12 |
...3-set-codeset-for-gettext-to-UTF-8-always.patch | 266 --------------------- |
13 |
...5-set-codeset-for-gettext-to-UTF-8-always.patch | 239 ------------------ |
14 |
4 files changed, 569 deletions(-) |
15 |
|
16 |
diff --git a/net-wireless/blueman/files/blueman-1.23-fix-broken-status-icon.patch b/net-wireless/blueman/files/blueman-1.23-fix-broken-status-icon.patch |
17 |
deleted file mode 100644 |
18 |
index 58931eb..0000000 |
19 |
--- a/net-wireless/blueman/files/blueman-1.23-fix-broken-status-icon.patch |
20 |
+++ /dev/null |
21 |
@@ -1,34 +0,0 @@ |
22 |
-From 4588e22cc486cf297517168f52f0274133577827 Mon Sep 17 00:00:00 2001 |
23 |
-From: =?UTF-8?q?Tiziano=20M=C3=BCller?= <tm@××××××××.ch> |
24 |
-Date: Wed, 13 Jun 2012 09:52:40 +0200 |
25 |
-Subject: [PATCH] fix broken status icon |
26 |
- |
27 |
---- |
28 |
- blueman/plugins/applet/StatusIcon.py | 4 ++-- |
29 |
- 1 files changed, 2 insertions(+), 2 deletions(-) |
30 |
- |
31 |
-diff --git a/blueman/plugins/applet/StatusIcon.py b/blueman/plugins/applet/StatusIcon.py |
32 |
-index fb02593..ed352ea 100644 |
33 |
---- a/blueman/plugins/applet/StatusIcon.py |
34 |
-+++ b/blueman/plugins/applet/StatusIcon.py |
35 |
-@@ -68,7 +68,7 @@ class StatusIcon(AppletPlugin, gtk.StatusIcon): |
36 |
- entry.connect("changed", self.on_entry_changed, ic, image) |
37 |
- |
38 |
- __options__ = {"icon": {"type": str, |
39 |
-- "default": "blueman-tray", |
40 |
-+ "default": "blueman", |
41 |
- "name": _("Icon Name"), |
42 |
- "desc": _("Custom icon to use for the notification area"), |
43 |
- "decorator": widget_decorator |
44 |
-@@ -166,7 +166,7 @@ class StatusIcon(AppletPlugin, gtk.StatusIcon): |
45 |
- self.QueryVisibility() |
46 |
- |
47 |
- def on_status_icon_resized(self): |
48 |
-- self.icon = "blueman-tray" |
49 |
-+ self.icon = "blueman" |
50 |
- |
51 |
- #p = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, True, 8, 22, 22) |
52 |
- #p.fill(0) |
53 |
--- |
54 |
-1.7.8.6 |
55 |
- |
56 |
|
57 |
diff --git a/net-wireless/blueman/files/blueman-1.23-plugins-conf-file.patch b/net-wireless/blueman/files/blueman-1.23-plugins-conf-file.patch |
58 |
deleted file mode 100644 |
59 |
index 80cdad0..0000000 |
60 |
--- a/net-wireless/blueman/files/blueman-1.23-plugins-conf-file.patch |
61 |
+++ /dev/null |
62 |
@@ -1,30 +0,0 @@ |
63 |
-diff --git a/blueman/plugins/config/File.py b/blueman/plugins/config/File.py |
64 |
-index c5414c5..9a9e156 100644 |
65 |
---- a/blueman/plugins/config/File.py |
66 |
-+++ b/blueman/plugins/config/File.py |
67 |
-@@ -37,7 +37,12 @@ signal.signal(signal.SIGHUP, sighandler) |
68 |
- |
69 |
- dbus.service.Object.SUPPORTS_MULTIPLE_OBJECT_PATHS = True |
70 |
- |
71 |
--cfg_path = os.path.expanduser('~/.config/blueman/blueman.cfg') |
72 |
-+cfg_dir = os.path.expanduser('~/.config/blueman') |
73 |
-+ |
74 |
-+if os.environ.has_key('XDG_CONFIG_HOME'): |
75 |
-+ cfg_dir = '%s/blueman' % os.environ['XDG_CONFIG_HOME'] |
76 |
-+ |
77 |
-+cfg_path = '%s/blueman.cfg' % cfg_dir |
78 |
- |
79 |
- class Monitor(dbus.service.Object): |
80 |
- __id__ = 0 |
81 |
-@@ -89,9 +94,9 @@ class File(ConfigPlugin): |
82 |
- def on_load(self, section): |
83 |
- |
84 |
- if not File.__db__: |
85 |
-- if not os.path.exists(os.path.expanduser('~/.config/blueman')): |
86 |
-+ if not os.path.exists(os.path.expanduser(cfg_dir)): |
87 |
- try: |
88 |
-- os.makedirs(os.path.expanduser('~/.config/blueman')) |
89 |
-+ os.makedirs(os.path.expanduser(cfg_dir)) |
90 |
- except: |
91 |
- pass |
92 |
- try: |
93 |
|
94 |
diff --git a/net-wireless/blueman/files/blueman-1.23-set-codeset-for-gettext-to-UTF-8-always.patch b/net-wireless/blueman/files/blueman-1.23-set-codeset-for-gettext-to-UTF-8-always.patch |
95 |
deleted file mode 100644 |
96 |
index a7df10d..0000000 |
97 |
--- a/net-wireless/blueman/files/blueman-1.23-set-codeset-for-gettext-to-UTF-8-always.patch |
98 |
+++ /dev/null |
99 |
@@ -1,266 +0,0 @@ |
100 |
-From f585aea768ad98440d4967894aa9213cea6e6f14 Mon Sep 17 00:00:00 2001 |
101 |
-From: =?UTF-8?q?Tiziano=20M=C3=BCller?= <tm@××××××××.ch> |
102 |
-Date: Tue, 19 Jun 2012 08:03:47 +0200 |
103 |
-Subject: [PATCH] Set codeset for gettext to UTF-8 always |
104 |
- |
105 |
-This fixes a segfault in g_markup_escape_text when loading the UI files |
106 |
-with a non-UTF-8 locale since GTK+ expects all strings (including translation) |
107 |
-to be in UTF-8. |
108 |
---- |
109 |
- apps/blueman-adapters | 2 ++ |
110 |
- apps/blueman-assistant | 2 ++ |
111 |
- apps/blueman-manager | 2 ++ |
112 |
- apps/blueman-sendto | 2 ++ |
113 |
- apps/blueman-services | 2 ++ |
114 |
- blueman/gui/GsmSettings.py | 2 ++ |
115 |
- blueman/gui/applet/PluginDialog.py | 2 ++ |
116 |
- blueman/main/applet/BluezAgent.py | 2 ++ |
117 |
- blueman/plugins/applet/NetUsage.py | 2 ++ |
118 |
- blueman/plugins/services/Audio.py | 2 ++ |
119 |
- blueman/plugins/services/Network.py | 2 ++ |
120 |
- blueman/plugins/services/Transfer.py | 2 ++ |
121 |
- 12 files changed, 24 insertions(+), 0 deletions(-) |
122 |
- |
123 |
-diff --git a/apps/blueman-adapters b/apps/blueman-adapters |
124 |
-index 6adc642..51325ad 100755 |
125 |
---- a/apps/blueman-adapters |
126 |
-+++ b/apps/blueman-adapters |
127 |
-@@ -26,6 +26,7 @@ import gobject |
128 |
- import pango |
129 |
- import os.path |
130 |
- import sys |
131 |
-+from locale import bind_textdomain_codeset |
132 |
- |
133 |
- #support running uninstalled |
134 |
- _dirname = os.path.abspath(os.path.join(os.path.dirname(__file__), '..')) |
135 |
-@@ -47,6 +48,7 @@ class BluemanAdapters: |
136 |
- |
137 |
- builder = gtk.Builder() |
138 |
- builder.set_translation_domain("blueman") |
139 |
-+ bind_textdomain_codeset("blueman", "UTF-8") |
140 |
- builder.add_from_file(UI_PATH +"/adapters.ui") |
141 |
- self.dialog = builder.get_object("dialog") |
142 |
- |
143 |
-diff --git a/apps/blueman-assistant b/apps/blueman-assistant |
144 |
-index 32d8bd8..c30f663 100755 |
145 |
---- a/apps/blueman-assistant |
146 |
-+++ b/apps/blueman-assistant |
147 |
-@@ -35,6 +35,7 @@ import gtk |
148 |
- import random |
149 |
- import dbus.glib |
150 |
- from optparse import OptionParser |
151 |
-+from locale import bind_textdomain_codeset |
152 |
- |
153 |
- #support running uninstalled |
154 |
- _dirname = os.path.abspath(os.path.join(os.path.dirname(__file__), '..')) |
155 |
-@@ -74,6 +75,7 @@ class Assistant(Agent): |
156 |
- |
157 |
- self.Builder = gtk.Builder() |
158 |
- self.Builder.set_translation_domain("blueman") |
159 |
-+ bind_textdomain_codeset("blueman", "UTF-8") |
160 |
- self.Builder.add_from_file(UI_PATH +"/assistant.ui") |
161 |
- self.assistant = self.Builder.get_object("assistant") |
162 |
- self.assistant.set_title(_("Bluetooth Assistant")) |
163 |
-diff --git a/apps/blueman-manager b/apps/blueman-manager |
164 |
-index e4a04e3..3aeb80f 100755 |
165 |
---- a/apps/blueman-manager |
166 |
-+++ b/apps/blueman-manager |
167 |
-@@ -25,6 +25,7 @@ import sys |
168 |
- import gtk |
169 |
- import dbus, dbus.glib |
170 |
- import gobject |
171 |
-+from locale import bind_textdomain_codeset |
172 |
- |
173 |
- #support running uninstalled |
174 |
- _dirname = os.path.abspath(os.path.join(os.path.dirname(__file__), '..')) |
175 |
-@@ -56,6 +57,7 @@ class Blueman: |
176 |
- |
177 |
- self.Builder = gtk.Builder() |
178 |
- self.Builder.set_translation_domain("blueman") |
179 |
-+ bind_textdomain_codeset("blueman", "UTF-8") |
180 |
- self.Builder.add_from_file(UI_PATH +"/manager-main.ui") |
181 |
- |
182 |
- self.window = self.Builder.get_object("window") |
183 |
-diff --git a/apps/blueman-sendto b/apps/blueman-sendto |
184 |
-index 72fcfa9..f8c082a 100755 |
185 |
---- a/apps/blueman-sendto |
186 |
-+++ b/apps/blueman-sendto |
187 |
-@@ -33,6 +33,7 @@ from optparse import OptionParser |
188 |
- import gettext |
189 |
- import urllib |
190 |
- import time |
191 |
-+from locale import bind_textdomain_codeset |
192 |
- |
193 |
- from blueman.bluez.Adapter import Adapter |
194 |
- from blueman.main.Device import Device |
195 |
-@@ -56,6 +57,7 @@ class Sender(gobject.GObject): |
196 |
- gobject.GObject.__init__(self) |
197 |
- self.Builder = gtk.Builder() |
198 |
- self.Builder.set_translation_domain("blueman") |
199 |
-+ bind_textdomain_codeset("blueman", "UTF-8") |
200 |
- self.Builder.add_from_file(UI_PATH +"/send-dialog.ui") |
201 |
- self.window = self.Builder.get_object("window") |
202 |
- |
203 |
-diff --git a/apps/blueman-services b/apps/blueman-services |
204 |
-index d6d4545..2c15f03 100755 |
205 |
---- a/apps/blueman-services |
206 |
-+++ b/apps/blueman-services |
207 |
-@@ -8,6 +8,7 @@ if os.path.exists(os.path.join(_dirname,"ChangeLog")): |
208 |
- sys.path.insert(0, _dirname) |
209 |
- |
210 |
- import gtk |
211 |
-+from locale import bind_textdomain_codeset |
212 |
- from blueman.gui.GenericList import GenericList |
213 |
- |
214 |
- from blueman.Functions import * |
215 |
-@@ -25,6 +26,7 @@ class BluemanServices: |
216 |
- |
217 |
- self.Builder = gtk.Builder() |
218 |
- self.Builder.set_translation_domain("blueman") |
219 |
-+ bind_textdomain_codeset("blueman", "UTF-8") |
220 |
- self.Builder.add_from_file(UI_PATH +"/services.ui") |
221 |
- |
222 |
- self.Config = Config() |
223 |
-diff --git a/blueman/gui/GsmSettings.py b/blueman/gui/GsmSettings.py |
224 |
-index 2e845ec..b4e1059 100644 |
225 |
---- a/blueman/gui/GsmSettings.py |
226 |
-+++ b/blueman/gui/GsmSettings.py |
227 |
-@@ -20,6 +20,7 @@ from blueman.main.Config import Config |
228 |
- from blueman.Functions import * |
229 |
- from blueman.Constants import * |
230 |
- import gtk |
231 |
-+from locale import bind_textdomain_codeset |
232 |
- |
233 |
- class GsmSettings(gtk.Dialog): |
234 |
- def __init__(self, bd_address): |
235 |
-@@ -29,6 +30,7 @@ class GsmSettings(gtk.Dialog): |
236 |
- |
237 |
- self.Builder = gtk.Builder() |
238 |
- self.Builder.set_translation_domain("blueman") |
239 |
-+ bind_textdomain_codeset("blueman", "UTF-8") |
240 |
- self.Builder.add_from_file(UI_PATH +"/gsm-settings.ui") |
241 |
- |
242 |
- vbox = self.Builder.get_object("vbox1") |
243 |
-diff --git a/blueman/gui/applet/PluginDialog.py b/blueman/gui/applet/PluginDialog.py |
244 |
-index 1d8cbec..299aa32 100644 |
245 |
---- a/blueman/gui/applet/PluginDialog.py |
246 |
-+++ b/blueman/gui/applet/PluginDialog.py |
247 |
-@@ -23,6 +23,7 @@ from blueman.Functions import * |
248 |
- |
249 |
- from blueman.gui.GenericList import GenericList |
250 |
- import weakref |
251 |
-+from locale import bind_textdomain_codeset |
252 |
- |
253 |
- class SettingsWidget(gtk.VBox): |
254 |
- def __init__(self, inst): |
255 |
-@@ -118,6 +119,7 @@ class PluginDialog(gtk.Dialog): |
256 |
- |
257 |
- self.Builder = gtk.Builder() |
258 |
- self.Builder.set_translation_domain("blueman") |
259 |
-+ bind_textdomain_codeset("blueman", "UTF-8") |
260 |
- self.Builder.add_from_file(UI_PATH +"/applet-plugins-widget.ui") |
261 |
- |
262 |
- self.set_title(_("Plugins")) |
263 |
-diff --git a/blueman/main/applet/BluezAgent.py b/blueman/main/applet/BluezAgent.py |
264 |
-index 9c7f93e..377f84b 100644 |
265 |
---- a/blueman/main/applet/BluezAgent.py |
266 |
-+++ b/blueman/main/applet/BluezAgent.py |
267 |
-@@ -24,6 +24,7 @@ from blueman.Functions import get_icon, dprint |
268 |
- import gtk |
269 |
- import gobject |
270 |
- import cgi |
271 |
-+from locale import bind_textdomain_codeset |
272 |
- import blueman.bluez as Bluez |
273 |
- from blueman.Sdp import * |
274 |
- from blueman.Constants import * |
275 |
-@@ -65,6 +66,7 @@ class CommonAgent(gobject.GObject, Agent): |
276 |
- builder = gtk.Builder() |
277 |
- builder.add_from_file(UI_PATH +"/applet-passkey.ui") |
278 |
- builder.set_translation_domain("blueman") |
279 |
-+ bind_textdomain_codeset("blueman", "UTF-8") |
280 |
- dialog = builder.get_object("dialog") |
281 |
- |
282 |
- dialog.props.icon_name = "blueman" |
283 |
-diff --git a/blueman/plugins/applet/NetUsage.py b/blueman/plugins/applet/NetUsage.py |
284 |
-index 0cf15e8..bcebb44 100644 |
285 |
---- a/blueman/plugins/applet/NetUsage.py |
286 |
-+++ b/blueman/plugins/applet/NetUsage.py |
287 |
-@@ -33,6 +33,7 @@ import dbus |
288 |
- import time |
289 |
- import datetime |
290 |
- import gettext |
291 |
-+from locale import bind_textdomain_codeset |
292 |
- |
293 |
- class MonitorBase(gobject.GObject): |
294 |
- __gsignals__ = { |
295 |
-@@ -146,6 +147,7 @@ class Dialog: |
296 |
- builder = gtk.Builder() |
297 |
- builder.add_from_file(UI_PATH + "/net-usage.ui") |
298 |
- builder.set_translation_domain("blueman") |
299 |
-+ bind_textdomain_codeset("blueman", "UTF-8") |
300 |
- |
301 |
- self.dialog = builder.get_object("dialog") |
302 |
- self.dialog.connect("response", self.on_response) |
303 |
-diff --git a/blueman/plugins/services/Audio.py b/blueman/plugins/services/Audio.py |
304 |
-index a725923..6a67fb0 100644 |
305 |
---- a/blueman/plugins/services/Audio.py |
306 |
-+++ b/blueman/plugins/services/Audio.py |
307 |
-@@ -19,6 +19,7 @@ |
308 |
- |
309 |
- import gtk |
310 |
- import dbus |
311 |
-+from locale import bind_textdomain_codeset |
312 |
- from blueman.Constants import * |
313 |
- from blueman.plugins.ServicePlugin import ServicePlugin |
314 |
- |
315 |
-@@ -35,6 +36,7 @@ class Audio(ServicePlugin): |
316 |
- |
317 |
- self.Builder = gtk.Builder() |
318 |
- self.Builder.set_translation_domain("blueman") |
319 |
-+ bind_textdomain_codeset("blueman", "UTF-8") |
320 |
- self.Builder.add_from_file(UI_PATH +"/services-audio.ui") |
321 |
- self.widget = self.Builder.get_object("audio") |
322 |
- |
323 |
-diff --git a/blueman/plugins/services/Network.py b/blueman/plugins/services/Network.py |
324 |
-index d7b9f45..fc8a8f4 100644 |
325 |
---- a/blueman/plugins/services/Network.py |
326 |
-+++ b/blueman/plugins/services/Network.py |
327 |
-@@ -18,6 +18,7 @@ |
328 |
- # |
329 |
- |
330 |
- import gtk |
331 |
-+from locale import bind_textdomain_codeset |
332 |
- from blueman.Constants import * |
333 |
- from blueman.Functions import have, dprint, mask_ip4_address |
334 |
- from blueman.Lib import get_net_interfaces, get_net_address, get_net_netmask |
335 |
-@@ -36,6 +37,7 @@ class Network(ServicePlugin): |
336 |
- |
337 |
- self.Builder = gtk.Builder() |
338 |
- self.Builder.set_translation_domain("blueman") |
339 |
-+ bind_textdomain_codeset("blueman", "UTF-8") |
340 |
- self.Builder.add_from_file(UI_PATH +"/services-network.ui") |
341 |
- self.widget = self.Builder.get_object("network") |
342 |
- |
343 |
-diff --git a/blueman/plugins/services/Transfer.py b/blueman/plugins/services/Transfer.py |
344 |
-index d8ba6be..5dd44f0 100644 |
345 |
---- a/blueman/plugins/services/Transfer.py |
346 |
-+++ b/blueman/plugins/services/Transfer.py |
347 |
-@@ -18,6 +18,7 @@ |
348 |
- # |
349 |
- |
350 |
- import gtk |
351 |
-+from locale import bind_textdomain_codeset |
352 |
- from blueman.Constants import * |
353 |
- from blueman.plugins.ServicePlugin import ServicePlugin |
354 |
- |
355 |
-@@ -32,6 +33,7 @@ class Transfer(ServicePlugin): |
356 |
- |
357 |
- self.Builder = gtk.Builder() |
358 |
- self.Builder.set_translation_domain("blueman") |
359 |
-+ bind_textdomain_codeset("blueman", "UTF-8") |
360 |
- self.Builder.add_from_file(UI_PATH +"/services-transfer.ui") |
361 |
- self.widget = self.Builder.get_object("transfer") |
362 |
- |
363 |
--- |
364 |
-1.7.8.6 |
365 |
- |
366 |
|
367 |
diff --git a/net-wireless/blueman/files/blueman-1.98_p20150105-set-codeset-for-gettext-to-UTF-8-always.patch b/net-wireless/blueman/files/blueman-1.98_p20150105-set-codeset-for-gettext-to-UTF-8-always.patch |
368 |
deleted file mode 100644 |
369 |
index ce341c8..0000000 |
370 |
--- a/net-wireless/blueman/files/blueman-1.98_p20150105-set-codeset-for-gettext-to-UTF-8-always.patch |
371 |
+++ /dev/null |
372 |
@@ -1,239 +0,0 @@ |
373 |
-diff --git a/apps/blueman-adapters b/apps/blueman-adapters |
374 |
-index ed80a4f..9f27b9e 100755 |
375 |
---- a/apps/blueman-adapters |
376 |
-+++ b/apps/blueman-adapters |
377 |
-@@ -6,6 +6,7 @@ from gi.repository import Pango |
378 |
- import os.path |
379 |
- import sys |
380 |
- import signal |
381 |
-+from locale import bind_textdomain_codeset |
382 |
- |
383 |
- #support running uninstalled |
384 |
- _dirname = os.path.abspath(os.path.join(os.path.dirname(__file__), '..')) |
385 |
-@@ -34,6 +35,7 @@ class BluemanAdapters: |
386 |
- |
387 |
- builder = Gtk.Builder() |
388 |
- builder.set_translation_domain("blueman") |
389 |
-+ bind_textdomain_codeset("blueman", "UTF-8") |
390 |
- builder.add_from_file(UI_PATH + "/adapters.ui") |
391 |
- self.dialog = builder.get_object("dialog") |
392 |
- |
393 |
-diff --git a/apps/blueman-assistant b/apps/blueman-assistant |
394 |
-index 7e602c8..fab3355 100755 |
395 |
---- a/apps/blueman-assistant |
396 |
-+++ b/apps/blueman-assistant |
397 |
-@@ -16,6 +16,7 @@ import random |
398 |
- import signal |
399 |
- import dbus.glib |
400 |
- from optparse import OptionParser |
401 |
-+from locale import bind_textdomain_codeset |
402 |
- |
403 |
- #support running uninstalled |
404 |
- _dirname = os.path.abspath(os.path.join(os.path.dirname(__file__), '..')) |
405 |
-@@ -62,6 +63,7 @@ class Assistant: |
406 |
- |
407 |
- self.Builder = Gtk.Builder() |
408 |
- self.Builder.set_translation_domain("blueman") |
409 |
-+ bind_textdomain_codeset("blueman", "UTF-8") |
410 |
- self.Builder.add_from_file(UI_PATH + "/assistant.ui") |
411 |
- self.assistant = self.Builder.get_object("assistant") |
412 |
- self.assistant.set_title(_("Bluetooth Assistant")) |
413 |
-diff --git a/apps/blueman-manager b/apps/blueman-manager |
414 |
-index b152044..395257b 100755 |
415 |
---- a/apps/blueman-manager |
416 |
-+++ b/apps/blueman-manager |
417 |
-@@ -7,6 +7,7 @@ import dbus, dbus.glib |
418 |
- from blueman.Constants import * |
419 |
- import gi |
420 |
- gi.require_version("Gtk", "3.0") |
421 |
-+from locale import bind_textdomain_codeset |
422 |
- from gi.repository import Gtk |
423 |
- from gi.repository import GObject |
424 |
- from blueman.bluez.BlueZInterface import BlueZInterface |
425 |
-@@ -43,6 +44,7 @@ class Blueman: |
426 |
- |
427 |
- self.Builder = Gtk.Builder() |
428 |
- self.Builder.set_translation_domain("blueman") |
429 |
-+ bind_textdomain_codeset("blueman", "UTF-8") |
430 |
- self.Builder.add_from_file(UI_PATH + "/manager-main.ui") |
431 |
- |
432 |
- self.window = self.Builder.get_object("window") |
433 |
-diff --git a/apps/blueman-sendto b/apps/blueman-sendto |
434 |
-index 852f99a..fdbff01 100755 |
435 |
---- a/apps/blueman-sendto |
436 |
-+++ b/apps/blueman-sendto |
437 |
-@@ -13,6 +13,7 @@ from optparse import OptionParser |
438 |
- import gettext |
439 |
- import urllib |
440 |
- import time |
441 |
-+from locale import bind_textdomain_codeset |
442 |
- |
443 |
- from blueman.Constants import * |
444 |
- import gi |
445 |
-@@ -46,6 +47,7 @@ class Sender(GObject.GObject): |
446 |
- GObject.GObject.__init__(self) |
447 |
- self.Builder = Gtk.Builder() |
448 |
- self.Builder.set_translation_domain("blueman") |
449 |
-+ bind_textdomain_codeset("blueman", "UTF-8") |
450 |
- self.Builder.add_from_file(UI_PATH + "/send-dialog.ui") |
451 |
- self.window = self.Builder.get_object("window") |
452 |
- |
453 |
-diff --git a/apps/blueman-services b/apps/blueman-services |
454 |
-index 25a529b..4b4419c 100755 |
455 |
---- a/apps/blueman-services |
456 |
-+++ b/apps/blueman-services |
457 |
-@@ -2,6 +2,7 @@ |
458 |
- |
459 |
- import os |
460 |
- import sys |
461 |
-+from locale import bind_textdomain_codeset |
462 |
- #support running uninstalled |
463 |
- _dirname = os.path.abspath(os.path.join(os.path.dirname(__file__), '..')) |
464 |
- if os.path.exists(os.path.join(_dirname, "CHANGELOG.md")): |
465 |
-@@ -29,6 +30,7 @@ class BluemanServices: |
466 |
- |
467 |
- self.Builder = Gtk.Builder() |
468 |
- self.Builder.set_translation_domain("blueman") |
469 |
-+ bind_textdomain_codeset("blueman", "UTF-8") |
470 |
- self.Builder.add_from_file(UI_PATH + "/services.ui") |
471 |
- |
472 |
- self.Config = Config() |
473 |
-diff --git a/blueman/gui/GsmSettings.py b/blueman/gui/GsmSettings.py |
474 |
-index ee07e62..e58277b 100644 |
475 |
---- a/blueman/gui/GsmSettings.py |
476 |
-+++ b/blueman/gui/GsmSettings.py |
477 |
-@@ -21,6 +21,7 @@ from blueman.Functions import * |
478 |
- from blueman.Constants import * |
479 |
- |
480 |
- from gi.repository import Gtk |
481 |
-+from locale import bind_textdomain_codeset |
482 |
- |
483 |
- class GsmSettings(Gtk.Dialog): |
484 |
- def __init__(self, bd_address): |
485 |
-@@ -30,6 +31,7 @@ class GsmSettings(Gtk.Dialog): |
486 |
- |
487 |
- self.Builder = Gtk.Builder() |
488 |
- self.Builder.set_translation_domain("blueman") |
489 |
-+ bind_textdomain_codeset("blueman", "UTF-8") |
490 |
- self.Builder.add_from_file(UI_PATH +"/gsm-settings.ui") |
491 |
- |
492 |
- vbox = self.Builder.get_object("vbox1") |
493 |
-diff --git a/blueman/gui/applet/PluginDialog.py b/blueman/gui/applet/PluginDialog.py |
494 |
-index f994cc9..84d6370 100644 |
495 |
---- a/blueman/gui/applet/PluginDialog.py |
496 |
-+++ b/blueman/gui/applet/PluginDialog.py |
497 |
-@@ -23,6 +23,7 @@ from blueman.Functions import * |
498 |
- |
499 |
- from blueman.gui.GenericList import GenericList |
500 |
- import weakref |
501 |
-+from locale import bind_textdomain_codeset |
502 |
- |
503 |
- class SettingsWidget(Gtk.VBox): |
504 |
- def __init__(self, inst): |
505 |
-@@ -118,6 +119,7 @@ class PluginDialog(Gtk.Dialog): |
506 |
- |
507 |
- self.Builder = Gtk.Builder() |
508 |
- self.Builder.set_translation_domain("blueman") |
509 |
-+ bind_textdomain_codeset("blueman", "UTF-8") |
510 |
- self.Builder.add_from_file(UI_PATH +"/applet-plugins-widget.ui") |
511 |
- |
512 |
- self.set_title(_("Plugins")) |
513 |
-diff --git a/blueman/main/applet/BluezAgent.py b/blueman/main/applet/BluezAgent.py |
514 |
-index 072958d..207659c 100644 |
515 |
---- a/blueman/main/applet/BluezAgent.py |
516 |
-+++ b/blueman/main/applet/BluezAgent.py |
517 |
-@@ -7,6 +7,7 @@ from gi.repository import Gtk |
518 |
- from gi.repository import GObject |
519 |
- from gi.types import GObjectMeta |
520 |
- import cgi |
521 |
-+from locale import bind_textdomain_codeset |
522 |
- import blueman.bluez as Bluez |
523 |
- from blueman.Sdp import * |
524 |
- from blueman.Constants import * |
525 |
-@@ -50,6 +51,7 @@ class CommonAgent(GObject.GObject, Agent): |
526 |
- editable.stop_emission("insert-text") |
527 |
- |
528 |
- builder = Gtk.Builder() |
529 |
-+ bind_textdomain_codeset("blueman", "UTF-8") |
530 |
- builder.add_from_file(UI_PATH + "/applet-passkey.ui") |
531 |
- builder.set_translation_domain("blueman") |
532 |
- dialog = builder.get_object("dialog") |
533 |
-diff --git a/blueman/plugins/applet/NetUsage.py b/blueman/plugins/applet/NetUsage.py |
534 |
-index 9fd93c7..d6bc492 100644 |
535 |
---- a/blueman/plugins/applet/NetUsage.py |
536 |
-+++ b/blueman/plugins/applet/NetUsage.py |
537 |
-@@ -17,7 +17,7 @@ import dbus |
538 |
- import time |
539 |
- import datetime |
540 |
- import gettext |
541 |
-- |
542 |
-+from locale import bind_textdomain_codeset |
543 |
- |
544 |
- class MonitorBase(GObject.GObject): |
545 |
- __gsignals__ = { |
546 |
-@@ -134,6 +134,7 @@ class Dialog: |
547 |
- builder = Gtk.Builder() |
548 |
- builder.add_from_file(UI_PATH + "/net-usage.ui") |
549 |
- builder.set_translation_domain("blueman") |
550 |
-+ bind_textdomain_codeset("blueman", "UTF-8") |
551 |
- |
552 |
- self.dialog = builder.get_object("dialog") |
553 |
- self.dialog.connect("response", self.on_response) |
554 |
-diff --git a/blueman/plugins/services/Audio.py b/blueman/plugins/services/Audio.py |
555 |
-index b44d6b5..4b13e8f 100644 |
556 |
---- a/blueman/plugins/services/Audio.py |
557 |
-+++ b/blueman/plugins/services/Audio.py |
558 |
-@@ -19,6 +19,7 @@ |
559 |
- |
560 |
- from gi.repository import Gtk |
561 |
- import dbus |
562 |
-+from locale import bind_textdomain_codeset |
563 |
- from blueman.Constants import * |
564 |
- from blueman.plugins.ServicePlugin import ServicePlugin |
565 |
- |
566 |
-@@ -35,6 +36,7 @@ class Audio(ServicePlugin): |
567 |
- |
568 |
- self.Builder = Gtk.Builder() |
569 |
- self.Builder.set_translation_domain("blueman") |
570 |
-+ bind_textdomain_codeset("blueman", "UTF-8") |
571 |
- self.Builder.add_from_file(UI_PATH +"/services-audio.ui") |
572 |
- self.widget = self.Builder.get_object("audio") |
573 |
- |
574 |
-diff --git a/blueman/plugins/services/Network.py b/blueman/plugins/services/Network.py |
575 |
-index 5fab49a..0dd88d9 100644 |
576 |
---- a/blueman/plugins/services/Network.py |
577 |
-+++ b/blueman/plugins/services/Network.py |
578 |
-@@ -18,6 +18,7 @@ |
579 |
- # |
580 |
- |
581 |
- from gi.repository import Gtk |
582 |
-+from locale import bind_textdomain_codeset |
583 |
- from blueman.Constants import * |
584 |
- from blueman.Functions import have, dprint, mask_ip4_address |
585 |
- from blueman.Lib import get_net_interfaces, get_net_address, get_net_netmask |
586 |
-@@ -36,6 +37,7 @@ class Network(ServicePlugin): |
587 |
- |
588 |
- self.Builder = Gtk.Builder() |
589 |
- self.Builder.set_translation_domain("blueman") |
590 |
-+ bind_textdomain_codeset("blueman", "UTF-8") |
591 |
- self.Builder.add_from_file(UI_PATH +"/services-network.ui") |
592 |
- self.widget = self.Builder.get_object("network") |
593 |
- |
594 |
-diff --git a/blueman/plugins/services/Transfer.py b/blueman/plugins/services/Transfer.py |
595 |
-index 189d0cc..8fa65d0 100644 |
596 |
---- a/blueman/plugins/services/Transfer.py |
597 |
-+++ b/blueman/plugins/services/Transfer.py |
598 |
-@@ -1,4 +1,5 @@ |
599 |
- from gi.repository import Gtk |
600 |
-+from locale import bind_textdomain_codeset |
601 |
- from blueman.Constants import * |
602 |
- from blueman.plugins.ServicePlugin import ServicePlugin |
603 |
- |
604 |
-@@ -14,6 +15,7 @@ class Transfer(ServicePlugin): |
605 |
- |
606 |
- self.Builder = Gtk.Builder() |
607 |
- self.Builder.set_translation_domain("blueman") |
608 |
-+ bind_textdomain_codeset("blueman", "UTF-8") |
609 |
- self.Builder.add_from_file(UI_PATH + "/services-transfer.ui") |
610 |
- self.widget = self.Builder.get_object("transfer") |
611 |
- |