* [gentoo-commits] repo/gentoo:master commit in: net-wireless/blueman/files/
@ 2016-03-01 17:07 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2016-03-01 17:07 UTC (permalink / raw
To: gentoo-commits
commit: 9c6762d7d716204469c7002a38f46e4f59043d45
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 1 17:01:43 2016 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Mar 1 17:07:32 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c6762d7
net-wireless/blueman: Remove old unused patches
.../blueman-1.23-fix-broken-status-icon.patch | 34 ---
.../files/blueman-1.23-plugins-conf-file.patch | 30 ---
...3-set-codeset-for-gettext-to-UTF-8-always.patch | 266 ---------------------
...5-set-codeset-for-gettext-to-UTF-8-always.patch | 239 ------------------
4 files changed, 569 deletions(-)
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
deleted file mode 100644
index 58931eb..0000000
--- a/net-wireless/blueman/files/blueman-1.23-fix-broken-status-icon.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 4588e22cc486cf297517168f52f0274133577827 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tiziano=20M=C3=BCller?= <tm@dev-zero.ch>
-Date: Wed, 13 Jun 2012 09:52:40 +0200
-Subject: [PATCH] fix broken status icon
-
----
- blueman/plugins/applet/StatusIcon.py | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/blueman/plugins/applet/StatusIcon.py b/blueman/plugins/applet/StatusIcon.py
-index fb02593..ed352ea 100644
---- a/blueman/plugins/applet/StatusIcon.py
-+++ b/blueman/plugins/applet/StatusIcon.py
-@@ -68,7 +68,7 @@ class StatusIcon(AppletPlugin, gtk.StatusIcon):
- entry.connect("changed", self.on_entry_changed, ic, image)
-
- __options__ = {"icon": {"type": str,
-- "default": "blueman-tray",
-+ "default": "blueman",
- "name": _("Icon Name"),
- "desc": _("Custom icon to use for the notification area"),
- "decorator": widget_decorator
-@@ -166,7 +166,7 @@ class StatusIcon(AppletPlugin, gtk.StatusIcon):
- self.QueryVisibility()
-
- def on_status_icon_resized(self):
-- self.icon = "blueman-tray"
-+ self.icon = "blueman"
-
- #p = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, True, 8, 22, 22)
- #p.fill(0)
---
-1.7.8.6
-
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
deleted file mode 100644
index 80cdad0..0000000
--- a/net-wireless/blueman/files/blueman-1.23-plugins-conf-file.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/blueman/plugins/config/File.py b/blueman/plugins/config/File.py
-index c5414c5..9a9e156 100644
---- a/blueman/plugins/config/File.py
-+++ b/blueman/plugins/config/File.py
-@@ -37,7 +37,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):
- __id__ = 0
-@@ -89,9 +94,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-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
deleted file mode 100644
index a7df10d..0000000
--- a/net-wireless/blueman/files/blueman-1.23-set-codeset-for-gettext-to-UTF-8-always.patch
+++ /dev/null
@@ -1,266 +0,0 @@
-From f585aea768ad98440d4967894aa9213cea6e6f14 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tiziano=20M=C3=BCller?= <tm@dev-zero.ch>
-Date: Tue, 19 Jun 2012 08:03:47 +0200
-Subject: [PATCH] Set codeset for gettext to UTF-8 always
-
-This fixes a segfault in g_markup_escape_text when loading the UI files
-with a non-UTF-8 locale since GTK+ expects all strings (including translation)
-to be in UTF-8.
----
- apps/blueman-adapters | 2 ++
- apps/blueman-assistant | 2 ++
- apps/blueman-manager | 2 ++
- apps/blueman-sendto | 2 ++
- apps/blueman-services | 2 ++
- blueman/gui/GsmSettings.py | 2 ++
- blueman/gui/applet/PluginDialog.py | 2 ++
- blueman/main/applet/BluezAgent.py | 2 ++
- blueman/plugins/applet/NetUsage.py | 2 ++
- blueman/plugins/services/Audio.py | 2 ++
- blueman/plugins/services/Network.py | 2 ++
- blueman/plugins/services/Transfer.py | 2 ++
- 12 files changed, 24 insertions(+), 0 deletions(-)
-
-diff --git a/apps/blueman-adapters b/apps/blueman-adapters
-index 6adc642..51325ad 100755
---- a/apps/blueman-adapters
-+++ b/apps/blueman-adapters
-@@ -26,6 +26,7 @@ import gobject
- import pango
- import os.path
- import sys
-+from locale import bind_textdomain_codeset
-
- #support running uninstalled
- _dirname = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
-@@ -47,6 +48,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 32d8bd8..c30f663 100755
---- a/apps/blueman-assistant
-+++ b/apps/blueman-assistant
-@@ -35,6 +35,7 @@ import gtk
- import random
- 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__), '..'))
-@@ -74,6 +75,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 e4a04e3..3aeb80f 100755
---- a/apps/blueman-manager
-+++ b/apps/blueman-manager
-@@ -25,6 +25,7 @@ import sys
- import gtk
- import dbus, dbus.glib
- import gobject
-+from locale import bind_textdomain_codeset
-
- #support running uninstalled
- _dirname = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
-@@ -56,6 +57,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 72fcfa9..f8c082a 100755
---- a/apps/blueman-sendto
-+++ b/apps/blueman-sendto
-@@ -33,6 +33,7 @@ from optparse import OptionParser
- import gettext
- import urllib
- import time
-+from locale import bind_textdomain_codeset
-
- from blueman.bluez.Adapter import Adapter
- from blueman.main.Device import Device
-@@ -56,6 +57,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 d6d4545..2c15f03 100755
---- a/apps/blueman-services
-+++ b/apps/blueman-services
-@@ -8,6 +8,7 @@ if os.path.exists(os.path.join(_dirname,"ChangeLog")):
- sys.path.insert(0, _dirname)
-
- import gtk
-+from locale import bind_textdomain_codeset
- from blueman.gui.GenericList import GenericList
-
- from blueman.Functions import *
-@@ -25,6 +26,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 2e845ec..b4e1059 100644
---- a/blueman/gui/GsmSettings.py
-+++ b/blueman/gui/GsmSettings.py
-@@ -20,6 +20,7 @@ from blueman.main.Config import Config
- from blueman.Functions import *
- from blueman.Constants import *
- import gtk
-+from locale import bind_textdomain_codeset
-
- class GsmSettings(gtk.Dialog):
- def __init__(self, bd_address):
-@@ -29,6 +30,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 1d8cbec..299aa32 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 9c7f93e..377f84b 100644
---- a/blueman/main/applet/BluezAgent.py
-+++ b/blueman/main/applet/BluezAgent.py
-@@ -24,6 +24,7 @@ from blueman.Functions import get_icon, dprint
- import gtk
- import gobject
- import cgi
-+from locale import bind_textdomain_codeset
- import blueman.bluez as Bluez
- from blueman.Sdp import *
- from blueman.Constants import *
-@@ -65,6 +66,7 @@ class CommonAgent(gobject.GObject, Agent):
- builder = gtk.Builder()
- builder.add_from_file(UI_PATH +"/applet-passkey.ui")
- builder.set_translation_domain("blueman")
-+ bind_textdomain_codeset("blueman", "UTF-8")
- dialog = builder.get_object("dialog")
-
- dialog.props.icon_name = "blueman"
-diff --git a/blueman/plugins/applet/NetUsage.py b/blueman/plugins/applet/NetUsage.py
-index 0cf15e8..bcebb44 100644
---- a/blueman/plugins/applet/NetUsage.py
-+++ b/blueman/plugins/applet/NetUsage.py
-@@ -33,6 +33,7 @@ import dbus
- import time
- import datetime
- import gettext
-+from locale import bind_textdomain_codeset
-
- class MonitorBase(gobject.GObject):
- __gsignals__ = {
-@@ -146,6 +147,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 a725923..6a67fb0 100644
---- a/blueman/plugins/services/Audio.py
-+++ b/blueman/plugins/services/Audio.py
-@@ -19,6 +19,7 @@
-
- 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 d7b9f45..fc8a8f4 100644
---- a/blueman/plugins/services/Network.py
-+++ b/blueman/plugins/services/Network.py
-@@ -18,6 +18,7 @@
- #
-
- 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 d8ba6be..5dd44f0 100644
---- a/blueman/plugins/services/Transfer.py
-+++ b/blueman/plugins/services/Transfer.py
-@@ -18,6 +18,7 @@
- #
-
- 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")
-
---
-1.7.8.6
-
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
deleted file mode 100644
index ce341c8..0000000
--- a/net-wireless/blueman/files/blueman-1.98_p20150105-set-codeset-for-gettext-to-UTF-8-always.patch
+++ /dev/null
@@ -1,239 +0,0 @@
-diff --git a/apps/blueman-adapters b/apps/blueman-adapters
-index ed80a4f..9f27b9e 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 7e602c8..fab3355 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__), '..'))
-@@ -62,6 +63,7 @@ class Assistant:
-
- 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 b152044..395257b 100755
---- a/apps/blueman-manager
-+++ b/apps/blueman-manager
-@@ -7,6 +7,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
-@@ -43,6 +44,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 852f99a..fdbff01 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 072958d..207659c 100644
---- a/blueman/main/applet/BluezAgent.py
-+++ b/blueman/main/applet/BluezAgent.py
-@@ -7,6 +7,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 *
-@@ -50,6 +51,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 9fd93c7..d6bc492 100644
---- a/blueman/plugins/applet/NetUsage.py
-+++ b/blueman/plugins/applet/NetUsage.py
-@@ -17,7 +17,7 @@ import dbus
- import time
- import datetime
- import gettext
--
-+from locale import bind_textdomain_codeset
-
- class MonitorBase(GObject.GObject):
- __gsignals__ = {
-@@ -134,6 +134,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 5fab49a..0dd88d9 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 189d0cc..8fa65d0 100644
---- a/blueman/plugins/services/Transfer.py
-+++ b/blueman/plugins/services/Transfer.py
-@@ -1,4 +1,5 @@
- from gi.repository import Gtk
-+from locale import bind_textdomain_codeset
- from blueman.Constants import *
- from blueman.plugins.ServicePlugin import ServicePlugin
-
-@@ -14,6 +15,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")
-
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-wireless/blueman/files/
@ 2016-03-01 17:07 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2016-03-01 17:07 UTC (permalink / raw
To: gentoo-commits
commit: 1237a6c46ac7d99bd72600649088d4044f51c13b
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 1 17:06:28 2016 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Mar 1 17:07:32 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1237a6c4
net-wireless/blueman: Fix typo in patch for 2.0.3, #575900
.../files/blueman-2.0-set-codeset-for-gettext-to-UTF-8-always.patch | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/net-wireless/blueman/files/blueman-2.0-set-codeset-for-gettext-to-UTF-8-always.patch b/net-wireless/blueman/files/blueman-2.0-set-codeset-for-gettext-to-UTF-8-always.patch
index 02747d1..5d3d1bd 100644
--- a/net-wireless/blueman/files/blueman-2.0-set-codeset-for-gettext-to-UTF-8-always.patch
+++ b/net-wireless/blueman/files/blueman-2.0-set-codeset-for-gettext-to-UTF-8-always.patch
@@ -187,12 +187,12 @@ index 278121e..e688e68 100644
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
-@@ -19,7 +20,7 @@ class Network(ServicePlugin):
+@@ -19,7 +19,8 @@ class Network(ServicePlugin):
self.Builder = Gtk.Builder()
self.Builder.set_translation_domain("blueman")
-- self.Builder.add_from_file(UI_PATH + "/services-network.ui")
-+ bind_textdomain_codeset("blueman", "UTF-8") self.Builder.add_from_file(UI_PATH + "/services-network.ui")
++ bind_textdomain_codeset("blueman", "UTF-8")
+ self.Builder.add_from_file(UI_PATH + "/services-network.ui")
self.widget = self.Builder.get_object("network")
self.ignored_keys = []
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-03-01 17:08 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-01 17:07 [gentoo-commits] repo/gentoo:master commit in: net-wireless/blueman/files/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2016-03-01 17:07 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox