mgorny 14/11/20 00:06:21
Modified:
blueman-9999-set-codeset-for-gettext-to-UTF-8-always.patch
Log:
Update the -9999 patch.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key
EFB4464E!)
Revision Changes Path
1.2
net-wireless/blueman/files/blueman-9999-set-codeset-for-gettext-to-UTF-8-always.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/blueman/files/blueman-9999-set-codeset-for-gettext-to-UTF-8-always.patch?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/blueman/files/blueman-9999-set-codeset-for-gettext-to-UTF-8-always.patch?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/blueman/files/blueman-9999-set-codeset-for-gettext-to-UTF-8-always.patch?r1=1.1&r2=1.2
Index: blueman-9999-set-codeset-for-gettext-to-UTF-8-always.patch
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/net-wireless/blueman/files/blueman-9999-set-codeset-for-gettext-to-UTF-8-always.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- blueman-9999-set-codeset-for-gettext-to-UTF-8-always.patch 5 May 2014
08:22:45 -0000 1.1
+++ blueman-9999-set-codeset-for-gettext-to-UTF-8-always.patch 20 Nov 2014
00:06:21 -0000 1.2
@@ -1,5 +1,5 @@
diff --git a/apps/blueman-adapters b/apps/blueman-adapters
-index e6f1b16..95f6997 100755
+index ed80a4f..9f27b9e 100755
--- a/apps/blueman-adapters
+++ b/apps/blueman-adapters
@@ -6,6 +6,7 @@ from gi.repository import Pango
@@ -19,7 +19,7 @@
self.dialog = builder.get_object("dialog")
diff --git a/apps/blueman-assistant b/apps/blueman-assistant
-index dc7f18f..47893da 100755
+index 7e602c8..fab3355 100755
--- a/apps/blueman-assistant
+++ b/apps/blueman-assistant
@@ -16,6 +16,7 @@ import random
@@ -30,7 +30,7 @@
#support running uninstalled
_dirname = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
-@@ -63,6 +64,7 @@ class Assistant(Agent):
+@@ -62,6 +63,7 @@ class Assistant:
self.Builder = Gtk.Builder()
self.Builder.set_translation_domain("blueman")
@@ -39,10 +39,10 @@
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
+index b152044..395257b 100755
--- a/apps/blueman-manager
+++ b/apps/blueman-manager
-@@ -27,6 +27,7 @@ import dbus, dbus.glib
+@@ -7,6 +7,7 @@ import dbus, dbus.glib
from blueman.Constants import *
import gi
gi.require_version("Gtk", "3.0")
@@ -50,7 +50,7 @@
from gi.repository import Gtk
from gi.repository import GObject
from blueman.bluez.BlueZInterface import BlueZInterface
-@@ -62,6 +64,7 @@ class Blueman:
+@@ -43,6 +44,7 @@ class Blueman:
self.Builder = Gtk.Builder()
self.Builder.set_translation_domain("blueman")
@@ -59,7 +59,7 @@
self.window = self.Builder.get_object("window")
diff --git a/apps/blueman-sendto b/apps/blueman-sendto
-index e72e6ab..ce25926 100755
+index 852f99a..fdbff01 100755
--- a/apps/blueman-sendto
+++ b/apps/blueman-sendto
@@ -13,6 +13,7 @@ from optparse import OptionParser
@@ -114,7 +114,7 @@
self.Builder = Gtk.Builder()
self.Builder.set_translation_domain("blueman")
-+ bind_textdomain_codeset("blueman", "UTF-8")
++ bind_textdomain_codeset("blueman", "UTF-8")
self.Builder.add_from_file(UI_PATH +"/gsm-settings.ui")
vbox = self.Builder.get_object("vbox1")
@@ -134,15 +134,15 @@
self.Builder = Gtk.Builder()
self.Builder.set_translation_domain("blueman")
-+ bind_textdomain_codeset("blueman", "UTF-8")
++ 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
+index 072958d..207659c 100644
--- a/blueman/main/applet/BluezAgent.py
+++ b/blueman/main/applet/BluezAgent.py
-@@ -25,6 +25,7 @@ from gi.repository import Gtk
+@@ -7,6 +7,7 @@ from gi.repository import Gtk
from gi.repository import GObject
from gi.types import GObjectMeta
import cgi
@@ -150,7 +150,7 @@
import blueman.bluez as Bluez
from blueman.Sdp import *
from blueman.Constants import *
-@@ -68,6 +69,7 @@ class CommonAgent(GObject.GObject, Agent):
+@@ -50,6 +51,7 @@ class CommonAgent(GObject.GObject, Agent):
editable.stop_emission("insert-text")
builder = Gtk.Builder()
@@ -159,10 +159,10 @@
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
+index 9fd93c7..d6bc492 100644
--- a/blueman/plugins/applet/NetUsage.py
+++ b/blueman/plugins/applet/NetUsage.py
-@@ -33,7 +33,7 @@ import dbus
+@@ -17,7 +17,7 @@ import dbus
import time
import datetime
import gettext
@@ -171,7 +171,7 @@
class MonitorBase(GObject.GObject):
__gsignals__ = {
-@@ -150,6 +150,7 @@ class Dialog:
+@@ -134,6 +134,7 @@ class Dialog:
builder = Gtk.Builder()
builder.add_from_file(UI_PATH + "/net-usage.ui")
builder.set_translation_domain("blueman")
@@ -195,12 +195,12 @@
self.Builder = Gtk.Builder()
self.Builder.set_translation_domain("blueman")
-+ bind_textdomain_codeset("blueman", "UTF-8")
++ 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
+index 5fab49a..0dd88d9 100644
--- a/blueman/plugins/services/Network.py
+++ b/blueman/plugins/services/Network.py
@@ -18,6 +18,7 @@
@@ -215,27 +215,25 @@
self.Builder = Gtk.Builder()
self.Builder.set_translation_domain("blueman")
-+ bind_textdomain_codeset("blueman", "UTF-8")
++ 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
+index 189d0cc..8fa65d0 100644
--- a/blueman/plugins/services/Transfer.py
+++ b/blueman/plugins/services/Transfer.py
-@@ -18,6 +18,7 @@
- #
-
+@@ -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
-@@ -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")
-
+@@ -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")
+
