Merge lp:~kiwinote/software-center/lp951557 into lp:software-center

Proposed by Kiwinote on 2012-04-10
Status: Merged
Merged at revision: 2957
Proposed branch: lp:~kiwinote/software-center/lp951557
Merge into: lp:software-center
Diff against target: 72 lines (+5/-39)
2 files modified
debian/changelog (+5/-1)
softwarecenter/ui/gtk3/app.py (+0/-38)
To merge this branch: bzr merge lp:~kiwinote/software-center/lp951557
Reviewer Review Type Date Requested Status
Gary Lasker (community) 2012-04-10 Approve on 2012-04-10
Review via email: mp+101404@code.launchpad.net

Description of the change

this fixes bug 951557 and also removes a bunch of unused code

as a side note it seems that the menu items are getting the wrong sensitivity (not related to this bug), so something's messed up somewhere (perhaps because i'm using unity-2d, but things like that should just work..)

To post a comment you must log in.
Gary Lasker (gary-lasker) wrote :

Thanks kiwinote, does the trick perfectly! Seems we don't need (or, more to the point, *want*) to explicitely implement a ctrl-v anymore, nice!! :)

Thanks again, it's very nice to have this one fixed.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-04-10 14:19:18 +0000
3+++ debian/changelog 2012-04-10 15:55:25 +0000
4@@ -33,7 +33,11 @@
5 - Allow to repair an incomplete installation (partially fixes
6 LP: #659438)
7
8- -- Gary Lasker <gary.lasker@canonical.com> Mon, 09 Apr 2012 13:15:19 -0400
9+ [ Kiwinote ]
10+ * lp:~kiwinote/software-center/lp951557:
11+ - don't duplicate text on paste (LP: #951557)
12+
13+ -- Kiwinote <kiwinote@gmail.com> Tue, 10 Apr 2012 16:46:31 +0100
14
15 software-center (5.1.14.1) precise; urgency=low
16
17
18=== modified file 'softwarecenter/ui/gtk3/app.py'
19--- softwarecenter/ui/gtk3/app.py 2012-04-02 18:23:20 +0000
20+++ softwarecenter/ui/gtk3/app.py 2012-04-10 15:55:25 +0000
21@@ -146,38 +146,6 @@
22 def triggerCacheReload(self):
23 self.parent.cache.emit("cache-ready")
24
25-# XXX Haven't really thought this through....
26-#~ class SoftwareCenterInitOndemand(object):
27-#~
28- #~ """ Init objects/data that are low priority, i.e, use case is
29- #~ niche and/or load times are low and will not impact user
30- #~ experience. All data and objects are loaded on request.
31- #~ """
32-#~
33- #~ def init(self):
34- #~ pass
35-
36-
37-#~ class SoftwareCenterInitDelayed(object):
38-#~
39- #~ """ Init objects/data that are medium priority, not needed instantly
40- #~ but rather _potentially_ required within the first few seconds
41- #~ of USC usage.
42- #~ """
43-#~
44- #~ def init(self):
45- #~ # reviews
46- #~ self.review_loader = get_review_loader(self.cache, self.db)
47- #~ # FIXME: add some kind of throttle, I-M-S here
48- #~ self.review_loader.refresh_review_stats(self.on_review_stats_loaded)
49- #~ #load usefulness votes from server when app starts
50- #~ self.useful_cache = UsefulnessCache(True)
51- #~ self.setup_database_rebuilding_listener()
52- #~ # open plugin manager and load plugins
53- #~ self.plugin_manager = PluginManager(self,
54- #~ SOFTWARE_CENTER_PLUGIN_DIRS)
55- #~ self.plugin_manager.load_plugins()
56-
57
58 class SoftwareCenterAppGtk3(SimpleGtkbuilderApp):
59
60@@ -591,12 +559,6 @@
61 if self.menuitem_copy.get_sensitive():
62 self.menuitem_copy.activate()
63
64- if (event.keyval == Gdk.keyval_from_name("v") and
65- event.state == Gdk.ModifierType.CONTROL_MASK):
66- self.menuitem_edit.activate()
67- if self.menuitem_paste.get_sensitive():
68- self.menuitem_paste.activate()
69-
70 # copy web link
71 if (event.keyval == Gdk.keyval_from_name("C") and
72 event.state == (Gdk.ModifierType.SHIFT_MASK |

Subscribers

People subscribed via source and target branches