Merge lp:~techtonik/apport/fix-gi-warning into lp:~apport-hackers/apport/trunk

Proposed by anatoly techtonik
Status: Merged
Merged at revision: 3103
Proposed branch: lp:~techtonik/apport/fix-gi-warning
Merge into: lp:~apport-hackers/apport/trunk
Diff against target: 22 lines (+4/-1)
1 file modified
gtk/apport-gtk (+4/-1)
To merge this branch: bzr merge lp:~techtonik/apport/fix-gi-warning
Reviewer Review Type Date Requested Status
Martin Pitt (community) Approve
Review via email: mp+304628@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

Thanks! I took the liberty to do the same in test/test_ui_gtk.py.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'gtk/apport-gtk'
2--- gtk/apport-gtk 2015-09-24 12:19:28 +0000
3+++ gtk/apport-gtk 2016-09-01 11:58:22 +0000
4@@ -2,7 +2,7 @@
5
6 '''GTK Apport user interface.'''
7
8-# Copyright (C) 2007-2012 Canonical Ltd.
9+# Copyright (C) 2007-2016 Canonical Ltd.
10 # Author: Martin Pitt <martin.pitt@ubuntu.com>
11 #
12 # This program is free software; you can redistribute it and/or modify it
13@@ -13,6 +13,9 @@
14
15 import os.path, sys, subprocess, os, re
16
17+import gi
18+gi.require_version('Wnck', '3.0')
19+gi.require_version('GdkX11', '3.0')
20 from gi.repository import GLib, Wnck, GdkX11, Gdk
21 Gdk # pyflakes; needed for GdkX11
22 try:

Subscribers

People subscribed via source and target branches