Pasaffe

Merge lp:~robert-ancell/pasaffe/no-lpi into lp:~mdeslaur/pasaffe/trunk

Proposed by Robert Ancell on 2012-05-15

Status:	Merged
Merged at revision:	273
Proposed branch:	lp:~robert-ancell/pasaffe/no-lpi
Merge into:	lp:~mdeslaur/pasaffe/trunk
Diff against target:	35 lines (+2/-12) 2 files modified NEWS (+2/-1) pasaffe_lib/Window.py (+0/-11)
To merge this branch:	bzr merge lp:~robert-ancell/pasaffe/no-lpi
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Marc Deslauriers		2012-05-15	Approve on 2012-05-15
Review via email: mp+105746@code.launchpad.net

Will also need the packaging to drop the dependency

Revision history for this message

Marc Deslauriers (mdeslaur) wrote on 2012-05-15:

Thanks Robert!

review: Approve

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

 === modified file 'NEWS'
 --- NEWS	2012-05-07 16:09:52 +0000
 +++ NEWS	2012-05-15 01:26:18 +0000
@@ -5,7 +5,8 @@
   * Enhancements:
     - Can now import KeePass2 XML files
--     (Thanks to Mathieu Trudel-Lapierre!)
++     (Thanks to Mathieu Trudel-Lapierre!)
++   - Disable Launchpad integration (no longer supported)
   * Bug fixes:
 === modified file 'pasaffe_lib/Window.py'
 --- pasaffe_lib/Window.py	2012-03-24 13:43:33 +0000
 +++ pasaffe_lib/Window.py	2012-05-15 01:26:18 +0000
@@ -63,17 +63,6 @@
          self.settings = Gio.Settings("apps.pasaffe")
          self.settings.connect('changed', self.on_preferences_changed)
--        # Optional Launchpad integration
--        # This shouldn't crash if not found as it is simply used for bug reporting.
--        # See https://wiki.ubuntu.com/UbuntuDevelopment/Internationalisation/Coding
--        # for more information about Launchpad integration.
--        try:
--            from gi.repository import LaunchpadIntegration
--            LaunchpadIntegration.add_items(self.ui.helpMenu, 1, True, True)
--            LaunchpadIntegration.set_sourcepackagename('pasaffe')
--        except ImportError:
--            pass
--
          # Optional application indicator support
          # Run 'quickly add indicator' to get started.
          # More information: