Merge lp:~ken-vandine/friends/no_mm into lp:friends

Proposed by Ken VanDine
Status: Merged
Approved by: Ken VanDine
Approved revision: 168
Merged at revision: 168
Proposed branch: lp:~ken-vandine/friends/no_mm
Merge into: lp:friends
Diff against target: 16 lines (+2/-0)
1 file modified
friends/utils/menus.py (+2/-0)
To merge this branch: bzr merge lp:~ken-vandine/friends/no_mm
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Robert Bruce Park Approve
Review via email: mp+154803@code.launchpad.net

Commit message

Disable messaging menu integration until we have some sort of handler

Description of the change

Disable messaging menu integration until we have some sort of handler

To post a comment you must log in.
Revision history for this message
Robert Bruce Park (robru) wrote :

Yep.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:168
http://jenkins.qa.ubuntu.com/job/friends-ci/10/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/friends-raring-amd64-ci/10

Click here to trigger a rebuild:
http://s-jenkins:8080/job/friends-ci/10/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'friends/utils/menus.py'
2--- friends/utils/menus.py 2013-02-05 01:11:35 +0000
3+++ friends/utils/menus.py 2013-03-21 19:58:23 +0000
4@@ -20,10 +20,12 @@
5
6
7 MessagingMenu = None
8+""" Disable messaging menu integration until we have some sort of handler
9 try:
10 from gi.repository import MessagingMenu
11 except ImportError:
12 pass
13+"""
14
15
16 log = logging.getLogger(__name__)

Subscribers

People subscribed via source and target branches

to all changes: