Gentoo Archives: gentoo-commits

From: "Santiago M. Mola (coldwind)" <coldwind@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-p2p/nicotine+/files: nicotine+-1.2.9-locale-handling.patch
Date: Mon, 31 Mar 2008 14:24:58
Message-Id: E1JgKwR-0006rt-Iv@stork.gentoo.org
1 coldwind 08/03/31 14:24:55
2
3 Added: nicotine+-1.2.9-locale-handling.patch
4 Log:
5 Locale handling fixed, bug #197835
6 (Portage version: 2.1.4.4)
7
8 Revision Changes Path
9 1.1 net-p2p/nicotine+/files/nicotine+-1.2.9-locale-handling.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/nicotine+/files/nicotine+-1.2.9-locale-handling.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/nicotine+/files/nicotine+-1.2.9-locale-handling.patch?rev=1.1&content-type=text/plain
13
14 Index: nicotine+-1.2.9-locale-handling.patch
15 ===================================================================
16 diff -ur nicotine+-1.2.9.orig/pynicotine/gtkgui/frame.py nicotine+-1.2.9/pynicotine/gtkgui/frame.py
17 --- nicotine+-1.2.9.orig/pynicotine/gtkgui/frame.py 2007-12-04 10:33:57.000000000 +0100
18 +++ nicotine+-1.2.9/pynicotine/gtkgui/frame.py 2007-12-04 10:40:31.000000000 +0100
19 @@ -947,20 +947,8 @@
20
21 for widget in self.BuddiesComboEntries:
22 gobject.idle_add(widget.Fill)
23 -
24 - def getTabPosition(self, string):
25 - if string == "top":
26 - position = gtk.POS_TOP
27 - elif string == "bottom":
28 - position = gtk.POS_BOTTOM
29 - elif string == "left":
30 - position = gtk.POS_LEFT
31 - elif string == "right":
32 - position = gtk.POS_RIGHT
33 - else:
34 - position = gtk.POS_TOP
35 - return position
36 -
37 +
38 +
39 def OnAutoAway(self):
40 if not self.away:
41 self.autoaway = True
42 @@ -1675,7 +1663,20 @@
43 message = message.replace(word, filler * len(word))
44
45 return message
46 -
47 +
48 + def getTabPosition(self, string):
49 + if string in ("Top", "top", _("Top")):
50 + position = gtk.POS_TOP
51 + elif string in ("Bottom", "bottom", _("Bottom")):
52 + position = gtk.POS_BOTTOM
53 + elif string in ("Left", "left", _("Left")):
54 + position = gtk.POS_LEFT
55 + elif string in ("Right", "right", _("Right")):
56 + position = gtk.POS_RIGHT
57 + else:
58 + position = gtk.POS_TOP
59 + return position
60 +
61 def SetTabPositions(self):
62 ui = self.np.config.sections["ui"]
63 self.ChatNotebook.set_tab_pos(self.getTabPosition(ui["tabrooms"]))
64 diff -ur nicotine+-1.2.9.orig/pynicotine/gtkgui/settingswindow.py nicotine+-1.2.9/pynicotine/gtkgui/settingswindow.py
65 --- nicotine+-1.2.9.orig/pynicotine/gtkgui/settingswindow.py 2007-12-04 10:33:57.000000000 +0100
66 +++ nicotine+-1.2.9/pynicotine/gtkgui/settingswindow.py 2007-12-04 10:37:06.000000000 +0100
67 @@ -1206,12 +1206,12 @@
68 def GetSettings(self):
69 return {
70 "ui": {
71 - "tabmain": self.MainPosition.get_active_text().lower(),
72 - "tabrooms": self.ChatRoomsPosition.get_active_text().lower(),
73 - "tabprivate": self.PrivateChatPosition.get_active_text().lower(),
74 - "tabinfo": self.UserInfoPosition.get_active_text().lower(),
75 - "tabbrowse": self.UserBrowsePosition.get_active_text().lower(),
76 - "tabsearch": self.SearchPosition.get_active_text().lower(),
77 + "tabmain": self.MainPosition.get_active_text(),
78 + "tabrooms": self.ChatRoomsPosition.get_active_text(),
79 + "tabprivate": self.PrivateChatPosition.get_active_text(),
80 + "tabinfo": self.UserInfoPosition.get_active_text(),
81 + "tabbrowse": self.UserBrowsePosition.get_active_text(),
82 + "tabsearch": self.SearchPosition.get_active_text(),
83 "labelmain": self.MainAngleSpin.get_value_as_int(),
84 "labelrooms": self.ChatRoomsAngleSpin.get_value_as_int(),
85 "labelprivate": self.PrivateChatAngleSpin.get_value_as_int(),
86
87
88
89 --
90 gentoo-commits@l.g.o mailing list