Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (6b1f3697e08716b63483d34e97e6fbf259c48313)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (6b1f3697e08716b63483d34e97e6fbf259c48313)
  • Date: Tue, 8 Feb 2011 06:46:05 -0600

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

ftp/museek+/encoding.patch | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)

New commits:
commit 6b1f3697e08716b63483d34e97e6fbf259c48313
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

museek+: improved encoding patch to check non-existent and/or incorrectly
configured encodings

diff --git a/ftp/museek+/encoding.patch b/ftp/museek+/encoding.patch
index d1c94a9..3e4a17d 100644
--- a/ftp/museek+/encoding.patch
+++ b/ftp/museek+/encoding.patch
@@ -1,23 +1,29 @@
--- murmur/murmur.orig 2008-12-15 14:51:42.000000000 +0300
+++ murmur/murmur 2011-02-08 02:54:47.000000000 +0300
-@@ -2418,7 +2418,16 @@
+@@ -2418,7 +2418,22 @@

self.Encoding_List = gtk.ListStore(gobject.TYPE_STRING)
self.Encoding = gtk.ComboBox()
+
++ active = Settings.encodings[0] # UTF-8
++ if self.frame.Networking.config.has_key("encoding") and
self.frame.Networking.config["encoding"].has_key("network"):
++ network_encoding =
self.frame.Networking.config["encoding"]["network"].upper()
++ if network_encoding in Settings.encodings:
++ active = network_encoding
++
+ if self.frame.Networking.config.has_key("encoding.users") and
self.user in self.frame.Networking.config["encoding.users"]:
-+ active =
Settings.encodings.index(self.frame.Networking.config["encoding.users"][self.user])
-+ else:
-+ active =
Settings.encodings.index(self.frame.Networking.config["encoding"]["network"].upper())
++ user_encoding =
self.frame.Networking.config["encoding.users"][self.user].upper()
++ if user_encoding in Settings.encodings:
++ active = user_encoding
+
-+ self.Encoding.set_active(active)
++ self.Encoding.set_active(Settings.encodings.index(active))
self.Encoding.show()
+ for encoding in Settings.encodings:
+ self.Encoding_List.append([encoding])
self.Encoding.connect("changed", self.OnEncodingChanged)

self.Encoding.set_model(self.Encoding_List)
-@@ -2566,8 +2575,18 @@
+@@ -2566,8 +2581,24 @@

self.frame.Config["logging"]["private"].remove(self.user)

def OnEncodingChanged(self, widget):
@@ -26,8 +32,14 @@
+ if not self.frame.Networking.config.has_key("encoding.users"):
+ return
+
++ network_encoding = Settings.encodings[0] # UTF-8
++ if self.frame.Networking.config.has_key("encoding") and
self.frame.Networking.config["encoding"].has_key("network"):
++ conf_network_encoding =
self.frame.Networking.config["encoding"]["network"].upper()
++ if conf_network_encoding not in Settings.encodings:
++ network_encoding = conf_network_encoding
++
+ active = self.Encoding.get_active_text()
-+ if active ==
self.frame.Networking.config["encoding"]["network"].upper():
++ if active == network_encoding:
+ # removing duplicates on network level
+ if self.user in
self.frame.Networking.config["encoding.users"]:
+
self.frame.Networking.ConfigRemove("encoding.users", self.user)



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (6b1f3697e08716b63483d34e97e6fbf259c48313), Vlad Glagolev, 02/08/2011

Archive powered by MHonArc 2.6.24.

Top of Page