Merge lp:~laney/aptdaemon/vte2.91 into lp:aptdaemon

Proposed by Iain Lane on 2014-11-10
Status: Merged
Merged at revision: 981
Proposed branch: lp:~laney/aptdaemon/vte2.91
Merge into: lp:aptdaemon
Diff against target: 21 lines (+4/-1)
1 file modified
aptdaemon/gtk3widgets.py (+4/-1)
To merge this branch: bzr merge lp:~laney/aptdaemon/vte2.91
Reviewer Review Type Date Requested Status
Martin Pitt (community) 2014-11-10 Approve on 2014-11-11
Aptdaemon Developers 2014-11-10 Pending
Review via email: mp+241311@code.launchpad.net

Description of the change

Trivial port to vte 2.91 API

I'd like to switch Ubuntu main to vte 2.91. There's no packaging branch for aptdaemon/vivid yet. I can try to make one if/when this branch is merged into trunk.

To post a comment you must log in.
Martin Pitt (pitti) wrote :

Cheers!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'aptdaemon/gtk3widgets.py'
2--- aptdaemon/gtk3widgets.py 2014-06-26 07:07:15 +0000
3+++ aptdaemon/gtk3widgets.py 2014-11-10 18:08:25 +0000
4@@ -38,6 +38,9 @@
5 import pty
6 import re
7
8+import gi
9+gi.require_version("Vte", "2.91")
10+
11 import apt_pkg
12 from gi.repository import GObject
13 from gi.repository import GLib
14@@ -391,7 +394,7 @@
15 self._master, self._slave = pty.openpty()
16 self._ttyname = os.ttyname(self._slave)
17 self.set_size(80, 24)
18- self.set_pty_object(Vte.Pty.new_foreign(self._master))
19+ self.set_pty(Vte.Pty.new_foreign_sync(self._master))
20 if transaction is not None:
21 self.set_transaction(transaction)
22

Subscribers

People subscribed via source and target branches

to status/vote changes: